Revision: 18142
http://sourceforge.net/p/edk2/code/18142
Author: abiesheuvel
Date: 2015-08-03 08:23:59 +0000 (Mon, 03 Aug 2015)
Log Message:
-----------
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 <[email protected]>
Reviewed-by: Jordan Justen <[email protected]>
Tested-by: Liming Gao <[email protected]>
Modified Paths:
--------------
trunk/edk2/BaseTools/Conf/tools_def.template
Removed Paths:
-------------
trunk/edk2/BaseTools/Scripts/gcc-4K-align-ld-script
trunk/edk2/BaseTools/Scripts/gcc4.4-ld-script
trunk/edk2/BaseTools/Scripts/gcc4.9-ld-script
Modified: trunk/edk2/BaseTools/Conf/tools_def.template
===================================================================
--- trunk/edk2/BaseTools/Conf/tools_def.template 2015-08-03 08:23:36 UTC
(rev 18141)
+++ trunk/edk2/BaseTools/Conf/tools_def.template 2015-08-03 08:23:59 UTC
(rev 18142)
@@ -3850,9 +3850,9 @@
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 =
--script=$(EDK_TOOLS_PATH)/Scripts/gcc4.4-ld-script
--defsym=PECOFF_HEADER_SIZE=0x220
+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 =
--script=$(EDK_TOOLS_PATH)/Scripts/gcc4.4-ld-script
--defsym=PECOFF_HEADER_SIZE=0x228
+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)
@@ -3922,9 +3922,9 @@
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 =
--script=$(EDK_TOOLS_PATH)/Scripts/gcc4.9-ld-script
--defsym=PECOFF_HEADER_SIZE=0x220
+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 =
--script=$(EDK_TOOLS_PATH)/Scripts/gcc4.9-ld-script
--defsym=PECOFF_HEADER_SIZE=0x228
+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)
Deleted: trunk/edk2/BaseTools/Scripts/gcc-4K-align-ld-script
===================================================================
--- trunk/edk2/BaseTools/Scripts/gcc-4K-align-ld-script 2015-08-03 08:23:36 UTC
(rev 18141)
+++ trunk/edk2/BaseTools/Scripts/gcc-4K-align-ld-script 2015-08-03 08:23:59 UTC
(rev 18142)
@@ -1,38 +0,0 @@
-/* OUTPUT_FORMAT(efi-bsdrv-x86_64) */
-SECTIONS
-{
- /* . = 0 + SIZEOF_HEADERS; */
- . = PECOFF_HEADER_SIZE;
- .text : ALIGN(CONSTANT(COMMONPAGESIZE))
- {
- *(.text .stub .text.* .gnu.linkonce.t.*)
- *(.rodata .rodata.* .gnu.linkonce.r.*)
- *(.got .got.*)
- }
- .data : ALIGN(CONSTANT(COMMONPAGESIZE))
- {
- *(
- .data .data.* .gnu.linkonce.d.*
- .bss .bss.*
- *COM*
- )
- }
- .eh_frame : ALIGN(CONSTANT(COMMONPAGESIZE))
- {
- KEEP (*(.eh_frame))
- }
- .rela : ALIGN(CONSTANT(COMMONPAGESIZE))
- {
- *(.rela .rela.*)
- }
- /DISCARD/ : {
- *(.note.GNU-stack) *(.gnu_debuglink)
- *(.interp)
- *(.dynsym)
- *(.dynstr)
- *(.dynamic)
- *(.hash)
- *(.comment)
- }
-}
-
Deleted: trunk/edk2/BaseTools/Scripts/gcc4.4-ld-script
===================================================================
--- trunk/edk2/BaseTools/Scripts/gcc4.4-ld-script 2015-08-03 08:23:36 UTC
(rev 18141)
+++ trunk/edk2/BaseTools/Scripts/gcc4.4-ld-script 2015-08-03 08:23:59 UTC
(rev 18142)
@@ -1,38 +0,0 @@
-/* OUTPUT_FORMAT(efi-bsdrv-x86_64) */
-SECTIONS
-{
- /* . = 0 + SIZEOF_HEADERS; */
- . = PECOFF_HEADER_SIZE;
- .text ALIGN(CONSTANT(COMMONPAGESIZE)) :
- {
- *(.text .stub .text.* .gnu.linkonce.t.*)
- *(.rodata .rodata.* .gnu.linkonce.r.*)
- *(.got .got.*)
- }
- .data ALIGN(CONSTANT(COMMONPAGESIZE)) :
- {
- *(
- .data .data.* .gnu.linkonce.d.*
- .bss .bss.*
- *COM*
- )
- }
- .eh_frame ALIGN(CONSTANT(COMMONPAGESIZE)) :
- {
- KEEP (*(.eh_frame))
- }
- .rela ALIGN(CONSTANT(COMMONPAGESIZE)) :
- {
- *(.rela .rela.*)
- }
- /DISCARD/ : {
- *(.note.GNU-stack) *(.gnu_debuglink)
- *(.interp)
- *(.dynsym)
- *(.dynstr)
- *(.dynamic)
- *(.hash)
- *(.comment)
- }
-}
-
Deleted: trunk/edk2/BaseTools/Scripts/gcc4.9-ld-script
===================================================================
--- trunk/edk2/BaseTools/Scripts/gcc4.9-ld-script 2015-08-03 08:23:36 UTC
(rev 18141)
+++ trunk/edk2/BaseTools/Scripts/gcc4.9-ld-script 2015-08-03 08:23:59 UTC
(rev 18142)
@@ -1,38 +0,0 @@
-/* OUTPUT_FORMAT(efi-bsdrv-x86_64) */
-SECTIONS
-{
- /* . = 0 + SIZEOF_HEADERS; */
- . = PECOFF_HEADER_SIZE;
- .text ALIGN(CONSTANT(COMMONPAGESIZE)) :
- {
- *(.text .stub .text.* .gnu.linkonce.t.*)
- *(.rodata .rodata.* .gnu.linkonce.r.*)
- *(.got .got.*)
- }
- .data ALIGN(CONSTANT(COMMONPAGESIZE)) :
- {
- *(
- .data .data.* .gnu.linkonce.d.*
- .bss .bss.*
- *COM*
- )
- }
- .eh_frame ALIGN(CONSTANT(COMMONPAGESIZE)) :
- {
- KEEP (*(.eh_frame))
- }
- .rela ALIGN(CONSTANT(COMMONPAGESIZE)) :
- {
- *(.rela .rela.*)
- }
- /DISCARD/ : {
- *(.note.GNU-stack) *(.gnu_debuglink)
- *(.interp)
- *(.dynsym)
- *(.dynstr)
- *(.dynamic)
- *(.hash)
- *(.comment)
- }
-}
-
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
