The ArmVirtPrePiUniCoreRelocatable module comes with its own GNU
linker script to create a PIE executable that can relocate itself
at runtime. In order to be able to build this module using CLANG,
we need to adhere to the section alignment passed via to the linker
using -z commmon-page-size, so add this to the linker script.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <[email protected]>
---
 ArmVirtPkg/PrePi/Scripts/PrePi-PIE.lds | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ArmVirtPkg/PrePi/Scripts/PrePi-PIE.lds 
b/ArmVirtPkg/PrePi/Scripts/PrePi-PIE.lds
index 32af0696aa6b..3c89722dcaab 100644
--- a/ArmVirtPkg/PrePi/Scripts/PrePi-PIE.lds
+++ b/ArmVirtPkg/PrePi/Scripts/PrePi-PIE.lds
@@ -14,20 +14,20 @@
 
 SECTIONS
 {
-  .text 0x0 : {
+  .text 0x0 : ALIGN(CONSTANT(COMMONPAGESIZE)) {
     PROVIDE(__reloc_base = .);
 
     *(.text .text*)
     *(.got .got*)
     *(.rodata .rodata*)
     *(.data .data*)
+    *(.bss .bss*)
 
     . = ALIGN(0x20);
     PROVIDE(__reloc_start = .);
     *(.rela .rela*)
     PROVIDE(__reloc_end = .);
   }
-  .bss ALIGN(0x20) : { *(.bss .bss*) }
 
   /DISCARD/ : {
     *(.note.GNU-stack)
-- 
1.9.1

_______________________________________________
edk2-devel mailing list
[email protected]
https://lists.01.org/mailman/listinfo/edk2-devel

Reply via email to