Jordan:
I have verified 4K aligned image build.
Test-by: Liming Gao <liming.gao@intel>
Thanks
Liming
-----Original Message-----
From: Justen, Jordan L
Sent: Thursday, July 30, 2015 5:16 AM
To: Ard Biesheuvel; edk2-devel@lists.01.org; Liu, Yingke D; Gao, Liming
Cc: ler...@redhat.com; leif.lindh...@linaro.org; Ard Biesheuvel
Subject: Re: [PATCH v3 12/12] BaseTools/X86|IA32: move to unified GCC linker
script
Subject prefix: BaseTools/X86|IA32 => BaseTools IA32/X64
What about 1 more step? :)
This change starts to make use of the -z common-page-size and
--defsym=PECOFF_HEADER_SIZE params, but the description says 'move to unified
script'.
So, how about first modifying the gcc*-ld-script files to use -z
common-page-size and --defsym=PECOFF_HEADER_SIZE and then the last patch is
trivial:
BaseTools IA32/X64: Use GccBase.lds instead of gcc*-ld-script
These scripts all now have the same contents, so we only need to use
GccBase.lds. Therefore we can delete gcc-4K-align-ld-script,
gcc4.4-ld-script and gcc4.9-ld-script.
With that change, the series is
Reviewed-by: Jordan Justen <jordan.l.jus...@intel.com>
although, I would like someone to test the changes on a '4k' aligned image
build. Liming, do you know who might be able to do that?
-Jordan
On 2015-07-29 08:12:02, Ard Biesheuvel wrote:
> Drop the GCC 4.4/X86 and 4.9/X86 specific linker scripts and use the
> new unified one instead.
>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.org>
> ---
> BaseTools/Conf/tools_def.template | 28 +++++++++++++--
> BaseTools/Scripts/gcc-4K-align-ld-script | 38 --------------------
> BaseTools/Scripts/gcc4.4-ld-script | 38 --------------------
> BaseTools/Scripts/gcc4.9-ld-script | 38 --------------------
> 4 files changed, 26 insertions(+), 116 deletions(-)
>
> diff --git a/BaseTools/Conf/tools_def.template
> b/BaseTools/Conf/tools_def.template
> index d3dfdc41ada1..eeb488fb3597 100644
> --- a/BaseTools/Conf/tools_def.template
> +++ b/BaseTools/Conf/tools_def.template
> @@ -3847,10 +3847,12 @@ DEFINE GCC_AARCH64_RC_FLAGS = -I binary -O
> elf64-littleaarch64 -B aarch64
> DEFINE GCC44_ALL_CC_FLAGS = -g -fshort-wchar -fno-strict-aliasing
> -Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections -c
> -include AutoGen.h -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
> DEFINE GCC44_IA32_CC_FLAGS = DEF(GCC44_ALL_CC_FLAGS) -m32
> -malign-double -fno-stack-protector -D EFI32
> DEFINE GCC44_X64_CC_FLAGS = DEF(GCC44_ALL_CC_FLAGS) -m64
> -fno-stack-protector "-DEFIAPI=__attribute__((ms_abi))" -DNO_BUILTIN_VA_FUNCS
> -mno-red-zone -Wno-address -mcmodel=large
> -DEFINE GCC44_IA32_X64_DLINK_COMMON = -nostdlib -n -q --gc-sections
> --script=$(EDK_TOOLS_PATH)/Scripts/gcc4.4-ld-script
> +DEFINE GCC44_IA32_X64_DLINK_COMMON = -nostdlib -n -q --gc-sections -z
> common-page-size=0x20
> DEFINE GCC44_IA32_X64_ASLDLINK_FLAGS = DEF(GCC44_IA32_X64_DLINK_COMMON)
> --entry ReferenceAcpiTable -u ReferenceAcpiTable
> DEFINE GCC44_IA32_X64_DLINK_FLAGS = DEF(GCC44_IA32_X64_DLINK_COMMON)
> --entry $(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Map
> $(DEST_DIR_DEBUG)/$(BASE_NAME).map
> +DEFINE GCC44_IA32_DLINK2_FLAGS = DEF(GCC_DLINK2_FLAGS_COMMON)
> --defsym=PECOFF_HEADER_SIZE=0x220
> DEFINE GCC44_X64_DLINK_FLAGS = DEF(GCC44_IA32_X64_DLINK_FLAGS)
> -melf_x86_64 --oformat=elf64-x86-64
> +DEFINE GCC44_X64_DLINK2_FLAGS = DEF(GCC_DLINK2_FLAGS_COMMON)
> --defsym=PECOFF_HEADER_SIZE=0x228
> DEFINE GCC44_ASM_FLAGS = DEF(GCC_ASM_FLAGS)
>
> DEFINE GCC45_IA32_CC_FLAGS = DEF(GCC44_IA32_CC_FLAGS)
> @@ -3858,7 +3860,9 @@ DEFINE GCC45_X64_CC_FLAGS =
> DEF(GCC44_X64_CC_FLAGS)
> DEFINE GCC45_IA32_X64_DLINK_COMMON = DEF(GCC44_IA32_X64_DLINK_COMMON)
> DEFINE GCC45_IA32_X64_ASLDLINK_FLAGS = DEF(GCC44_IA32_X64_ASLDLINK_FLAGS)
> DEFINE GCC45_IA32_X64_DLINK_FLAGS = DEF(GCC44_IA32_X64_DLINK_FLAGS)
> +DEFINE GCC45_IA32_DLINK2_FLAGS = DEF(GCC44_IA32_DLINK2_FLAGS)
> DEFINE GCC45_X64_DLINK_FLAGS = DEF(GCC44_X64_DLINK_FLAGS)
> +DEFINE GCC45_X64_DLINK2_FLAGS = DEF(GCC44_X64_DLINK2_FLAGS)
> DEFINE GCC45_ASM_FLAGS = DEF(GCC44_ASM_FLAGS)
>
> DEFINE GCC46_IA32_CC_FLAGS = DEF(GCC45_IA32_CC_FLAGS) -Wno-address
> -Wno-unused-but-set-variable
> @@ -3866,7 +3870,9 @@ DEFINE GCC46_X64_CC_FLAGS =
> DEF(GCC45_X64_CC_FLAGS) -Wno-address -Wno
> DEFINE GCC46_IA32_X64_DLINK_COMMON = DEF(GCC45_IA32_X64_DLINK_COMMON)
> DEFINE GCC46_IA32_X64_ASLDLINK_FLAGS = DEF(GCC45_IA32_X64_ASLDLINK_FLAGS)
> DEFINE GCC46_IA32_X64_DLINK_FLAGS = DEF(GCC45_IA32_X64_DLINK_FLAGS)
> +DEFINE GCC46_IA32_DLINK2_FLAGS = DEF(GCC45_IA32_DLINK2_FLAGS)
> DEFINE GCC46_X64_DLINK_FLAGS = DEF(GCC45_X64_DLINK_FLAGS)
> +DEFINE GCC46_X64_DLINK2_FLAGS = DEF(GCC45_X64_DLINK2_FLAGS)
> DEFINE GCC46_ASM_FLAGS = DEF(GCC45_ASM_FLAGS)
> DEFINE GCC46_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS)
> DEF(GCC_ASM_FLAGS) -mlittle-endian
> DEFINE GCC46_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS)
> DEF(GCC44_ALL_CC_FLAGS) DEF(GCC_ARM_CC_FLAGS) -fstack-protector
> @@ -3878,7 +3884,9 @@ DEFINE GCC47_X64_CC_FLAGS =
> DEF(GCC46_X64_CC_FLAGS)
> DEFINE GCC47_IA32_X64_DLINK_COMMON = DEF(GCC46_IA32_X64_DLINK_COMMON)
> DEFINE GCC47_IA32_X64_ASLDLINK_FLAGS = DEF(GCC46_IA32_X64_ASLDLINK_FLAGS)
> DEFINE GCC47_IA32_X64_DLINK_FLAGS = DEF(GCC46_IA32_X64_DLINK_FLAGS)
> +DEFINE GCC47_IA32_DLINK2_FLAGS = DEF(GCC46_IA32_DLINK2_FLAGS)
> DEFINE GCC47_X64_DLINK_FLAGS = DEF(GCC46_X64_DLINK_FLAGS)
> +DEFINE GCC47_X64_DLINK2_FLAGS = DEF(GCC46_X64_DLINK2_FLAGS)
> DEFINE GCC47_ASM_FLAGS = DEF(GCC46_ASM_FLAGS)
> DEFINE GCC47_ARM_ASM_FLAGS = DEF(GCC46_ARM_ASM_FLAGS)
> DEFINE GCC47_AARCH64_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS)
> DEF(GCC_ASM_FLAGS) -mlittle-endian
> @@ -3895,7 +3903,9 @@ DEFINE GCC48_X64_CC_FLAGS =
> DEF(GCC47_X64_CC_FLAGS)
> DEFINE GCC48_IA32_X64_DLINK_COMMON = DEF(GCC47_IA32_X64_DLINK_COMMON)
> DEFINE GCC48_IA32_X64_ASLDLINK_FLAGS = DEF(GCC47_IA32_X64_ASLDLINK_FLAGS)
> DEFINE GCC48_IA32_X64_DLINK_FLAGS = DEF(GCC47_IA32_X64_DLINK_FLAGS)
> +DEFINE GCC48_IA32_DLINK2_FLAGS = DEF(GCC47_IA32_DLINK2_FLAGS)
> DEFINE GCC48_X64_DLINK_FLAGS = DEF(GCC47_X64_DLINK_FLAGS)
> +DEFINE GCC48_X64_DLINK2_FLAGS = DEF(GCC47_X64_DLINK2_FLAGS)
> DEFINE GCC48_ASM_FLAGS = DEF(GCC47_ASM_FLAGS)
> DEFINE GCC48_ARM_ASM_FLAGS = DEF(GCC47_ARM_ASM_FLAGS)
> DEFINE GCC48_AARCH64_ASM_FLAGS = DEF(GCC47_AARCH64_ASM_FLAGS)
> @@ -3909,10 +3919,12 @@ DEFINE GCC48_AARCH64_ASLDLINK_FLAGS =
> DEF(GCC47_AARCH64_ASLDLINK_FLAGS)
>
> DEFINE GCC49_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS)
> DEFINE GCC49_X64_CC_FLAGS = DEF(GCC48_X64_CC_FLAGS)
> -DEFINE GCC49_IA32_X64_DLINK_COMMON = -nostdlib -n -q --gc-sections
> --script=$(EDK_TOOLS_PATH)/Scripts/gcc4.9-ld-script
> +DEFINE GCC49_IA32_X64_DLINK_COMMON = -nostdlib -n -q --gc-sections -z
> common-page-size=0x40
> DEFINE GCC49_IA32_X64_ASLDLINK_FLAGS = DEF(GCC49_IA32_X64_DLINK_COMMON)
> --entry ReferenceAcpiTable -u ReferenceAcpiTable
> DEFINE GCC49_IA32_X64_DLINK_FLAGS = DEF(GCC49_IA32_X64_DLINK_COMMON)
> --entry $(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Map
> $(DEST_DIR_DEBUG)/$(BASE_NAME).map
> +DEFINE GCC49_IA32_DLINK2_FLAGS = DEF(GCC48_IA32_DLINK2_FLAGS)
> DEFINE GCC49_X64_DLINK_FLAGS = DEF(GCC49_IA32_X64_DLINK_FLAGS)
> -melf_x86_64 --oformat=elf64-x86-64
> +DEFINE GCC49_X64_DLINK2_FLAGS = DEF(GCC48_X64_DLINK2_FLAGS)
> DEFINE GCC49_ASM_FLAGS = DEF(GCC48_ASM_FLAGS)
> DEFINE GCC49_ARM_ASM_FLAGS = DEF(GCC48_ARM_ASM_FLAGS)
> DEFINE GCC49_AARCH64_ASM_FLAGS = DEF(GCC48_AARCH64_ASM_FLAGS)
> @@ -4052,6 +4064,7 @@ DEFINE GCC49_AARCH64_ASLDLINK_FLAGS =
> DEF(GCC48_AARCH64_ASLDLINK_FLAGS)
> *_GCC44_IA32_ASM_FLAGS = DEF(GCC44_ASM_FLAGS) -m32 --32
> -march=i386
> *_GCC44_IA32_CC_FLAGS = DEF(GCC44_IA32_CC_FLAGS) -Os
> *_GCC44_IA32_DLINK_FLAGS = DEF(GCC44_IA32_X64_DLINK_FLAGS) -m
> elf_i386 --oformat=elf32-i386
> +*_GCC44_IA32_DLINK2_FLAGS = DEF(GCC44_IA32_DLINK2_FLAGS)
> *_GCC44_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS)
> *_GCC44_IA32_OBJCOPY_FLAGS =
> *_GCC44_IA32_NASM_FLAGS = -f elf32
> @@ -4076,6 +4089,7 @@ DEFINE GCC49_AARCH64_ASLDLINK_FLAGS =
> DEF(GCC48_AARCH64_ASLDLINK_FLAGS)
> *_GCC44_X64_ASM_FLAGS = DEF(GCC44_ASM_FLAGS) -m64 --64
> -melf_x86_64
> *_GCC44_X64_CC_FLAGS = DEF(GCC44_X64_CC_FLAGS)
> *_GCC44_X64_DLINK_FLAGS = DEF(GCC44_X64_DLINK_FLAGS)
> +*_GCC44_X64_DLINK2_FLAGS = DEF(GCC44_X64_DLINK2_FLAGS)
> *_GCC44_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS)
> *_GCC44_X64_OBJCOPY_FLAGS =
> *_GCC44_X64_NASM_FLAGS = -f elf64
> @@ -4120,6 +4134,7 @@ DEFINE GCC49_AARCH64_ASLDLINK_FLAGS =
> DEF(GCC48_AARCH64_ASLDLINK_FLAGS)
> *_GCC45_IA32_ASM_FLAGS = DEF(GCC45_ASM_FLAGS) -m32 --32
> -march=i386
> *_GCC45_IA32_CC_FLAGS = DEF(GCC45_IA32_CC_FLAGS) -Os
> *_GCC45_IA32_DLINK_FLAGS = DEF(GCC45_IA32_X64_DLINK_FLAGS) -m
> elf_i386 --oformat=elf32-i386
> +*_GCC45_IA32_DLINK2_FLAGS = DEF(GCC45_IA32_DLINK2_FLAGS)
> *_GCC45_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS)
> *_GCC45_IA32_OBJCOPY_FLAGS =
> *_GCC45_IA32_NASM_FLAGS = -f elf32
> @@ -4144,6 +4159,7 @@ DEFINE GCC49_AARCH64_ASLDLINK_FLAGS =
> DEF(GCC48_AARCH64_ASLDLINK_FLAGS)
> *_GCC45_X64_ASM_FLAGS = DEF(GCC45_ASM_FLAGS) -m64 --64
> -melf_x86_64
> *_GCC45_X64_CC_FLAGS = DEF(GCC45_X64_CC_FLAGS)
> *_GCC45_X64_DLINK_FLAGS = DEF(GCC45_X64_DLINK_FLAGS)
> +*_GCC45_X64_DLINK2_FLAGS = DEF(GCC45_X64_DLINK2_FLAGS)
> *_GCC45_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS)
> *_GCC45_X64_OBJCOPY_FLAGS =
> *_GCC45_X64_NASM_FLAGS = -f elf64
> @@ -4188,6 +4204,7 @@ DEFINE GCC49_AARCH64_ASLDLINK_FLAGS =
> DEF(GCC48_AARCH64_ASLDLINK_FLAGS)
> *_GCC46_IA32_ASM_FLAGS = DEF(GCC46_ASM_FLAGS) -m32 -march=i386
> *_GCC46_IA32_CC_FLAGS = DEF(GCC46_IA32_CC_FLAGS) -Os
> *_GCC46_IA32_DLINK_FLAGS = DEF(GCC46_IA32_X64_DLINK_FLAGS) -m
> elf_i386 --oformat=elf32-i386
> +*_GCC46_IA32_DLINK2_FLAGS = DEF(GCC46_IA32_DLINK2_FLAGS)
> *_GCC46_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS)
> *_GCC46_IA32_OBJCOPY_FLAGS =
> *_GCC46_IA32_NASM_FLAGS = -f elf32
> @@ -4212,6 +4229,7 @@ DEFINE GCC49_AARCH64_ASLDLINK_FLAGS =
> DEF(GCC48_AARCH64_ASLDLINK_FLAGS)
> *_GCC46_X64_ASM_FLAGS = DEF(GCC46_ASM_FLAGS) -m64 -melf_x86_64
> *_GCC46_X64_CC_FLAGS = DEF(GCC46_X64_CC_FLAGS)
> *_GCC46_X64_DLINK_FLAGS = DEF(GCC46_X64_DLINK_FLAGS)
> +*_GCC46_X64_DLINK2_FLAGS = DEF(GCC46_X64_DLINK2_FLAGS)
> *_GCC46_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS)
> *_GCC46_X64_OBJCOPY_FLAGS =
> *_GCC46_X64_NASM_FLAGS = -f elf64
> @@ -4286,6 +4304,7 @@ RELEASE_GCC46_ARM_CC_FLAGS =
> DEF(GCC46_ARM_CC_FLAGS) -Wno-unused-but-set-v
> *_GCC47_IA32_ASM_FLAGS = DEF(GCC47_ASM_FLAGS) -m32 -march=i386
> *_GCC47_IA32_CC_FLAGS = DEF(GCC47_IA32_CC_FLAGS) -Os
> *_GCC47_IA32_DLINK_FLAGS = DEF(GCC47_IA32_X64_DLINK_FLAGS) -m
> elf_i386 --oformat=elf32-i386
> +*_GCC47_IA32_DLINK2_FLAGS = DEF(GCC47_IA32_DLINK2_FLAGS)
> *_GCC47_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS)
> *_GCC47_IA32_OBJCOPY_FLAGS =
> *_GCC47_IA32_NASM_FLAGS = -f elf32
> @@ -4310,6 +4329,7 @@ RELEASE_GCC46_ARM_CC_FLAGS =
> DEF(GCC46_ARM_CC_FLAGS) -Wno-unused-but-set-v
> *_GCC47_X64_ASM_FLAGS = DEF(GCC47_ASM_FLAGS) -m64
> *_GCC47_X64_CC_FLAGS = DEF(GCC47_X64_CC_FLAGS)
> *_GCC47_X64_DLINK_FLAGS = DEF(GCC47_X64_DLINK_FLAGS)
> +*_GCC47_X64_DLINK2_FLAGS = DEF(GCC47_X64_DLINK2_FLAGS)
> *_GCC47_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS)
> *_GCC47_X64_OBJCOPY_FLAGS =
> *_GCC47_X64_NASM_FLAGS = -f elf64
> @@ -4410,6 +4430,7 @@ RELEASE_GCC47_AARCH64_CC_FLAGS =
> DEF(GCC47_AARCH64_CC_FLAGS) -Wno-unused-but-s
> *_GCC48_IA32_ASM_FLAGS = DEF(GCC48_ASM_FLAGS) -m32 -march=i386
> *_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Os
> *_GCC48_IA32_DLINK_FLAGS = DEF(GCC48_IA32_X64_DLINK_FLAGS) -m
> elf_i386 --oformat=elf32-i386
> +*_GCC48_IA32_DLINK2_FLAGS = DEF(GCC48_IA32_DLINK2_FLAGS)
> *_GCC48_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS)
> *_GCC48_IA32_OBJCOPY_FLAGS =
> *_GCC48_IA32_NASM_FLAGS = -f elf32
> @@ -4434,6 +4455,7 @@ RELEASE_GCC47_AARCH64_CC_FLAGS =
> DEF(GCC47_AARCH64_CC_FLAGS) -Wno-unused-but-s
> *_GCC48_X64_ASM_FLAGS = DEF(GCC48_ASM_FLAGS) -m64
> *_GCC48_X64_CC_FLAGS = DEF(GCC48_X64_CC_FLAGS)
> *_GCC48_X64_DLINK_FLAGS = DEF(GCC48_X64_DLINK_FLAGS)
> +*_GCC48_X64_DLINK2_FLAGS = DEF(GCC48_X64_DLINK2_FLAGS)
> *_GCC48_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS)
> *_GCC48_X64_OBJCOPY_FLAGS =
> *_GCC48_X64_NASM_FLAGS = -f elf64
> @@ -4534,6 +4556,7 @@ RELEASE_GCC48_AARCH64_CC_FLAGS =
> DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s
> *_GCC49_IA32_ASM_FLAGS = DEF(GCC49_ASM_FLAGS) -m32 -march=i386
> *_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Os
> *_GCC49_IA32_DLINK_FLAGS = DEF(GCC49_IA32_X64_DLINK_FLAGS) -m
> elf_i386 --oformat=elf32-i386
> +*_GCC49_IA32_DLINK2_FLAGS = DEF(GCC49_IA32_DLINK2_FLAGS)
> *_GCC49_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS)
> *_GCC49_IA32_OBJCOPY_FLAGS =
> *_GCC49_IA32_NASM_FLAGS = -f elf32
> @@ -4558,6 +4581,7 @@ RELEASE_GCC48_AARCH64_CC_FLAGS =
> DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s
> *_GCC49_X64_ASM_FLAGS = DEF(GCC49_ASM_FLAGS) -m64
> *_GCC49_X64_CC_FLAGS = DEF(GCC49_X64_CC_FLAGS)
> *_GCC49_X64_DLINK_FLAGS = DEF(GCC49_X64_DLINK_FLAGS)
> +*_GCC49_X64_DLINK2_FLAGS = DEF(GCC49_X64_DLINK2_FLAGS)
> *_GCC49_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS)
> *_GCC49_X64_OBJCOPY_FLAGS =
> *_GCC49_X64_NASM_FLAGS = -f elf64
> diff --git a/BaseTools/Scripts/gcc-4K-align-ld-script
> b/BaseTools/Scripts/gcc-4K-align-ld-script
> deleted file mode 100644
> index 34957a53147c..000000000000
> --- a/BaseTools/Scripts/gcc-4K-align-ld-script
> +++ /dev/null
> @@ -1,38 +0,0 @@
> -/* OUTPUT_FORMAT(efi-bsdrv-x86_64) */ -SECTIONS -{
> - /* . = 0 + SIZEOF_HEADERS; */
> - . = 0x280;
> - .text : ALIGN(0x1000)
> - {
> - *(.text .stub .text.* .gnu.linkonce.t.*)
> - *(.rodata .rodata.* .gnu.linkonce.r.*)
> - *(.got .got.*)
> - }
> - .data : ALIGN(0x1000)
> - {
> - *(
> - .data .data.* .gnu.linkonce.d.*
> - .bss .bss.*
> - *COM*
> - )
> - }
> - .eh_frame : ALIGN(0x1000)
> - {
> - KEEP (*(.eh_frame))
> - }
> - .rela : ALIGN(0x1000)
> - {
> - *(.rela .rela.*)
> - }
> - /DISCARD/ : {
> - *(.note.GNU-stack) *(.gnu_debuglink)
> - *(.interp)
> - *(.dynsym)
> - *(.dynstr)
> - *(.dynamic)
> - *(.hash)
> - *(.comment)
> - }
> -}
> -
> diff --git a/BaseTools/Scripts/gcc4.4-ld-script
> b/BaseTools/Scripts/gcc4.4-ld-script
> deleted file mode 100644
> index 48320c6611e4..000000000000
> --- a/BaseTools/Scripts/gcc4.4-ld-script
> +++ /dev/null
> @@ -1,38 +0,0 @@
> -/* OUTPUT_FORMAT(efi-bsdrv-x86_64) */ -SECTIONS -{
> - /* . = 0 + SIZEOF_HEADERS; */
> - . = 0x280;
> - .text ALIGN(0x20) :
> - {
> - *(.text .stub .text.* .gnu.linkonce.t.*)
> - *(.rodata .rodata.* .gnu.linkonce.r.*)
> - *(.got .got.*)
> - }
> - .data ALIGN(0x20) :
> - {
> - *(
> - .data .data.* .gnu.linkonce.d.*
> - .bss .bss.*
> - *COM*
> - )
> - }
> - .eh_frame ALIGN(0x20) :
> - {
> - KEEP (*(.eh_frame))
> - }
> - .rela ALIGN(0x20) :
> - {
> - *(.rela .rela.*)
> - }
> - /DISCARD/ : {
> - *(.note.GNU-stack) *(.gnu_debuglink)
> - *(.interp)
> - *(.dynsym)
> - *(.dynstr)
> - *(.dynamic)
> - *(.hash)
> - *(.comment)
> - }
> -}
> -
> diff --git a/BaseTools/Scripts/gcc4.9-ld-script
> b/BaseTools/Scripts/gcc4.9-ld-script
> deleted file mode 100644
> index 3dff0b2907e6..000000000000
> --- a/BaseTools/Scripts/gcc4.9-ld-script
> +++ /dev/null
> @@ -1,38 +0,0 @@
> -/* OUTPUT_FORMAT(efi-bsdrv-x86_64) */ -SECTIONS -{
> - /* . = 0 + SIZEOF_HEADERS; */
> - . = 0x280;
> - .text ALIGN(0x20) :
> - {
> - *(.text .stub .text.* .gnu.linkonce.t.*)
> - *(.rodata .rodata.* .gnu.linkonce.r.*)
> - *(.got .got.*)
> - }
> - .data ALIGN(0x40) :
> - {
> - *(
> - .data .data.* .gnu.linkonce.d.*
> - .bss .bss.*
> - *COM*
> - )
> - }
> - .eh_frame ALIGN(0x20) :
> - {
> - KEEP (*(.eh_frame))
> - }
> - .rela ALIGN(0x20) :
> - {
> - *(.rela .rela.*)
> - }
> - /DISCARD/ : {
> - *(.note.GNU-stack) *(.gnu_debuglink)
> - *(.interp)
> - *(.dynsym)
> - *(.dynstr)
> - *(.dynamic)
> - *(.hash)
> - *(.comment)
> - }
> -}
> -
> --
> 1.9.1
>
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
