From 25e63063e3a2817fd56fd47fffb11173472a15de Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Mon, 3 Aug 2015 08:22:00 +0000 Subject: BaseTools IA32/X64: move .got contents to the PE/COFF .text section Move the .got contents to the PE/COFF .text section. This should be a no-op, since we typically don't generate position independent code (i.e., using -fPIC). But since the GOT contains variable addresses that are updated at relocation time only, its contents are best kept in .text to prevent them from being overwritten inadvertently. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel Reviewed-by: Jordan Justen Tested-by: Liming Gao git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18133 6f19259b-4bc3-4df7-8a09-765794883524 --- BaseTools/Scripts/gcc-4K-align-ld-script | 5 +---- BaseTools/Scripts/gcc4.4-ld-script | 5 +---- BaseTools/Scripts/gcc4.9-ld-script | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) (limited to 'BaseTools/Scripts') diff --git a/BaseTools/Scripts/gcc-4K-align-ld-script b/BaseTools/Scripts/gcc-4K-align-ld-script index 3ed1c12fb8..34957a5314 100644 --- a/BaseTools/Scripts/gcc-4K-align-ld-script +++ b/BaseTools/Scripts/gcc-4K-align-ld-script @@ -7,6 +7,7 @@ SECTIONS { *(.text .stub .text.* .gnu.linkonce.t.*) *(.rodata .rodata.* .gnu.linkonce.r.*) + *(.got .got.*) } .data : ALIGN(0x1000) { @@ -20,10 +21,6 @@ SECTIONS { KEEP (*(.eh_frame)) } - .got : ALIGN(0x1000) - { - *(.got .got.*) - } .rela : ALIGN(0x1000) { *(.rela .rela.*) diff --git a/BaseTools/Scripts/gcc4.4-ld-script b/BaseTools/Scripts/gcc4.4-ld-script index 0d86908d0b..48320c6611 100644 --- a/BaseTools/Scripts/gcc4.4-ld-script +++ b/BaseTools/Scripts/gcc4.4-ld-script @@ -7,6 +7,7 @@ SECTIONS { *(.text .stub .text.* .gnu.linkonce.t.*) *(.rodata .rodata.* .gnu.linkonce.r.*) + *(.got .got.*) } .data ALIGN(0x20) : { @@ -20,10 +21,6 @@ SECTIONS { KEEP (*(.eh_frame)) } - .got ALIGN(0x20) : - { - *(.got .got.*) - } .rela ALIGN(0x20) : { *(.rela .rela.*) diff --git a/BaseTools/Scripts/gcc4.9-ld-script b/BaseTools/Scripts/gcc4.9-ld-script index 207b9e1dc7..3dff0b2907 100644 --- a/BaseTools/Scripts/gcc4.9-ld-script +++ b/BaseTools/Scripts/gcc4.9-ld-script @@ -7,6 +7,7 @@ SECTIONS { *(.text .stub .text.* .gnu.linkonce.t.*) *(.rodata .rodata.* .gnu.linkonce.r.*) + *(.got .got.*) } .data ALIGN(0x40) : { @@ -20,10 +21,6 @@ SECTIONS { KEEP (*(.eh_frame)) } - .got ALIGN(0x20) : - { - *(.got .got.*) - } .rela ALIGN(0x20) : { *(.rela .rela.*) -- cgit v1.2.3