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.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Tested-by: Liming Gao <liming.gao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18142 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index f5e27cfc347f85dbca96527d7a780c4d03d25059..eeb488fb359712e78e3f2bc371061e8ca2d199e0 100644 (file)
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -3850,9 +3850,9 @@ DEFINE GCC44_X64_CC_FLAGS            = DEF(GCC44_ALL_CC_FLAGS) -m64 -fno-stack-p
 DEFINE GCC44_IA32_X64_DLINK_COMMON   = -nostdlib -n -q --gc-sections -z common-page-size=0x20\r
 DEFINE GCC44_IA32_X64_ASLDLINK_FLAGS = DEF(GCC44_IA32_X64_DLINK_COMMON) --entry ReferenceAcpiTable -u ReferenceAcpiTable\r
 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\r
-DEFINE GCC44_IA32_DLINK2_FLAGS       = --script=$(EDK_TOOLS_PATH)/Scripts/gcc4.4-ld-script --defsym=PECOFF_HEADER_SIZE=0x220\r
+DEFINE GCC44_IA32_DLINK2_FLAGS       = DEF(GCC_DLINK2_FLAGS_COMMON) --defsym=PECOFF_HEADER_SIZE=0x220\r
 DEFINE GCC44_X64_DLINK_FLAGS         = DEF(GCC44_IA32_X64_DLINK_FLAGS)  -melf_x86_64 --oformat=elf64-x86-64\r
-DEFINE GCC44_X64_DLINK2_FLAGS        = --script=$(EDK_TOOLS_PATH)/Scripts/gcc4.4-ld-script --defsym=PECOFF_HEADER_SIZE=0x228\r
+DEFINE GCC44_X64_DLINK2_FLAGS        = DEF(GCC_DLINK2_FLAGS_COMMON) --defsym=PECOFF_HEADER_SIZE=0x228\r
 DEFINE GCC44_ASM_FLAGS               = DEF(GCC_ASM_FLAGS)\r
 \r
 DEFINE GCC45_IA32_CC_FLAGS           = DEF(GCC44_IA32_CC_FLAGS)\r
@@ -3922,9 +3922,9 @@ DEFINE GCC49_X64_CC_FLAGS            = DEF(GCC48_X64_CC_FLAGS)
 DEFINE GCC49_IA32_X64_DLINK_COMMON   = -nostdlib -n -q --gc-sections -z common-page-size=0x40\r
 DEFINE GCC49_IA32_X64_ASLDLINK_FLAGS = DEF(GCC49_IA32_X64_DLINK_COMMON) --entry ReferenceAcpiTable -u ReferenceAcpiTable\r
 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\r
-DEFINE GCC49_IA32_DLINK2_FLAGS       = --script=$(EDK_TOOLS_PATH)/Scripts/gcc4.9-ld-script --defsym=PECOFF_HEADER_SIZE=0x220\r
+DEFINE GCC49_IA32_DLINK2_FLAGS       = DEF(GCC48_IA32_DLINK2_FLAGS)\r
 DEFINE GCC49_X64_DLINK_FLAGS         = DEF(GCC49_IA32_X64_DLINK_FLAGS)  -melf_x86_64 --oformat=elf64-x86-64\r
-DEFINE GCC49_X64_DLINK2_FLAGS        = --script=$(EDK_TOOLS_PATH)/Scripts/gcc4.9-ld-script --defsym=PECOFF_HEADER_SIZE=0x228\r
+DEFINE GCC49_X64_DLINK2_FLAGS        = DEF(GCC48_X64_DLINK2_FLAGS)\r
 DEFINE GCC49_ASM_FLAGS               = DEF(GCC48_ASM_FLAGS)\r
 DEFINE GCC49_ARM_ASM_FLAGS           = DEF(GCC48_ARM_ASM_FLAGS)\r
 DEFINE GCC49_AARCH64_ASM_FLAGS       = DEF(GCC48_AARCH64_ASM_FLAGS)\r

diff --git a/BaseTools/Scripts/gcc-4K-align-ld-script b/BaseTools/Scripts/gcc-4K-align-ld-script
deleted file mode 100644 (file)
index 51daae0..0000000
--- a/BaseTools/Scripts/gcc-4K-align-ld-script
+++ /dev/null
@@ -1,38 +0,0 @@
-/* OUTPUT_FORMAT(efi-bsdrv-x86_64) */\r
-SECTIONS\r
-{\r
-  /* . = 0 + SIZEOF_HEADERS; */\r
-  . = PECOFF_HEADER_SIZE;\r
-  .text : ALIGN(CONSTANT(COMMONPAGESIZE))\r
-  {\r
-    *(.text .stub .text.* .gnu.linkonce.t.*)\r
-    *(.rodata .rodata.* .gnu.linkonce.r.*)\r
-    *(.got .got.*)\r
-  }\r
-  .data : ALIGN(CONSTANT(COMMONPAGESIZE))\r
-  {\r
-    *(\r
-      .data .data.* .gnu.linkonce.d.*\r
-      .bss .bss.*\r
-      *COM*\r
-    )\r
-  }\r
-  .eh_frame : ALIGN(CONSTANT(COMMONPAGESIZE))\r
-  {\r
-    KEEP (*(.eh_frame))\r
-  }\r
-  .rela : ALIGN(CONSTANT(COMMONPAGESIZE))\r
-  {\r
-    *(.rela .rela.*)\r
-  }\r
-  /DISCARD/ : {\r
-    *(.note.GNU-stack) *(.gnu_debuglink)\r
-    *(.interp)\r
-    *(.dynsym)\r
-    *(.dynstr)\r
-    *(.dynamic)\r
-    *(.hash)\r
-    *(.comment)\r
-  }\r
-}\r
-\r

diff --git a/BaseTools/Scripts/gcc4.4-ld-script b/BaseTools/Scripts/gcc4.4-ld-script
deleted file mode 100644 (file)
index ebb2e1d..0000000
--- a/BaseTools/Scripts/gcc4.4-ld-script
+++ /dev/null
@@ -1,38 +0,0 @@
-/* OUTPUT_FORMAT(efi-bsdrv-x86_64) */\r
-SECTIONS\r
-{\r
-  /* . = 0 + SIZEOF_HEADERS; */\r
-  . = PECOFF_HEADER_SIZE;\r
-  .text ALIGN(CONSTANT(COMMONPAGESIZE)) :\r
-  {\r
-    *(.text .stub .text.* .gnu.linkonce.t.*)\r
-    *(.rodata .rodata.* .gnu.linkonce.r.*)\r
-    *(.got .got.*)\r
-  }\r
-  .data ALIGN(CONSTANT(COMMONPAGESIZE)) :\r
-  {\r
-    *(\r
-      .data .data.* .gnu.linkonce.d.*\r
-      .bss .bss.*\r
-      *COM*\r
-    )\r
-  }\r
-  .eh_frame ALIGN(CONSTANT(COMMONPAGESIZE)) :\r
-  {\r
-    KEEP (*(.eh_frame))\r
-  }\r
-  .rela ALIGN(CONSTANT(COMMONPAGESIZE)) :\r
-  {\r
-    *(.rela .rela.*)\r
-  }\r
-  /DISCARD/ : {\r
-    *(.note.GNU-stack) *(.gnu_debuglink)\r
-    *(.interp)\r
-    *(.dynsym)\r
-    *(.dynstr)\r
-    *(.dynamic)\r
-    *(.hash)\r
-    *(.comment)\r
-  }\r
-}\r
-\r

diff --git a/BaseTools/Scripts/gcc4.9-ld-script b/BaseTools/Scripts/gcc4.9-ld-script
deleted file mode 100644 (file)
index ebb2e1d..0000000
--- a/BaseTools/Scripts/gcc4.9-ld-script
+++ /dev/null
@@ -1,38 +0,0 @@
-/* OUTPUT_FORMAT(efi-bsdrv-x86_64) */\r
-SECTIONS\r
-{\r
-  /* . = 0 + SIZEOF_HEADERS; */\r
-  . = PECOFF_HEADER_SIZE;\r
-  .text ALIGN(CONSTANT(COMMONPAGESIZE)) :\r
-  {\r
-    *(.text .stub .text.* .gnu.linkonce.t.*)\r
-    *(.rodata .rodata.* .gnu.linkonce.r.*)\r
-    *(.got .got.*)\r
-  }\r
-  .data ALIGN(CONSTANT(COMMONPAGESIZE)) :\r
-  {\r
-    *(\r
-      .data .data.* .gnu.linkonce.d.*\r
-      .bss .bss.*\r
-      *COM*\r
-    )\r
-  }\r
-  .eh_frame ALIGN(CONSTANT(COMMONPAGESIZE)) :\r
-  {\r
-    KEEP (*(.eh_frame))\r
-  }\r
-  .rela ALIGN(CONSTANT(COMMONPAGESIZE)) :\r
-  {\r
-    *(.rela .rela.*)\r
-  }\r
-  /DISCARD/ : {\r
-    *(.note.GNU-stack) *(.gnu_debuglink)\r
-    *(.interp)\r
-    *(.dynsym)\r
-    *(.dynstr)\r
-    *(.dynamic)\r
-    *(.hash)\r
-    *(.comment)\r
-  }\r
-}\r
-\r