Sync BaseTool trunk (version r2640) into EDKII BaseTools.

Signed-off-by: Gao, Liming <liming.gao@intel.com>
Reviewed-by: Liu, Jiang A <jiang.a.liu@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15089 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 160 insertions, 5 deletions

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index 06e7d6596a..ec4eb97527 100644
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -159,6 +159,9 @@ DEFINE GCC46_X64_PREFIX        = /usr/bin/
 DEFINE GCC47_IA32_PREFIX       = /usr/bin/

 DEFINE GCC47_X64_PREFIX        = /usr/bin/

 

+DEFINE GCC48_IA32_PREFIX       = /usr/bin/

+DEFINE GCC48_X64_PREFIX        = /usr/bin/

+

 DEFINE UNIX_IASL_BIN           = /usr/bin/iasl

 #DEFINE UNIX_IASL_BIN           = $(HOME)/programs/iasl

 DEFINE WIN_ASL_BIN_DIR         = C:\ASL

@@ -304,6 +307,12 @@ DEFINE CLANG_BIN = /usr/bin/
 #                             Required to build platforms or ACPI tables:

 #                               Intel(r) ACPI Compiler v20101013 from

 #                               http://www.acpica.org/downloads/previous_releases.php

+#   GCC48       -Linux-  Requires:

+#                             GCC 4.8

+#                        Optional:

+#                             Required to build platforms or ACPI tables:

+#                               Intel(r) ACPI Compiler v20101013 from

+#                               http://www.acpica.org/downloads/previous_releases.php

 #   ELFGCC      -Linux-  Requires:

 #                             GCC(this tool chain uses whatever version of gcc and binutils that is installed in /usr/bin)

 #                        Optional:

@@ -3133,6 +3142,7 @@ DEFINE GCC_DLINK_FLAGS_COMMON      = -nostdlib --pie
 DEFINE GCC_IA32_X64_DLINK_COMMON   = DEF(GCC_DLINK_FLAGS_COMMON) --gc-sections

 DEFINE GCC_ARM_AARCH64_DLINK_COMMON= -Ttext=0x0 --emit-relocs -nostdlib -u $(IMAGE_ENTRY_POINT) -e $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map

 DEFINE GCC_IA32_X64_ASLDLINK_FLAGS = DEF(GCC_IA32_X64_DLINK_COMMON) --entry _ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT)

+DEFINE GCC_ARM_AARCH64_ASLDLINK_FLAGS = DEF(GCC_ARM_AARCH64_DLINK_COMMON) --entry ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT)

 DEFINE GCC_IA32_X64_DLINK_FLAGS    = DEF(GCC_IA32_X64_DLINK_COMMON) --entry _$(IMAGE_ENTRY_POINT) --file-alignment 0x20 --section-alignment 0x20 -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map

 DEFINE GCC_IPF_DLINK_FLAGS         = -nostdlib -O2 --gc-sections --dll -static --entry $(IMAGE_ENTRY_POINT) --undefined $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map

 DEFINE GCC_IPF_OBJCOPY_FLAGS       = -I elf64-ia64-little -O efi-bsdrv-ia64

@@ -3176,6 +3186,7 @@ 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) -mword-relocations -mlittle-endian -mabi=aapcs -mapcs -fno-short-enums -save-temps -fsigned-char -mno-unaligned-access -Wno-address -fomit-frame-pointer

 DEFINE GCC46_ARM_DLINK_FLAGS         = DEF(GCC_ARM_AARCH64_DLINK_COMMON) --oformat=elf32-littlearm

+DEFINE GCC46_ARM_ASLDLINK_FLAGS      = DEF(GCC_ARM_AARCH64_ASLDLINK_FLAGS) --oformat=elf32-littlearm

 

 DEFINE GCC47_IA32_CC_FLAGS           = DEF(GCC46_IA32_CC_FLAGS)

 DEFINE GCC47_X64_CC_FLAGS            = DEF(GCC46_X64_CC_FLAGS)

@@ -3190,6 +3201,24 @@ DEFINE GCC47_ARM_CC_FLAGS            = DEF(GCC46_ARM_CC_FLAGS)
 DEFINE GCC47_AARCH64_CC_FLAGS        = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC44_ALL_CC_FLAGS) -mcmodel=large -mlittle-endian -fno-short-enums -save-temps -fverbose-asm -fsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-builtin -Wno-address

 DEFINE GCC47_ARM_DLINK_FLAGS         = DEF(GCC46_ARM_DLINK_FLAGS)

 DEFINE GCC47_AARCH64_DLINK_FLAGS     = DEF(GCC_ARM_AARCH64_DLINK_COMMON)

+DEFINE GCC47_ARM_ASLDLINK_FLAGS      = DEF(GCC46_ARM_ASLDLINK_FLAGS)

+DEFINE GCC47_AARCH64_ASLDLINK_FLAGS  = DEF(GCC_ARM_AARCH64_ASLDLINK_FLAGS)

+

+DEFINE GCC48_IA32_CC_FLAGS           = DEF(GCC47_IA32_CC_FLAGS)

+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_X64_DLINK_FLAGS         = DEF(GCC47_X64_DLINK_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)

+DEFINE GCC48_ARM_CC_FLAGS            = DEF(GCC47_ARM_CC_FLAGS)

+DEFINE GCC48_AARCH64_CC_FLAGS        = DEF(GCC47_AARCH64_CC_FLAGS)

+DEFINE GCC48_ARM_DLINK_FLAGS         = DEF(GCC47_ARM_DLINK_FLAGS)

+DEFINE GCC48_AARCH64_DLINK_FLAGS     = DEF(GCC_ARM_AARCH64_DLINK_COMMON)

+DEFINE GCC48_ARM_ASLDLINK_FLAGS      = DEF(GCC47_ARM_ASLDLINK_FLAGS)

+DEFINE GCC48_AARCH64_ASLDLINK_FLAGS  = DEF(GCC_ARM_AARCH64_ASLDLINK_FLAGS)

 

 ####################################################################################

 #

@@ -3292,7 +3321,7 @@ DEFINE GCC47_AARCH64_DLINK_FLAGS     = DEF(GCC_ARM_AARCH64_DLINK_COMMON)
 *_GCC44_*_ASLPP_FLAGS                  = DEF(GCC_ASLPP_FLAGS)

 *_GCC44_*_ASLCC_FLAGS                  = DEF(GCC_ASLCC_FLAGS)

 *_GCC44_*_VFRPP_FLAGS                  = DEF(GCC_VFRPP_FLAGS)

-*_GCC44_*_APP_FLAGS                    =

+*_GCC44_*_APP_FLAGS                    = DEF(GCC_PP_FLAGS)

 *_GCC44_*_ASL_FLAGS                    = DEF(IASL_FLAGS)

 *_GCC44_*_ASL_OUTFLAGS                 = DEF(IASL_OUTFLAGS)

 

@@ -3490,6 +3519,8 @@ DEFINE GCC47_AARCH64_DLINK_FLAGS     = DEF(GCC_ARM_AARCH64_DLINK_COMMON)
 *_GCC46_ARM_ARCHCC_FLAGS         = -mthumb

 *_GCC46_ARM_PLATFORM_FLAGS       = -march=armv7-a

 

+*_GCC46_ARM_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS)

+*_GCC46_ARM_ASLDLINK_FLAGS       = DEF(GCC46_ARM_ASLDLINK_FLAGS)

 *_GCC46_ARM_ASM_FLAGS            = DEF(GCC46_ARM_ASM_FLAGS)

 *_GCC46_ARM_DLINK_FLAGS          = DEF(GCC46_ARM_DLINK_FLAGS)

 *_GCC46_ARM_PLATFORM_FLAGS       = -march=armv7-a

@@ -3579,9 +3610,11 @@ RELEASE_GCC46_ARM_CC_FLAGS       = DEF(GCC46_ARM_CC_FLAGS) -Wno-unused-but-set-v
 *_GCC47_ARM_ASLPP_PATH           = ENV(GCC47_ARM_PREFIX)gcc

 *_GCC47_ARM_RC_PATH              = ENV(GCC47_ARM_PREFIX)objcopy

 

-*_GCC46_ARM_ARCHCC_FLAGS         = -mthumb

-*_GCC46_ARM_PLATFORM_FLAGS       = -march=armv7-a

+*_GCC47_ARM_ARCHCC_FLAGS         = -mthumb

+*_GCC47_ARM_PLATFORM_FLAGS       = -march=armv7-a

 

+*_GCC47_ARM_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS)

+*_GCC47_ARM_ASLDLINK_FLAGS       = DEF(GCC47_ARM_ASLDLINK_FLAGS)

 *_GCC47_ARM_ASM_FLAGS            = DEF(GCC47_ARM_ASM_FLAGS)

 *_GCC47_ARM_DLINK_FLAGS          = DEF(GCC47_ARM_DLINK_FLAGS)

 *_GCC47_ARM_PLATFORM_FLAGS       = -march=armv7-a

@@ -3606,6 +3639,8 @@ RELEASE_GCC47_ARM_CC_FLAGS       = DEF(GCC47_ARM_CC_FLAGS) -Wno-unused-but-set-v
 *_GCC47_AARCH64_ASLPP_PATH       = ENV(GCC47_AARCH64_PREFIX)gcc

 *_GCC47_AARCH64_RC_PATH          = ENV(GCC47_AARCH64_PREFIX)objcopy

 

+*_GCC47_AARCH64_ASLCC_FLAGS      = DEF(GCC_ASLCC_FLAGS)

+*_GCC47_AARCH64_ASLDLINK_FLAGS   = DEF(GCC47_AARCH64_ASLDLINK_FLAGS)

 *_GCC47_AARCH64_ASM_FLAGS        = DEF(GCC47_AARCH64_ASM_FLAGS)

 *_GCC47_AARCH64_DLINK_FLAGS      = DEF(GCC47_AARCH64_DLINK_FLAGS)

 *_GCC47_AARCH64_PLATFORM_FLAGS   =

@@ -3618,6 +3653,126 @@ RELEASE_GCC47_AARCH64_CC_FLAGS   = DEF(GCC47_AARCH64_CC_FLAGS) -Wno-unused-but-s
 

 ####################################################################################

 #

+# GCC 4.8 - This configuration is used to compile under Linux to produce

+#           PE/COFF binaries using GCC 4.8.

+#

+####################################################################################

+*_GCC48_*_*_FAMILY               = GCC

+

+*_GCC48_*_MAKE_PATH                    = make

+*_GCC48_*_ASL_PATH                     = DEF(UNIX_IASL_BIN)

+

+*_GCC48_*_PP_FLAGS                     = DEF(GCC_PP_FLAGS)

+*_GCC48_*_ASLPP_FLAGS                  = DEF(GCC_ASLPP_FLAGS)

+*_GCC48_*_ASLCC_FLAGS                  = DEF(GCC_ASLCC_FLAGS)

+*_GCC48_*_VFRPP_FLAGS                  = DEF(GCC_VFRPP_FLAGS)

+*_GCC48_*_APP_FLAGS                    =

+*_GCC48_*_ASL_FLAGS                    = DEF(IASL_FLAGS)

+*_GCC48_*_ASL_OUTFLAGS                 = DEF(IASL_OUTFLAGS)

+

+##################

+# GCC48 IA32 definitions

+##################

+*_GCC48_IA32_OBJCOPY_PATH         = DEF(GCC48_IA32_PREFIX)objcopy

+*_GCC48_IA32_CC_PATH              = DEF(GCC48_IA32_PREFIX)gcc

+*_GCC48_IA32_SLINK_PATH           = DEF(GCC48_IA32_PREFIX)ar

+*_GCC48_IA32_DLINK_PATH           = DEF(GCC48_IA32_PREFIX)ld

+*_GCC48_IA32_ASLDLINK_PATH        = DEF(GCC48_IA32_PREFIX)ld

+*_GCC48_IA32_ASM_PATH             = DEF(GCC48_IA32_PREFIX)gcc

+*_GCC48_IA32_PP_PATH              = DEF(GCC48_IA32_PREFIX)gcc

+*_GCC48_IA32_VFRPP_PATH           = DEF(GCC48_IA32_PREFIX)gcc

+*_GCC48_IA32_ASLCC_PATH           = DEF(GCC48_IA32_PREFIX)gcc

+*_GCC48_IA32_ASLPP_PATH           = DEF(GCC48_IA32_PREFIX)gcc

+*_GCC48_IA32_RC_PATH              = DEF(GCC48_IA32_PREFIX)objcopy

+

+*_GCC48_IA32_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m32

+*_GCC48_IA32_ASLDLINK_FLAGS       = DEF(GCC48_IA32_X64_ASLDLINK_FLAGS) -m elf_i386

+*_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_RC_FLAGS             = DEF(GCC_IA32_RC_FLAGS)

+*_GCC48_IA32_OBJCOPY_FLAGS        = 

+

+##################

+# GCC48 X64 definitions

+##################

+*_GCC48_X64_OBJCOPY_PATH         = DEF(GCC48_X64_PREFIX)objcopy

+*_GCC48_X64_CC_PATH              = DEF(GCC48_X64_PREFIX)gcc

+*_GCC48_X64_SLINK_PATH           = DEF(GCC48_X64_PREFIX)ar

+*_GCC48_X64_DLINK_PATH           = DEF(GCC48_X64_PREFIX)ld

+*_GCC48_X64_ASLDLINK_PATH        = DEF(GCC48_X64_PREFIX)ld

+*_GCC48_X64_ASM_PATH             = DEF(GCC48_X64_PREFIX)gcc

+*_GCC48_X64_PP_PATH              = DEF(GCC48_X64_PREFIX)gcc

+*_GCC48_X64_VFRPP_PATH           = DEF(GCC48_X64_PREFIX)gcc

+*_GCC48_X64_ASLCC_PATH           = DEF(GCC48_X64_PREFIX)gcc

+*_GCC48_X64_ASLPP_PATH           = DEF(GCC48_X64_PREFIX)gcc

+*_GCC48_X64_RC_PATH              = DEF(GCC48_X64_PREFIX)objcopy

+

+*_GCC48_X64_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m64

+*_GCC48_X64_ASLDLINK_FLAGS       = DEF(GCC48_IA32_X64_ASLDLINK_FLAGS) -m elf_x86_64

+*_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_RC_FLAGS             = DEF(GCC_X64_RC_FLAGS)

+*_GCC48_X64_OBJCOPY_FLAGS        = 

+

+##################

+# GCC48 ARM definitions

+##################

+*_GCC48_ARM_CC_PATH              = ENV(GCC48_ARM_PREFIX)gcc

+*_GCC48_ARM_SLINK_PATH           = ENV(GCC48_ARM_PREFIX)ar

+*_GCC48_ARM_DLINK_PATH           = ENV(GCC48_ARM_PREFIX)ld

+*_GCC48_ARM_ASLDLINK_PATH        = ENV(GCC48_ARM_PREFIX)ld

+*_GCC48_ARM_ASM_PATH             = ENV(GCC48_ARM_PREFIX)gcc

+*_GCC48_ARM_PP_PATH              = ENV(GCC48_ARM_PREFIX)gcc

+*_GCC48_ARM_VFRPP_PATH           = ENV(GCC48_ARM_PREFIX)gcc

+*_GCC48_ARM_ASLCC_PATH           = ENV(GCC48_ARM_PREFIX)gcc

+*_GCC48_ARM_ASLPP_PATH           = ENV(GCC48_ARM_PREFIX)gcc

+*_GCC48_ARM_RC_PATH              = ENV(GCC48_ARM_PREFIX)objcopy

+

+*_GCC48_ARM_ARCHCC_FLAGS         = -mthumb

+*_GCC48_ARM_PLATFORM_FLAGS       = -march=armv7-a

+

+*_GCC48_ARM_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS)

+*_GCC48_ARM_ASLDLINK_FLAGS       = DEF(GCC48_ARM_ASLDLINK_FLAGS)

+*_GCC48_ARM_ASM_FLAGS            = DEF(GCC48_ARM_ASM_FLAGS)

+*_GCC48_ARM_DLINK_FLAGS          = DEF(GCC48_ARM_DLINK_FLAGS)

+*_GCC48_ARM_PLATFORM_FLAGS       = -march=armv7-a

+*_GCC48_ARM_PP_FLAGS             = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_PP_FLAGS)

+*_GCC48_ARM_RC_FLAGS             = DEF(GCC_ARM_RC_FLAGS)

+*_GCC48_ARM_VFRPP_FLAGS          = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_VFRPP_FLAGS)

+

+  DEBUG_GCC48_ARM_CC_FLAGS       = DEF(GCC48_ARM_CC_FLAGS) -O0

+RELEASE_GCC48_ARM_CC_FLAGS       = DEF(GCC48_ARM_CC_FLAGS) -Wno-unused-but-set-variable

+

+##################

+# GCC48 AARCH64 definitions

+##################

+*_GCC48_AARCH64_CC_PATH          = ENV(GCC48_AARCH64_PREFIX)gcc

+*_GCC48_AARCH64_SLINK_PATH       = ENV(GCC48_AARCH64_PREFIX)ar

+*_GCC48_AARCH64_DLINK_PATH       = ENV(GCC48_AARCH64_PREFIX)ld

+*_GCC48_AARCH64_ASLDLINK_PATH    = ENV(GCC48_AARCH64_PREFIX)ld

+*_GCC48_AARCH64_ASM_PATH         = ENV(GCC48_AARCH64_PREFIX)gcc

+*_GCC48_AARCH64_PP_PATH          = ENV(GCC48_AARCH64_PREFIX)gcc

+*_GCC48_AARCH64_VFRPP_PATH       = ENV(GCC48_AARCH64_PREFIX)gcc

+*_GCC48_AARCH64_ASLCC_PATH       = ENV(GCC48_AARCH64_PREFIX)gcc

+*_GCC48_AARCH64_ASLPP_PATH       = ENV(GCC48_AARCH64_PREFIX)gcc

+*_GCC48_AARCH64_RC_PATH          = ENV(GCC48_AARCH64_PREFIX)objcopy

+

+*_GCC48_AARCH64_ASLCC_FLAGS      = DEF(GCC_ASLCC_FLAGS)

+*_GCC48_AARCH64_ASLDLINK_FLAGS   = DEF(GCC48_AARCH64_ASLDLINK_FLAGS)

+*_GCC48_AARCH64_ASM_FLAGS        = DEF(GCC48_AARCH64_ASM_FLAGS)

+*_GCC48_AARCH64_DLINK_FLAGS      = DEF(GCC48_AARCH64_DLINK_FLAGS)

+*_GCC48_AARCH64_PLATFORM_FLAGS   =

+*_GCC48_AARCH64_PP_FLAGS         = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_PP_FLAGS)

+*_GCC48_AARCH64_RC_FLAGS         = DEF(GCC_AARCH64_RC_FLAGS)

+*_GCC48_AARCH64_VFRPP_FLAGS      = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_VFRPP_FLAGS)

+

+  DEBUG_GCC48_AARCH64_CC_FLAGS   = DEF(GCC48_AARCH64_CC_FLAGS) -O0

+RELEASE_GCC48_AARCH64_CC_FLAGS   = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-set-variable

+

+####################################################################################

+#

 # Cygwin GCC And Intel ACPI Compiler

 #

 ####################################################################################

@@ -5532,7 +5687,7 @@ RELEASE_RVCTCYGWIN_ARM_CC_FLAGS  = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_F
 *_ARMGCC_*_ASL_OUTFLAGS      = DEF(IASL_OUTFLAGS)

 *_ARMGCC_*_ASLPP_FLAGS       = -x c -E -P

 *_ARMGCC_*_ASLCC_FLAGS       = -x c

-*_ARMGCC_*_ASLDLINK_FLAGS    = DEF(GCC_DLINK_FLAGS_COMMON) --entry _ReferenceAcpiTable

+*_ARMGCC_*_ASLDLINK_FLAGS    = DEF(GCC_DLINK_FLAGS_COMMON) --entry ReferenceAcpiTable

 

 ##################

 # ARM definitions

@@ -5626,7 +5781,7 @@ RELEASE_ARMGCC_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_AARC
 *_ARMLINUXGCC_*_ASL_OUTFLAGS       = DEF(IASL_OUTFLAGS)

 *_ARMLINUXGCC_*_ASLPP_FLAGS        = -x c -E -P

 *_ARMLINUXGCC_*_ASLCC_FLAGS        = -x c

-*_ARMLINUXGCC_*_ASLDLINK_FLAGS     = DEF(GCC_DLINK_FLAGS_COMMON) --entry _ReferenceAcpiTable

+*_ARMLINUXGCC_*_ASLDLINK_FLAGS     = DEF(GCC_DLINK_FLAGS_COMMON) --entry ReferenceAcpiTable

 

 ##################

 # ARM definitions