diff options
| author | Samuel Holland <samuel@sholland.org> | 2022-04-08 22:22:04 -0500 |
|---|---|---|
| committer | Samuel Holland <samuel@sholland.org> | 2022-08-10 20:23:12 -0500 |
| commit | 64207f858f5cbf44aa6528be19a863acc4444568 (patch) | |
| tree | fff8e63c2d7fb4a44cbe7f816167f83c75435d4d /bl31 | |
| parent | 7b5924184566bcdcc01966905ffdcabcd6ea4b32 (diff) | |
| download | arm-trusted-firmware-64207f858f5cbf44aa6528be19a863acc4444568.tar.gz | |
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
Diffstat (limited to 'bl31')
| -rw-r--r-- | bl31/bl31.ld.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bl31/bl31.ld.S b/bl31/bl31.ld.S index 8a1573ab6..3d3dc959b 100644 --- a/bl31/bl31.ld.S +++ b/bl31/bl31.ld.S @@ -186,10 +186,10 @@ SECTIONS __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 } |