commit 322df2a0c307b07d766f17b9792664dbc3e01863
author Samuel Holland <samuel@sholland.org> Fri Apr 08 22:22:04 2022 -0500
committer Samuel Holland <samuel@sholland.org> Wed Aug 10 20:23:12 2022 -0500
tree fff8e63c2d7fb4a44cbe7f816167f83c75435d4d
parent 9286c021b599a9114222558115f8aaca29f0d119

fix(build): discard sections also with SEPARATE_NOBITS_REGION

Some linker sections are discarded since 511046eaa28f ("BL31: discard
.dynsym .dynstr .hash sections to make ENABLE_PIE work"). However, that
logic was placed inside a preprocessor condition, so it only applied to
the !SEPARATE_NOBITS_REGION case. Move the /DISCARD/ block down so it
applies in all cases.

Signed-off-by: Samuel Holland <samuel@sholland.org>
Change-Id: I6604609f2321a2a9c32a25721a697c320108a974

bl31/bl31.ld.S

diff --git a/bl31/bl31.ld.S b/bl31/bl31.ld.S
index 8a1573a..3d3dc95 100644
--- a/bl31/bl31.ld.S
+++ b/bl31/bl31.ld.S
@@ -186,10 +186,10 @@
     __RW_END__ = .;
     __BL31_END__ = .;
 
+    ASSERT(. <= BL31_LIMIT, "BL31 image has exceeded its limit.")
+#endif
+
     /DISCARD/ : {
         *(.dynsym .dynstr .hash .gnu.hash)
     }
-
-    ASSERT(. <= BL31_LIMIT, "BL31 image has exceeded its limit.")
-#endif
 }