edk2-buildtools-commits

SF.net SVN: edk2-buildtools:[2550] trunk/BaseTools/Conf/tools_def.template

[<jlj...@us...>]

Revision: 2550
          http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2550&view=rev
Author:   jljusten
Date:     2012-08-15 00:34:24 +0000 (Wed, 15 Aug 2012)
Log Message:
-----------
tools_def: add GCC47 configuration to BaseTools/Conf template

The GCC 4.7 configuration needs to remove the -melf_x86_64 option from the
assembler command line.  Invalid -m options are now reported as errors even
when not compiling, rather than being ignored.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Paolo Bonzini <pbo...@re...>
Reviewed-by: Jordan Justen <jor...@in...>

Modified Paths:
--------------
    trunk/BaseTools/Conf/tools_def.template

Modified: trunk/BaseTools/Conf/tools_def.template
===================================================================
--- trunk/BaseTools/Conf/tools_def.template	2012-08-02 10:05:32 UTC (rev 2549)
+++ trunk/BaseTools/Conf/tools_def.template	2012-08-15 00:34:24 UTC (rev 2550)
@@ -147,6 +147,9 @@
 DEFINE GCC46_IA32_PREFIX       = /usr/bin/
 DEFINE GCC46_X64_PREFIX        = /usr/bin/
 
+DEFINE GCC47_IA32_PREFIX       = /usr/bin/
+DEFINE GCC47_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
@@ -277,6 +280,12 @@
 #                             Required to build platforms or ACPI tables:
 #                               Intel(r) ACPI Compiler v20101013 from
 #                               http://www.acpica.org/downloads/previous_releases.php
+#   GCC47       -Linux-  Requires:
+#                             GCC 4.7 (Native)
+#                        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:
@@ -2610,6 +2619,14 @@
 DEFINE GCC46_X64_DLINK_FLAGS         = DEF(GCC45_X64_DLINK_FLAGS)
 DEFINE GCC46_ASM_FLAGS               = DEF(GCC45_ASM_FLAGS)
 
+DEFINE GCC47_IA32_CC_FLAGS           = DEF(GCC46_IA32_CC_FLAGS) -Wno-address -Wno-unused-but-set-variable
+DEFINE GCC47_X64_CC_FLAGS            = DEF(GCC46_X64_CC_FLAGS) -Wno-address -Wno-unused-but-set-variable
+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_X64_DLINK_FLAGS         = DEF(GCC46_X64_DLINK_FLAGS)
+DEFINE GCC47_ASM_FLAGS               = DEF(GCC46_ASM_FLAGS)
+
 ####################################################################################
 #
 # Unix GCC And Intel Linux ACPI Compiler
@@ -2893,6 +2910,71 @@
 
 ####################################################################################
 #
+# GCC 4.7 - This configuration is used to compile under Linux to produce
+#           PE/COFF binaries using GCC 4.7.
+#
+####################################################################################
+*_GCC47_*_*_FAMILY               = GCC
+
+*_GCC47_*_MAKE_PATH                    = make
+*_GCC47_*_ASL_PATH                     = DEF(UNIX_IASL_BIN)
+
+*_GCC47_*_PP_FLAGS                     = DEF(GCC_PP_FLAGS)
+*_GCC47_*_ASLPP_FLAGS                  = DEF(GCC_ASLPP_FLAGS)
+*_GCC47_*_ASLCC_FLAGS                  = DEF(GCC_ASLCC_FLAGS)
+*_GCC47_*_VFRPP_FLAGS                  = DEF(GCC_VFRPP_FLAGS)
+*_GCC47_*_APP_FLAGS                    =
+*_GCC47_*_ASL_FLAGS                    = DEF(IASL_FLAGS)
+*_GCC47_*_ASL_OUTFLAGS                 = DEF(IASL_OUTFLAGS)
+
+##################
+# GCC47 IA32 definitions
+##################
+*_GCC47_IA32_OBJCOPY_PATH         = DEF(GCC47_IA32_PREFIX)objcopy
+*_GCC47_IA32_CC_PATH              = DEF(GCC47_IA32_PREFIX)gcc
+*_GCC47_IA32_SLINK_PATH           = DEF(GCC47_IA32_PREFIX)ar
+*_GCC47_IA32_DLINK_PATH           = DEF(GCC47_IA32_PREFIX)ld
+*_GCC47_IA32_ASLDLINK_PATH        = DEF(GCC47_IA32_PREFIX)ld
+*_GCC47_IA32_ASM_PATH             = DEF(GCC47_IA32_PREFIX)gcc
+*_GCC47_IA32_PP_PATH              = DEF(GCC47_IA32_PREFIX)gcc
+*_GCC47_IA32_VFRPP_PATH           = DEF(GCC47_IA32_PREFIX)gcc
+*_GCC47_IA32_ASLCC_PATH           = DEF(GCC47_IA32_PREFIX)gcc
+*_GCC47_IA32_ASLPP_PATH           = DEF(GCC47_IA32_PREFIX)gcc
+*_GCC47_IA32_RC_PATH              = DEF(GCC47_IA32_PREFIX)objcopy
+
+*_GCC47_IA32_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m32
+*_GCC47_IA32_ASLDLINK_FLAGS       = DEF(GCC47_IA32_X64_ASLDLINK_FLAGS) -m elf_i386
+*_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_RC_FLAGS             = DEF(GCC_IA32_RC_FLAGS)
+*_GCC47_IA32_OBJCOPY_FLAGS        = 
+
+##################
+# GCC47 X64 definitions
+##################
+*_GCC47_X64_OBJCOPY_PATH         = DEF(GCC47_X64_PREFIX)objcopy
+*_GCC47_X64_CC_PATH              = DEF(GCC47_X64_PREFIX)gcc
+*_GCC47_X64_SLINK_PATH           = DEF(GCC47_X64_PREFIX)ar
+*_GCC47_X64_DLINK_PATH           = DEF(GCC47_X64_PREFIX)ld
+*_GCC47_X64_ASLDLINK_PATH        = DEF(GCC47_X64_PREFIX)ld
+*_GCC47_X64_ASM_PATH             = DEF(GCC47_X64_PREFIX)gcc
+*_GCC47_X64_PP_PATH              = DEF(GCC47_X64_PREFIX)gcc
+*_GCC47_X64_VFRPP_PATH           = DEF(GCC47_X64_PREFIX)gcc
+*_GCC47_X64_ASLCC_PATH           = DEF(GCC47_X64_PREFIX)gcc
+*_GCC47_X64_ASLPP_PATH           = DEF(GCC47_X64_PREFIX)gcc
+*_GCC47_X64_RC_PATH              = DEF(GCC47_X64_PREFIX)objcopy
+
+*_GCC47_X64_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m64
+*_GCC47_X64_ASLDLINK_FLAGS       = DEF(GCC47_IA32_X64_ASLDLINK_FLAGS) -m elf_x86_64
+*_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_RC_FLAGS             = DEF(GCC_X64_RC_FLAGS)
+*_GCC47_X64_OBJCOPY_FLAGS        = 
+
+####################################################################################
+#
 # Cygwin GCC And Intel ACPI Compiler
 #
 ####################################################################################

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: edk2-buildtools:[2555] trunk/BaseTools/Conf/tools_def.template

[<oli...@us...>]

Revision: 2555
          http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2555&view=rev
Author:   oliviermartin
Date:     2012-10-18 15:46:57 +0000 (Thu, 18 Oct 2012)
Log Message:
-----------
BaseTools/tools_def.template: Ignore warnings for unused variables in RELEASE builds

... for variables which are only used in DEBUG builds.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <oli...@ar...>

Modified Paths:
--------------
    trunk/BaseTools/Conf/tools_def.template

Modified: trunk/BaseTools/Conf/tools_def.template
===================================================================
--- trunk/BaseTools/Conf/tools_def.template	2012-10-11 03:02:07 UTC (rev 2554)
+++ trunk/BaseTools/Conf/tools_def.template	2012-10-18 15:46:57 UTC (rev 2555)
@@ -4766,7 +4766,7 @@
 *_RVCT_ARM_MAKE_PATH       = nmake /NOLOGO
 *_RVCT_ARM_SLINK_FLAGS     = --partial -o
   DEBUG_RVCT_ARM_CC_FLAGS  = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O1 -g
-RELEASE_RVCT_ARM_CC_FLAGS  = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O2
+RELEASE_RVCT_ARM_CC_FLAGS  = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --diag_suppress=550 DEF(RVCT_ALL_CC_FLAGS) -O2
 
 ##################
 # ARM definitions
@@ -4805,7 +4805,7 @@
 *_RVCTLINUX_ARM_MAKE_PATH       = make
 *_RVCTLINUX_ARM_SLINK_FLAGS     = --partial -o
   DEBUG_RVCTLINUX_ARM_CC_FLAGS  = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O1 -g
-RELEASE_RVCTLINUX_ARM_CC_FLAGS  = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O2
+RELEASE_RVCTLINUX_ARM_CC_FLAGS  = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --diag_suppress=550 DEF(RVCT_ALL_CC_FLAGS) -O2
 
 ##################
 # ARM definitions
@@ -4853,7 +4853,7 @@
 *_RVCTCYGWIN_ARM_MAKE_PATH       = make
 *_RVCTCYGWIN_ARM_SLINK_FLAGS     = "$(SLINKPATH_FLAG)" --partial -o
   DEBUG_RVCTCYGWIN_ARM_CC_FLAGS  = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O1 -g
-RELEASE_RVCTCYGWIN_ARM_CC_FLAGS  = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O2
+RELEASE_RVCTCYGWIN_ARM_CC_FLAGS  = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --diag_suppress=550 DEF(RVCT_ALL_CC_FLAGS) -O2
 
 ##################
 # ARM definitions

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: edk2-buildtools:[2556] trunk/BaseTools/Conf/tools_def.template

[<oli...@us...>]

Revision: 2556
          http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2556&view=rev
Author:   oliviermartin
Date:     2012-10-18 15:51:38 +0000 (Thu, 18 Oct 2012)
Log Message:
-----------
BaseTools/Conf: Treat warnings as errors (ARM RVCT)

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <oli...@ar...>

Modified Paths:
--------------
    trunk/BaseTools/Conf/tools_def.template

Modified: trunk/BaseTools/Conf/tools_def.template
===================================================================
--- trunk/BaseTools/Conf/tools_def.template	2012-10-18 15:46:57 UTC (rev 2555)
+++ trunk/BaseTools/Conf/tools_def.template	2012-10-18 15:51:38 UTC (rev 2556)
@@ -4736,7 +4736,8 @@
 #
 ####################################################################################
 
-DEFINE RVCT_ALL_CC_FLAGS   = --c90 -c --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --enum_is_int --preinclude AutoGen.h --diag_warning 167 --diag_style=ide
+DEFINE RVCT_ALL_ASM_FLAGS   = --diag_suppress=1786 --diag_error=warning --apcs /interwork
+DEFINE RVCT_ALL_CC_FLAGS   = --c90 -c --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --enum_is_int --preinclude AutoGen.h --diag_suppress=186 --diag_warning 167 --diag_error=warning --diag_style=ide
 DEFINE RVCT_ALL_DLINK_FLAGS   = --ro-base 0 --no_scanlib --reloc --no_exceptions --datacompressor off --strict --symbols --diag_style=ide
 
 ####################################################################################
@@ -4760,7 +4761,7 @@
 RELEASE_RVCT_ARM_DLINK_FLAGS     = $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map 
 
 
-*_RVCT_ARM_ASM_FLAGS       = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) --apcs /interwork
+*_RVCT_ARM_ASM_FLAGS       = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_ASM_FLAGS)
 *_RVCT_ARM_PP_FLAGS        = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E
 *_RVCT_ARM_VFRPP_FLAGS     = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E  -DVFRCOMPILE --preinclude $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
 *_RVCT_ARM_MAKE_PATH       = nmake /NOLOGO
@@ -4799,7 +4800,7 @@
 DEBUG_RVCTLINUX_ARM_DLINK_FLAGS     = $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map 
 RELEASE_RVCTLINUX_ARM_DLINK_FLAGS   = $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map
 
-*_RVCTLINUX_ARM_ASM_FLAGS       = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) --apcs /interwork
+*_RVCTLINUX_ARM_ASM_FLAGS       = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_ASM_FLAGS)
 *_RVCTLINUX_ARM_PP_FLAGS        = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E
 *_RVCTLINUX_ARM_VFRPP_FLAGS     = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E  -DVFRCOMPILE --preinclude $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
 *_RVCTLINUX_ARM_MAKE_PATH       = make
@@ -4847,7 +4848,7 @@
   DEBUG_RVCTCYGWIN_ARM_DLINK_FLAGS     = "$(DLINKPATH_FLAG)" $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list `cygpath -m $(DEST_DIR_DEBUG)/$(BASE_NAME).map` 
 RELEASE_RVCTCYGWIN_ARM_DLINK_FLAGS     = "$(DLINKPATH_FLAG)" $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list `cygpath -m $(DEST_DIR_DEBUG)/$(BASE_NAME).map` 
  
-*_RVCTCYGWIN_ARM_ASM_FLAGS       = "$(ASMPATH_FLAG)" $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) --apcs /interwork
+*_RVCTCYGWIN_ARM_ASM_FLAGS       = "$(ASMPATH_FLAG)" $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_ASM_FLAGS)
 *_RVCTCYGWIN_ARM_PP_FLAGS        = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E
 *_RVCTCYGWIN_ARM_VFRPP_FLAGS     = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E  -DVFRCOMPILE --preinclude `cygpath -m $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h`
 *_RVCTCYGWIN_ARM_MAKE_PATH       = make

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: edk2-buildtools:[2557] trunk/BaseTools/Conf/tools_def.template

[<oli...@us...>]

Revision: 2557
          http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2557&view=rev
Author:   oliviermartin
Date:     2012-10-18 15:57:46 +0000 (Thu, 18 Oct 2012)
Log Message:
-----------
BaseTools/Conf: Fix tools_def.template for ARMLINUXGCC

Fix builds using ARMLINUXGCC version 4.6.3.

- GCC 4.6 turns the stack protector on by default.  This patch disables it.
- some BSPs require unaligned accesses to be disabled

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ryan Harkin <rya...@li...>
Reviewed-by: Olivier Martin <oli...@ar...>

Modified Paths:
--------------
    trunk/BaseTools/Conf/tools_def.template

Modified: trunk/BaseTools/Conf/tools_def.template
===================================================================
--- trunk/BaseTools/Conf/tools_def.template	2012-10-18 15:51:38 UTC (rev 2556)
+++ trunk/BaseTools/Conf/tools_def.template	2012-10-18 15:57:46 UTC (rev 2557)
@@ -4980,8 +4980,8 @@
 *_ARMLINUXGCC_ARM_SLINK_FLAGS =  -rc
 *_ARMLINUXGCC_ARM_DLINK_FLAGS =  $(ARCHDLINK_FLAGS) -Ttext=0x0 --oformat=elf32-littlearm --emit-relocs -nostdlib -u $(IMAGE_ENTRY_POINT) -e $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
 
-  DEBUG_ARMLINUXGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -O0
-RELEASE_ARMLINUXGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -Wno-unused-but-set-variable
+  DEBUG_ARMLINUXGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -fno-stack-protector -mno-unaligned-access -O0
+RELEASE_ARMLINUXGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -fno-stack-protector  -mno-unaligned-access -Wno-unused-but-set-variable
 
 #################
 # ASM 16 linker defintions

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: edk2-buildtools:[2580] trunk/BaseTools/Conf/tools_def.template

[<oli...@us...>]

Revision: 2580
          http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2580&view=rev
Author:   oliviermartin
Date:     2013-05-07 15:13:32 +0000 (Tue, 07 May 2013)
Log Message:
-----------
Update ARMGCC to support cross/native compilation.

The ARMGCC target currently has hard-wired toolchain
binary names (arm-none-eabi-*). This is quite unflexible,
does not match all existing compatible cross-toolchains and does not
permit cross-compiling at all.

This patch makes the ARMGCC target use the CROSS_COMPILE
environment variable, just like the Linux kernel, as a full prefix to the
actual toolchain binaries. Omitting or unsetting CROSS_COMPILE will make
both targets equivalent to ELFGCC, enabling native builds on ARM platforms..

It will break existing build scripts, but the fix would be a one-line
change of an environment variable.

Signed-off-by: lei...@li...
Reviewed-by: Olivier Martin <oli...@ar...>

Modified Paths:
--------------
    trunk/BaseTools/Conf/tools_def.template

Modified: trunk/BaseTools/Conf/tools_def.template
===================================================================
--- trunk/BaseTools/Conf/tools_def.template	2013-04-07 01:50:50 UTC (rev 2579)
+++ trunk/BaseTools/Conf/tools_def.template	2013-05-07 15:13:32 UTC (rev 2580)
@@ -4894,16 +4894,16 @@
 # ARM definitions
 ##################
 
-*_ARMGCC_ARM_ASLCC_PATH      = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc
-*_ARMGCC_ARM_ASLDLINK_PATH   = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-ld
-*_ARMGCC_ARM_ASLPP_PATH      = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc
+*_ARMGCC_ARM_ASLCC_PATH      = ENV(CROSS_COMPILE)gcc
+*_ARMGCC_ARM_ASLDLINK_PATH   = ENV(CROSS_COMPILE)ld
+*_ARMGCC_ARM_ASLPP_PATH      = ENV(CROSS_COMPILE)gcc
 
-*_ARMGCC_ARM_CC_PATH         = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc
-*_ARMGCC_ARM_SLINK_PATH      = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-ar
-*_ARMGCC_ARM_DLINK_PATH      = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-ld
-*_ARMGCC_ARM_ASM_PATH        = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-as
-*_ARMGCC_ARM_PP_PATH         = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc
-*_ARMGCC_ARM_VFRPP_PATH      = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc
+*_ARMGCC_ARM_CC_PATH         = ENV(CROSS_COMPILE)gcc
+*_ARMGCC_ARM_SLINK_PATH      = ENV(CROSS_COMPILE)ar
+*_ARMGCC_ARM_DLINK_PATH      = ENV(CROSS_COMPILE)ld
+*_ARMGCC_ARM_ASM_PATH        = ENV(CROSS_COMPILE)as
+*_ARMGCC_ARM_PP_PATH         = ENV(CROSS_COMPILE)gcc
+*_ARMGCC_ARM_VFRPP_PATH      = ENV(CROSS_COMPILE)gcc
 
 #
 # Use default values, or override in DSC file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: edk2-buildtools:[2585] trunk/BaseTools/Conf/tools_def.template

[<lh...@us...>]

Revision: 2585
          http://sourceforge.net/p/edk2-buildtools/code/2585
Author:   lhauch
Date:     2013-06-20 01:46:19 +0000 (Thu, 20 Jun 2013)
Log Message:
-----------
Fixing typo in the ELFGCC tool chain tag name

Modified Paths:
--------------
    trunk/BaseTools/Conf/tools_def.template

Modified: trunk/BaseTools/Conf/tools_def.template
===================================================================
--- trunk/BaseTools/Conf/tools_def.template	2013-06-17 06:39:51 UTC (rev 2584)
+++ trunk/BaseTools/Conf/tools_def.template	2013-06-20 01:46:19 UTC (rev 2585)
@@ -3214,9 +3214,9 @@
 *_ELFGCC_IA32_ASM_PATH              = DEF(ELFGCC_BIN)/gcc
 *_ELFGCC_IA32_PP_PATH               = DEF(ELFGCC_BIN)/gcc
 *_ELFGCC_IA32_VFRPP_PATH            = DEF(ELFGCC_BIN)/gcc
-*_ELFGCC32_IA32_ASLCC_PATH          = DEF(ELFGCC_BIN)/gcc
-*_ELFGCC32_IA32_ASLPP_PATH          = DEF(ELFGCC_BIN)/gcc
-*_ELFGCC32_IA32_ASLDLINK_PATH       = DEF(ELFGCC_BIN)/ld
+*_ELFGCC_IA32_ASLCC_PATH            = DEF(ELFGCC_BIN)/gcc
+*_ELFGCC_IA32_ASLPP_PATH            = DEF(ELFGCC_BIN)/gcc
+*_ELFGCC_IA32_ASLDLINK_PATH         = DEF(ELFGCC_BIN)/ld
 *_ELFGCC_IA32_RC_PATH               = DEF(ELFGCC_BIN)/objcopy
 
 *_ELFGCC_IA32_CC_FLAGS              = -m32 -g -fshort-wchar -fno-strict-aliasing -Wall -malign-double -c -include $(DEST_DIR_DEBUG)/AutoGen.h -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: edk2-buildtools:[2591] trunk/BaseTools/Conf/tools_def.template

[<oli...@us...>]

Revision: 2591
          http://sourceforge.net/p/edk2-buildtools/code/2591
Author:   oliviermartin
Date:     2013-07-31 10:50:36 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
BaseTools/tools_def.template: Removed duplicated CFLAGS

GCC46's '-Wno-address -Wno-unused-but-set-variable' were already defined by GCC45.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <oli...@ar...>
Reviewed-by: Jordan Justen <jor...@in...>
Reviewed-by: Yingke Liu <yin...@in...>

Modified Paths:
--------------
    trunk/BaseTools/Conf/tools_def.template

Modified: trunk/BaseTools/Conf/tools_def.template
===================================================================
--- trunk/BaseTools/Conf/tools_def.template	2013-07-31 10:43:59 UTC (rev 2590)
+++ trunk/BaseTools/Conf/tools_def.template	2013-07-31 10:50:36 UTC (rev 2591)
@@ -2620,8 +2620,8 @@
 DEFINE GCC46_X64_DLINK_FLAGS         = DEF(GCC45_X64_DLINK_FLAGS)
 DEFINE GCC46_ASM_FLAGS               = DEF(GCC45_ASM_FLAGS)
 
-DEFINE GCC47_IA32_CC_FLAGS           = DEF(GCC46_IA32_CC_FLAGS) -Wno-address -Wno-unused-but-set-variable
-DEFINE GCC47_X64_CC_FLAGS            = DEF(GCC46_X64_CC_FLAGS) -Wno-address -Wno-unused-but-set-variable
+DEFINE GCC47_IA32_CC_FLAGS           = DEF(GCC46_IA32_CC_FLAGS)
+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)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: edk2-buildtools:[2592] trunk/BaseTools/Conf/tools_def.template

[<oli...@us...>]

Revision: 2592
          http://sourceforge.net/p/edk2-buildtools/code/2592
Author:   oliviermartin
Date:     2013-07-31 10:55:44 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
BaseToools/tools_def.template: Renamed 'GCC_ARMGCC_CC_FLAGS' into 'GCC_ARM_CC_FLAGS'

This macro is not 'ARMGCC' toolchain specific. It can be reused by all the ARM GNU toolchains.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <oli...@ar...>
Acked-by: Jordan Justen <jor...@in...>
Reviewed-by: Yingke Liu <yin...@in...>

Modified Paths:
--------------
    trunk/BaseTools/Conf/tools_def.template

Modified: trunk/BaseTools/Conf/tools_def.template
===================================================================
--- trunk/BaseTools/Conf/tools_def.template	2013-07-31 10:50:36 UTC (rev 2591)
+++ trunk/BaseTools/Conf/tools_def.template	2013-07-31 10:55:44 UTC (rev 2592)
@@ -1,6 +1,7 @@
 #
 #  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
 #  Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
+#  Portions copyright (c) 2011 - 2013, ARM Ltd. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -2576,7 +2577,7 @@
 DEFINE GCC_IA32_CC_FLAGS           = DEF(GCC_ALL_CC_FLAGS) -m32 -malign-double -freorder-blocks -freorder-blocks-and-partition -O2 -mno-stack-arg-probe
 DEFINE GCC_X64_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -mno-red-zone -Wno-address -mno-stack-arg-probe
 DEFINE GCC_IPF_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -minline-int-divide-min-latency
-DEFINE GCC_ARMGCC_CC_FLAGS         = DEF(GCC_ALL_CC_FLAGS) -mword-relocations -mlittle-endian -mabi=aapcs -mapcs -fno-short-enums -save-temps -fsigned-char  -ffunction-sections -fdata-sections -fomit-frame-pointer -Wno-address
+DEFINE GCC_ARM_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -mword-relocations -mlittle-endian -mabi=aapcs -mapcs -fno-short-enums -save-temps -fsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -Wno-address
 DEFINE GCC_AARCH64_CC_FLAGS        = DEF(GCC_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 GCC_DLINK_FLAGS_COMMON      = -nostdlib --pie
 DEFINE GCC_IA32_X64_DLINK_COMMON   = DEF(GCC_DLINK_FLAGS_COMMON) --gc-sections
@@ -4924,8 +4925,8 @@
 *_ARMGCC_ARM_SLINK_FLAGS =  -rc
 *_ARMGCC_ARM_DLINK_FLAGS =  $(ARCHDLINK_FLAGS) -Ttext=0x0 --oformat=elf32-littlearm --emit-relocs -nostdlib -u $(IMAGE_ENTRY_POINT) -e $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
 
-  DEBUG_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -O0
-RELEASE_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -Wno-unused
+  DEBUG_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARM_CC_FLAGS) -O0
+RELEASE_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARM_CC_FLAGS) -Wno-unused
 
 ######################
 # AArch64 definitions
@@ -5018,8 +5019,8 @@
 *_ARMLINUXGCC_ARM_SLINK_FLAGS =  -rc
 *_ARMLINUXGCC_ARM_DLINK_FLAGS =  $(ARCHDLINK_FLAGS) -Ttext=0x0 --oformat=elf32-littlearm --emit-relocs -nostdlib -u $(IMAGE_ENTRY_POINT) -e $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
 
-  DEBUG_ARMLINUXGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -fno-stack-protector -mno-unaligned-access -O0
-RELEASE_ARMLINUXGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -fno-stack-protector  -mno-unaligned-access -Wno-unused-but-set-variable
+  DEBUG_ARMLINUXGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARM_CC_FLAGS) -fno-stack-protector -mno-unaligned-access -O0
+RELEASE_ARMLINUXGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARM_CC_FLAGS) -fno-stack-protector  -mno-unaligned-access -Wno-unused-but-set-variable
 
 ######################
 # AArch64 definitions

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: edk2-buildtools:[2593] trunk/BaseTools/Conf/tools_def.template

[<oli...@us...>]

Revision: 2593
          http://sourceforge.net/p/edk2-buildtools/code/2593
Author:   oliviermartin
Date:     2013-07-31 10:58:26 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
BaseTools/tools_def.template: Added ARM and AARCH64 support to GCC45 / GCC46 / GCC47 toolchains

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <oli...@ar...>
Acked-by: Jordan Justen <jor...@in...>
Reviewed-by: Yingke Liu <yin...@in...>

Modified Paths:
--------------
    trunk/BaseTools/Conf/tools_def.template

Modified: trunk/BaseTools/Conf/tools_def.template
===================================================================
--- trunk/BaseTools/Conf/tools_def.template	2013-07-31 10:55:44 UTC (rev 2592)
+++ trunk/BaseTools/Conf/tools_def.template	2013-07-31 10:58:26 UTC (rev 2593)
@@ -2581,6 +2581,7 @@
 DEFINE GCC_AARCH64_CC_FLAGS        = DEF(GCC_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 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_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
@@ -2592,9 +2593,11 @@
 DEFINE GCC_ASLPP_FLAGS             = -x c -E -P
 DEFINE GCC_ASLCC_FLAGS             = -x c
 DEFINE GCC_WINDRES_FLAGS           = -J rc -O coff
-DEFINE GCC_IA32_RC_FLAGS           = -I binary -O elf32-i386        -B i386 --rename-section .data=.hii
-DEFINE GCC_X64_RC_FLAGS            = -I binary -O elf64-x86-64      -B i386 --rename-section .data=.hii
-DEFINE GCC_IPF_RC_FLAGS            = -I binary -O elf64-ia64-little -B ia64 --rename-section .data=.hii
+DEFINE GCC_IA32_RC_FLAGS           = -I binary -O elf32-i386          -B i386    --rename-section .data=.hii
+DEFINE GCC_X64_RC_FLAGS            = -I binary -O elf64-x86-64        -B i386    --rename-section .data=.hii
+DEFINE GCC_IPF_RC_FLAGS            = -I binary -O elf64-ia64-little   -B ia64    --rename-section .data=.hii
+DEFINE GCC_ARM_RC_FLAGS            = -I binary -O elf32-littlearm     -B arm     --rename-section .data=.hii
+DEFINE GCC_AARCH64_RC_FLAGS        = -I binary -O elf64-littleaarch64 -B aarch64 --rename-section .data=.hii
 
 DEFINE GCC44_ALL_CC_FLAGS            = -g -fshort-wchar -fno-stack-protector -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -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 -D EFI32
@@ -2620,6 +2623,9 @@
 DEFINE GCC46_IA32_X64_DLINK_FLAGS    = DEF(GCC45_IA32_X64_DLINK_FLAGS)
 DEFINE GCC46_X64_DLINK_FLAGS         = DEF(GCC45_X64_DLINK_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) -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 GCC47_IA32_CC_FLAGS           = DEF(GCC46_IA32_CC_FLAGS)
 DEFINE GCC47_X64_CC_FLAGS            = DEF(GCC46_X64_CC_FLAGS)
@@ -2628,6 +2634,12 @@
 DEFINE GCC47_IA32_X64_DLINK_FLAGS    = DEF(GCC46_IA32_X64_DLINK_FLAGS)
 DEFINE GCC47_X64_DLINK_FLAGS         = DEF(GCC46_X64_DLINK_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
+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)
 
 ####################################################################################
 #
@@ -2910,6 +2922,34 @@
 *_GCC46_X64_RC_FLAGS             = DEF(GCC_X64_RC_FLAGS)
 *_GCC46_X64_OBJCOPY_FLAGS        = 
 
+##################
+# GCC46 ARM definitions
+##################
+*_GCC46_ARM_OBJCOPY_PATH         = echo
+*_GCC46_ARM_CC_PATH              = ENV(GCC46_ARM_PREFIX)gcc
+*_GCC46_ARM_SLINK_PATH           = ENV(GCC46_ARM_PREFIX)ar
+*_GCC46_ARM_DLINK_PATH           = ENV(GCC46_ARM_PREFIX)ld
+*_GCC46_ARM_ASLDLINK_PATH        = ENV(GCC46_ARM_PREFIX)ld
+*_GCC46_ARM_ASM_PATH             = ENV(GCC46_ARM_PREFIX)gcc
+*_GCC46_ARM_PP_PATH              = ENV(GCC46_ARM_PREFIX)gcc
+*_GCC46_ARM_VFRPP_PATH           = ENV(GCC46_ARM_PREFIX)gcc
+*_GCC46_ARM_ASLCC_PATH           = ENV(GCC46_ARM_PREFIX)gcc
+*_GCC46_ARM_ASLPP_PATH           = ENV(GCC46_ARM_PREFIX)gcc
+*_GCC46_ARM_RC_PATH              = ENV(GCC46_ARM_PREFIX)objcopy
+
+*_GCC46_ARM_ARCHCC_FLAGS         = -mthumb
+*_GCC46_ARM_PLATFORM_FLAGS       = -march=armv7-a
+
+*_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
+*_GCC46_ARM_PP_FLAGS             = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_PP_FLAGS)
+*_GCC46_ARM_RC_FLAGS             = DEF(GCC_ARM_RC_FLAGS)
+*_GCC46_ARM_VFRPP_FLAGS          = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_VFRPP_FLAGS)
+
+  DEBUG_GCC46_ARM_CC_FLAGS       = DEF(GCC46_ARM_CC_FLAGS) -O0
+RELEASE_GCC46_ARM_CC_FLAGS       = DEF(GCC46_ARM_CC_FLAGS) -Wno-unused-but-set-variable
+
 ####################################################################################
 #
 # GCC 4.7 - This configuration is used to compile under Linux to produce
@@ -2975,6 +3015,57 @@
 *_GCC47_X64_RC_FLAGS             = DEF(GCC_X64_RC_FLAGS)
 *_GCC47_X64_OBJCOPY_FLAGS        = 
 
+##################
+# GCC47 ARM definitions
+##################
+*_GCC47_ARM_CC_PATH              = ENV(GCC47_ARM_PREFIX)gcc
+*_GCC47_ARM_SLINK_PATH           = ENV(GCC47_ARM_PREFIX)ar
+*_GCC47_ARM_DLINK_PATH           = ENV(GCC47_ARM_PREFIX)ld
+*_GCC47_ARM_ASLDLINK_PATH        = ENV(GCC47_ARM_PREFIX)ld
+*_GCC47_ARM_ASM_PATH             = ENV(GCC47_ARM_PREFIX)gcc
+*_GCC47_ARM_PP_PATH              = ENV(GCC47_ARM_PREFIX)gcc
+*_GCC47_ARM_VFRPP_PATH           = ENV(GCC47_ARM_PREFIX)gcc
+*_GCC47_ARM_ASLCC_PATH           = ENV(GCC47_ARM_PREFIX)gcc
+*_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_ASM_FLAGS            = DEF(GCC47_ARM_ASM_FLAGS)
+*_GCC47_ARM_DLINK_FLAGS          = DEF(GCC47_ARM_DLINK_FLAGS)
+*_GCC47_ARM_PLATFORM_FLAGS       = -march=armv7-a
+*_GCC47_ARM_PP_FLAGS             = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_PP_FLAGS)
+*_GCC47_ARM_RC_FLAGS             = DEF(GCC_ARM_RC_FLAGS)
+*_GCC47_ARM_VFRPP_FLAGS          = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_VFRPP_FLAGS)
+
+  DEBUG_GCC47_ARM_CC_FLAGS       = DEF(GCC47_ARM_CC_FLAGS) -O0
+RELEASE_GCC47_ARM_CC_FLAGS       = DEF(GCC47_ARM_CC_FLAGS) -Wno-unused-but-set-variable
+
+##################
+# GCC47 AARCH64 definitions
+##################
+*_GCC47_AARCH64_CC_PATH          = ENV(GCC47_AARCH64_PREFIX)gcc
+*_GCC47_AARCH64_SLINK_PATH       = ENV(GCC47_AARCH64_PREFIX)ar
+*_GCC47_AARCH64_DLINK_PATH       = ENV(GCC47_AARCH64_PREFIX)ld
+*_GCC47_AARCH64_ASLDLINK_PATH    = ENV(GCC47_AARCH64_PREFIX)ld
+*_GCC47_AARCH64_ASM_PATH         = ENV(GCC47_AARCH64_PREFIX)gcc
+*_GCC47_AARCH64_PP_PATH          = ENV(GCC47_AARCH64_PREFIX)gcc
+*_GCC47_AARCH64_VFRPP_PATH       = ENV(GCC47_AARCH64_PREFIX)gcc
+*_GCC47_AARCH64_ASLCC_PATH       = ENV(GCC47_AARCH64_PREFIX)gcc
+*_GCC47_AARCH64_ASLPP_PATH       = ENV(GCC47_AARCH64_PREFIX)gcc
+*_GCC47_AARCH64_RC_PATH          = ENV(GCC47_AARCH64_PREFIX)objcopy
+
+*_GCC47_AARCH64_ASM_FLAGS        = DEF(GCC47_AARCH64_ASM_FLAGS)
+*_GCC47_AARCH64_DLINK_FLAGS      = DEF(GCC47_AARCH64_DLINK_FLAGS)
+*_GCC47_AARCH64_PLATFORM_FLAGS   =
+*_GCC47_AARCH64_PP_FLAGS         = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_PP_FLAGS)
+*_GCC47_AARCH64_RC_FLAGS         = DEF(GCC_AARCH64_RC_FLAGS)
+*_GCC47_AARCH64_VFRPP_FLAGS      = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_VFRPP_FLAGS)
+
+  DEBUG_GCC47_AARCH64_CC_FLAGS   = DEF(GCC47_AARCH64_CC_FLAGS) -O0
+RELEASE_GCC47_AARCH64_CC_FLAGS   = DEF(GCC47_AARCH64_CC_FLAGS) -Wno-unused-but-set-variable
+
 ####################################################################################
 #
 # Cygwin GCC And Intel ACPI Compiler

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: edk2-buildtools:[2597] trunk/BaseTools/Conf/tools_def.template

[<lg...@us...>]

Revision: 2597
          http://sourceforge.net/p/edk2-buildtools/code/2597
Author:   lgao4
Date:     2013-08-14 01:54:51 +0000 (Wed, 14 Aug 2013)
Log Message:
-----------
Add VS2012 toolchains.

Signed-off-by: Yu Wang <yu...@in...>
Reviewed-by: Liming Gao <lim...@in...>
 

Modified Paths:
--------------
    trunk/BaseTools/Conf/tools_def.template

Modified: trunk/BaseTools/Conf/tools_def.template
===================================================================
--- trunk/BaseTools/Conf/tools_def.template	2013-08-12 07:10:50 UTC (rev 2596)
+++ trunk/BaseTools/Conf/tools_def.template	2013-08-14 01:54:51 UTC (rev 2597)
@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
 #  Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
 #  Portions copyright (c) 2011 - 2013, ARM Ltd. All rights reserved.<BR>
 #
@@ -48,6 +48,14 @@
 DEFINE VS2010x86_BINX64 = DEF(VS2010x86_BIN)\x86_amd64
 DEFINE VS2010x86_BIN64  = DEF(VS2010x86_BIN)\x86_ia64
 
+DEFINE VS2012_BIN      = C:\Program Files\Microsoft Visual Studio 11.0\Vc\bin
+DEFINE VS2012_DLL      = C:\Program Files\Microsoft Visual Studio 11.0\Common7\IDE;DEF(VS2012_BIN)
+DEFINE VS2012_BINX64   = DEF(VS2012_BIN)\x86_amd64
+
+DEFINE VS2012x86_BIN    = C:\Program Files (x86)\Microsoft Visual Studio 11.0\Vc\bin
+DEFINE VS2012x86_DLL    = C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\IDE;DEF(VS2012x86_BIN)
+DEFINE VS2012x86_BINX64 = DEF(VS2012x86_BIN)\x86_amd64
+
 DEFINE WINSDK_VERSION   = v6.0A
 DEFINE WINSDK_BIN       = c:\Program Files\Microsoft SDKs\Windows\DEF(WINSDK_VERSION)\bin
 DEFINE WINSDKx86_BIN    = c:\Program Files (x86)\Microsoft SDKs\Windows\DEF(WINSDK_VERSION)\bin
@@ -248,6 +256,15 @@
 #                             Required to build platforms or ACPI tables:
 #                               Intel(r) ACPI Compiler (iasl.exe) v20101013 from
 #                               http://www.acpica.org/downloads/previous_releases.php
+#   VS2012      -win32-  Requires:
+#                             Microsoft Visual Studio 2012 Professional Edition
+#                             Microsoft Windows Server 2003 Driver Development Kit (Microsoft WINDDK) version 3790.1830
+#                        Optional:
+#                             Required to build EBC drivers:
+#                               Intel(r) Compiler for Efi Byte Code (Intel(r) EBC Compiler)
+#                             Required to build platforms or ACPI tables:
+#                               Intel(r) ACPI Compiler (iasl.exe) v20101013 from
+#                               http://www.acpica.org/downloads/previous_releases.php
 #   DDK3790     -win32-  Requires:
 #                             Microsoft Windows Server 2003 Driver Development Kit (Microsoft WINDDK) version 3790.1830
 #                        Optional:
@@ -371,6 +388,15 @@
 #                             Required to build platforms or ACPI tables:
 #                               Microsoft ASL ACPI Compiler (asl.exe) v4.0.0 from
 #                               http://download.microsoft.com/download/2/c/1/2c16c7e0-96c1-40f5-81fc-3e4bf7b65496/microsoft_asl_compiler-v4-0-0.msi
+#   VS2012xASL  -win32-  Requires:
+#                             Microsoft Visual Studio 2012 Professional Edition
+#                             Microsoft Windows Server 2003 Driver Development Kit (Microsoft WINDDK) version 3790.1830
+#                        Optional:
+#                             Required to build EBC drivers:
+#                               Intel(r) Compiler for Efi Byte Code (Intel(r) EBC Compiler)
+#                             Required to build platforms or ACPI tables:
+#                               Microsoft ASL ACPI Compiler (asl.exe) v4.0.0 from
+#                               http://download.microsoft.com/download/2/c/1/2c16c7e0-96c1-40f5-81fc-3e4bf7b65496/microsoft_asl_compiler-v4-0-0.msi
 #   DDK3790xASL -win32-  Requires:
 #                             Microsoft Windows Server 2003 Driver Development Kit (Microsoft WINDDK) version 3790.1830
 #                        Optional:
@@ -435,6 +461,13 @@
 #                             Required to build platforms or ACPI tables:
 #                               Intel(r) ACPI Compiler (iasl.exe) v20101013 from
 #                               http://www.acpica.org/downloads/previous_releases.php 
+#   VS2012x86   -win64-  Requires:
+#                             Microsoft Visual Studio 2012 (x86) Professional Edition
+#                             Microsoft Windows Server 2003 Driver Development Kit (Microsoft WINDDK) version 3790.1830
+#                        Optional:
+#                             Required to build platforms or ACPI tables:
+#                               Intel(r) ACPI Compiler (iasl.exe) v20101013 from
+#                               http://www.acpica.org/downloads/previous_releases.php
 #   ICCx86      -win64-  Requires:
 #                             Intel C Compiler V9.1(x86)
 #                        Dependencies:
@@ -482,6 +515,13 @@
 #                             Required to build platforms or ACPI tables:
 #                               Microsoft ASL ACPI Compiler (asl.exe) v4.0.0 from
 #                               http://download.microsoft.com/download/2/c/1/2c16c7e0-96c1-40f5-81fc-3e4bf7b65496/microsoft_asl_compiler-v4-0-0.msi
+#  VS2012x86xASL -win64- Requires:
+#                             Microsoft Visual Studio 2012 (x86) Professional Edition
+#                             Microsoft Windows Server 2003 Driver Development Kit(Microsoft WINDDK) version 3790.1830 
+#                        Optional:
+#                             Required to build platforms or ACPI tables:
+#                               Microsoft ASL ACPI Compiler (asl.exe) v4.0.0 from
+#                               http://download.microsoft.com/download/2/c/1/2c16c7e0-96c1-40f5-81fc-3e4bf7b65496/microsoft_asl_compiler-v4-0-0.msi
 #   ICCx86xASL  -win64-  Requires:
 #                             Intel C Compiler V9.1 (x86)
 #                        Dependencies:
@@ -749,7 +789,6 @@
 *_VS2003xASL_EBC_DLINK_FLAGS            = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
 ####################################################################################
-#
 # Microsoft Visual Studio 2005
 #
 #   VS2005  - Microsoft Visual Studio 2005 All Edition, including Standard, Professional, Express, TeamSuite
@@ -825,7 +864,6 @@
 *_VS2005_X64_ASLPP_PATH    = DEF(VS2005_BINX64)\cl.exe
 *_VS2005_X64_ASLDLINK_PATH = DEF(VS2005_BINX64)\link.exe
 
-
   DEBUG_VS2005_X64_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm
 RELEASE_VS2005_X64_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF
 NOOPT_VS2005_X64_CC_FLAGS       = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od
@@ -962,7 +1000,6 @@
 *_VS2005xASL_X64_ASLPP_PATH    = DEF(VS2005_BINX64)\cl.exe
 *_VS2005xASL_X64_ASLDLINK_PATH = DEF(VS2005_BINX64)\link.exe
 
-
   DEBUG_VS2005xASL_X64_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm
 RELEASE_VS2005xASL_X64_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF
 NOOPT_VS2005xASL_X64_CC_FLAGS       = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od
@@ -1099,7 +1136,6 @@
 *_VS2005x86_X64_ASLPP_PATH    = DEF(VS2005x86_BINX64)\cl.exe
 *_VS2005x86_X64_ASLDLINK_PATH = DEF(VS2005x86_BINX64)\link.exe
 
-
   DEBUG_VS2005x86_X64_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm
 RELEASE_VS2005x86_X64_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF
 NOOPT_VS2005x86_X64_CC_FLAGS       = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od
@@ -1236,7 +1272,6 @@
 *_VS2005x86xASL_X64_ASLPP_PATH    = DEF(VS2005x86_BINX64)\cl.exe
 *_VS2005x86xASL_X64_ASLDLINK_PATH = DEF(VS2005x86_BINX64)\link.exe
 
-
   DEBUG_VS2005x86xASL_X64_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm
 RELEASE_VS2005x86xASL_X64_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF
 NOOPT_VS2005x86xASL_X64_CC_FLAGS       = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od
@@ -1297,7 +1332,6 @@
 *_VS2005x86xASL_EBC_DLINK_FLAGS         = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
 
-
 ####################################################################################
 #
 # Microsoft Visual Studio 2008
@@ -1375,7 +1409,6 @@
 *_VS2008_X64_ASLPP_PATH    = DEF(VS2008_BINX64)\cl.exe
 *_VS2008_X64_ASLDLINK_PATH = DEF(VS2008_BINX64)\link.exe
 
-
   DEBUG_VS2008_X64_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm
 RELEASE_VS2008_X64_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF
 NOOPT_VS2008_X64_CC_FLAGS       = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od
@@ -1420,13 +1453,14 @@
 # EBC definitions
 ##################
 *_VS2008_EBC_*_FAMILY            = INTEL
+*_VS2008_EBC_*_DLL               = DEF(VS2008_DLL)
 
 *_VS2008_EBC_MAKE_PATH           = DEF(VS2008_BIN)\nmake.exe
 *_VS2008_EBC_PP_PATH             = DEF(EBC_BIN)\iec.exe
 *_VS2008_EBC_VFRPP_PATH          = DEF(EBC_BIN)\iec.exe
 *_VS2008_EBC_CC_PATH             = DEF(EBC_BIN)\iec.exe
-*_VS2008_EBC_SLINK_PATH          = DEF(EBC_BIN)\link.exe
-*_VS2008_EBC_DLINK_PATH          = DEF(EBC_BIN)\link.exe
+*_VS2008_EBC_SLINK_PATH          = DEF(VS2008_BIN)\link.exe
+*_VS2008_EBC_DLINK_PATH          = DEF(VS2008_BIN)\link.exe
 
 *_VS2008_EBC_MAKE_FLAGS          = /nologo
 *_VS2008_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
@@ -1435,6 +1469,7 @@
 *_VS2008_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
 *_VS2008_EBC_DLINK_FLAGS         = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
+
 ####################################################################################
 #
 # Microsoft Visual Studio 2008
@@ -1512,7 +1547,6 @@
 *_VS2008xASL_X64_ASLPP_PATH    = DEF(VS2008_BINX64)\cl.exe
 *_VS2008xASL_X64_ASLDLINK_PATH = DEF(VS2008_BINX64)\link.exe
 
-
   DEBUG_VS2008xASL_X64_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm
 RELEASE_VS2008xASL_X64_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF
 NOOPT_VS2008xASL_X64_CC_FLAGS       = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od
@@ -1557,13 +1591,14 @@
 # EBC definitions
 ##################
 *_VS2008xASL_EBC_*_FAMILY            = INTEL
+*_VS2008xASL_EBC_*_DLL               = DEF(VS2008_DLL)
 
 *_VS2008xASL_EBC_MAKE_PATH           = DEF(VS2008_BIN)\nmake.exe
 *_VS2008xASL_EBC_PP_PATH             = DEF(EBC_BIN)\iec.exe
 *_VS2008xASL_EBC_VFRPP_PATH          = DEF(EBC_BIN)\iec.exe
 *_VS2008xASL_EBC_CC_PATH             = DEF(EBC_BIN)\iec.exe
-*_VS2008xASL_EBC_SLINK_PATH          = DEF(EBC_BIN)\link.exe
-*_VS2008xASL_EBC_DLINK_PATH          = DEF(EBC_BIN)\link.exe
+*_VS2008xASL_EBC_SLINK_PATH          = DEF(VS2008_BIN)\link.exe
+*_VS2008xASL_EBC_DLINK_PATH          = DEF(VS2008_BIN)\link.exe
 
 *_VS2008xASL_EBC_MAKE_FLAGS          = /nologo
 *_VS2008xASL_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
@@ -1688,7 +1723,27 @@
 RELEASE_VS2008x86_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4001 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb
 NOOPT_VS2008x86_IPF_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4001 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb /DEBUG
 
+##################
+# EBC definitions
+##################
+*_VS2008x86_EBC_*_FAMILY            = INTEL
+*_VS2008x86_EBC_*_DLL               = DEF(VS2008x86_DLL)
 
+*_VS2008x86_EBC_MAKE_PATH           = DEF(VS2008x86_BIN)\nmake.exe
+*_VS2008x86_EBC_PP_PATH             = DEF(EBC_BINx86)\iec.exe
+*_VS2008x86_EBC_VFRPP_PATH          = DEF(EBC_BINx86)\iec.exe
+*_VS2008x86_EBC_CC_PATH             = DEF(EBC_BINx86)\iec.exe
+*_VS2008x86_EBC_SLINK_PATH          = DEF(VS2008x86_BIN)\link.exe
+*_VS2008x86_EBC_DLINK_PATH          = DEF(VS2008x86_BIN)\link.exe
+
+*_VS2008x86_EBC_MAKE_FLAGS          = /nologo
+*_VS2008x86_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
+*_VS2008x86_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
+*_VS2008x86_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2008x86_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
+*_VS2008x86_EBC_DLINK_FLAGS         = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
+
+
 ####################################################################################
 #   VS2008x86xASL     - Microsoft Visual Studio 2008 with Microsoft ASL
 #   ASL  - Microsoft ACPI Source Language Compiler (asl.exe)
@@ -1803,12 +1858,32 @@
 RELEASE_VS2008x86xASL_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4001 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb
 NOOPT_VS2008x86xASL_IPF_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4001 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb /DEBUG
 
+##################
+# EBC definitions
+##################
+*_VS2008x86xASL_EBC_*_FAMILY            = INTEL
+*_VS2008x86xASL_EBC_*_DLL               = DEF(VS2008x86_DLL)
 
+*_VS2008x86xASL_EBC_MAKE_PATH           = DEF(VS2008x86_BIN)\nmake.exe
+*_VS2008x86xASL_EBC_PP_PATH             = DEF(EBC_BINx86)\iec.exe
+*_VS2008x86xASL_EBC_VFRPP_PATH          = DEF(EBC_BINx86)\iec.exe
+*_VS2008x86xASL_EBC_CC_PATH             = DEF(EBC_BINx86)\iec.exe
+*_VS2008x86xASL_EBC_SLINK_PATH          = DEF(VS2008x86_BIN)\link.exe
+*_VS2008x86xASL_EBC_DLINK_PATH          = DEF(VS2008x86_BIN)\link.exe
+
+*_VS2008x86xASL_EBC_MAKE_FLAGS          = /nologo
+*_VS2008x86xASL_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
+*_VS2008x86xASL_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
+*_VS2008x86xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2008x86xASL_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
+*_VS2008x86xASL_EBC_DLINK_FLAGS         = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
+
+
 ####################################################################################
 #
 # Microsoft Visual Studio 2010
 #
-#   VS2010  - Microsoft Visual Studio 2010 Premium Edition
+#   VS2010  - Microsoft Visual Studio 2010 Premium Edition with Intel ASL
 #   ASL     - Intel ACPI Source Language Compiler
 ####################################################################################
 #   VS2010           - Microsoft Visual Studio 2010 Premium Edition
@@ -1881,7 +1956,6 @@
 *_VS2010_X64_ASLPP_PATH    = DEF(VS2010_BINX64)\cl.exe
 *_VS2010_X64_ASLDLINK_PATH = DEF(VS2010_BINX64)\link.exe
 
-
   DEBUG_VS2010_X64_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm
 RELEASE_VS2010_X64_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF
 NOOPT_VS2010_X64_CC_FLAGS       = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od
@@ -1926,13 +2000,14 @@
 # EBC definitions
 ##################
 *_VS2010_EBC_*_FAMILY            = INTEL
+*_VS2010_EBC_*_DLL               = DEF(VS2010_DLL)
 
 *_VS2010_EBC_MAKE_PATH           = DEF(VS2010_BIN)\nmake.exe
 *_VS2010_EBC_PP_PATH             = DEF(EBC_BIN)\iec.exe
 *_VS2010_EBC_VFRPP_PATH          = DEF(EBC_BIN)\iec.exe
 *_VS2010_EBC_CC_PATH             = DEF(EBC_BIN)\iec.exe
-*_VS2010_EBC_SLINK_PATH          = DEF(EBC_BIN)\link.exe
-*_VS2010_EBC_DLINK_PATH          = DEF(EBC_BIN)\link.exe
+*_VS2010_EBC_SLINK_PATH          = DEF(VS2010_BIN)\link.exe
+*_VS2010_EBC_DLINK_PATH          = DEF(VS2010_BIN)\link.exe
 
 *_VS2010_EBC_MAKE_FLAGS          = /nologo
 *_VS2010_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
@@ -1941,11 +2016,12 @@
 *_VS2010_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
 *_VS2010_EBC_DLINK_FLAGS         = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
 
+
 ####################################################################################
 #
 # Microsoft Visual Studio 2010
 #
-#   VS2010  - Microsoft Visual Studio 2010 Premium Edition
+#   VS2010xASL  - Microsoft Visual Studio 2010 Premium Edition with Microsoft ASL
 #   ASL     - Microsoft ACPI Source Language Compiler (asl.exe)
 ####################################################################################
 #   VS2010xASL           - Microsoft Visual Studio 2010 Premium Edition
@@ -2018,7 +2094,6 @@
 *_VS2010xASL_X64_ASLPP_PATH    = DEF(VS2010_BINX64)\cl.exe
 *_VS2010xASL_X64_ASLDLINK_PATH = DEF(VS2010_BINX64)\link.exe
 
-
   DEBUG_VS2010xASL_X64_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm
 RELEASE_VS2010xASL_X64_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF
 NOOPT_VS2010xASL_X64_CC_FLAGS       = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od
@@ -2063,13 +2138,14 @@
 # EBC definitions
 ##################
 *_VS2010xASL_EBC_*_FAMILY            = INTEL
+*_VS2010xASL_EBC_*_DLL               = DEF(VS2010_DLL)
 
 *_VS2010xASL_EBC_MAKE_PATH           = DEF(VS2010_BIN)\nmake.exe
 *_VS2010xASL_EBC_PP_PATH             = DEF(EBC_BIN)\iec.exe
 *_VS2010xASL_EBC_VFRPP_PATH          = DEF(EBC_BIN)\iec.exe
 *_VS2010xASL_EBC_CC_PATH             = DEF(EBC_BIN)\iec.exe
-*_VS2010xASL_EBC_SLINK_PATH          = DEF(EBC_BIN)\link.exe
-*_VS2010xASL_EBC_DLINK_PATH          = DEF(EBC_BIN)\link.exe
+*_VS2010xASL_EBC_SLINK_PATH          = DEF(VS2010_BIN)\link.exe
+*_VS2010xASL_EBC_DLINK_PATH          = DEF(VS2010_BIN)\link.exe
 
 *_VS2010xASL_EBC_MAKE_FLAGS          = /nologo
 *_VS2010xASL_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
@@ -2166,7 +2242,6 @@
 RELEASE_VS2010x86_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text
 NOOPT_VS2010x86_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
 
-
 ##################
 # IPF definitions
 ##################
@@ -2195,7 +2270,27 @@
 RELEASE_VS2010x86_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4001 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb
 NOOPT_VS2010x86_IPF_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4001 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb /DEBUG
 
+##################
+# EBC definitions
+##################
+*_VS2010x86_EBC_*_FAMILY            = INTEL
+*_VS2010x86_EBC_*_DLL               = DEF(VS2010x86_DLL)
 
+*_VS2010x86_EBC_MAKE_PATH           = DEF(VS2010x86_BIN)\nmake.exe
+*_VS2010x86_EBC_PP_PATH             = DEF(EBC_BINx86)\iec.exe
+*_VS2010x86_EBC_VFRPP_PATH          = DEF(EBC_BINx86)\iec.exe
+*_VS2010x86_EBC_CC_PATH             = DEF(EBC_BINx86)\iec.exe
+*_VS2010x86_EBC_SLINK_PATH          = DEF(VS2010x86_BIN)\link.exe
+*_VS2010x86_EBC_DLINK_PATH          = DEF(VS2010x86_BIN)\link.exe
+
+*_VS2010x86_EBC_MAKE_FLAGS          = /nologo
+*_VS2010x86_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
+*_VS2010x86_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
+*_VS2010x86_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2010x86_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
+*_VS2010x86_EBC_DLINK_FLAGS         = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
+
+
 ####################################################################################
 #   VS2010x86xASL     - Microsoft Visual Studio 2010 with Microsoft ASL
 #   ASL  - Microsoft ACPI Source Language Compiler (asl.exe)
@@ -2310,9 +2405,464 @@
 RELEASE_VS2010x86xASL_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4001 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb
 NOOPT_VS2010x86xASL_IPF_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4001 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb /DEBUG
 
+##################
+# EBC definitions
+##################
+*_VS2010x86xASL_EBC_*_FAMILY            = INTEL
+*_VS2010x86xASL_EBC_*_DLL               = DEF(VS2010x86_DLL)
 
+*_VS2010x86xASL_EBC_MAKE_PATH           = DEF(VS2010x86_BIN)\nmake.exe
+*_VS2010x86xASL_EBC_PP_PATH             = DEF(EBC_BINx86)\iec.exe
+*_VS2010x86xASL_EBC_VFRPP_PATH          = DEF(EBC_BINx86)\iec.exe
+*_VS2010x86xASL_EBC_CC_PATH             = DEF(EBC_BINx86)\iec.exe
+*_VS2010x86xASL_EBC_SLINK_PATH          = DEF(VS2010x86_BIN)\link.exe
+*_VS2010x86xASL_EBC_DLINK_PATH          = DEF(VS2010x86_BIN)\link.exe
+
+*_VS2010x86xASL_EBC_MAKE_FLAGS          = /nologo
+*_VS2010x86xASL_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
+*_VS2010x86xASL_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
+*_VS2010x86xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2010x86xASL_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
+*_VS2010x86xASL_EBC_DLINK_FLAGS         = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
+
+
 ####################################################################################
 #
+# Microsoft Visual Studio 2012
+#
+#   VS2012  - Microsoft Visual Studio 2012 Professional Edition with Intel ASL
+#   ASL     - Intel ACPI Source Language Compiler
+####################################################################################
+#   VS2012           - Microsoft Visual Studio 2012 Premium Edition
+*_VS2012_*_*_FAMILY               = MSFT
+
+*_VS2012_*_MAKE_PATH              = DEF(VS2012_BIN)\nmake.exe
+*_VS2012_*_MAKE_FLAGS             = /nologo
+*_VS2012_*_RC_PATH                = DEF(WINSDK_BIN)\rc.exe
+
+*_VS2012_*_SLINK_FLAGS            = /NOLOGO /LTCG
+*_VS2012_*_APP_FLAGS              = /nologo /E /TC
+*_VS2012_*_PP_FLAGS               = /nologo /E /TC /FIAutoGen.h
+*_VS2012_*_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+
+*_VS2012_*_ASM16_PATH             = DEF(VS2012_BIN)\ml.exe
+
+##################
+# ASL definitions
+##################
+*_VS2012_*_ASL_PATH               = DEF(DEFAULT_WIN_ASL_BIN)
+*_VS2012_*_ASL_FLAGS              = DEF(DEFAULT_WIN_ASL_FLAGS)
+*_VS2012_*_ASL_OUTFLAGS           = DEF(DEFAULT_WIN_ASL_OUTFLAGS)
+*_VS2012_*_ASLCC_FLAGS            = DEF(MSFT_ASLCC_FLAGS)
+*_VS2012_*_ASLPP_FLAGS            = DEF(MSFT_ASLPP_FLAGS)
+*_VS2012_*_ASLDLINK_FLAGS         = DEF(MSFT_ASLDLINK_FLAGS)
+
+##################
+# IA32 definitions
+##################
+*_VS2012_IA32_*_DLL               = DEF(VS2012_DLL)
+
+*_VS2012_IA32_MAKE_PATH           = DEF(VS2012_BIN)\nmake.exe
+*_VS2012_IA32_CC_PATH             = DEF(VS2012_BIN)\cl.exe
+*_VS2012_IA32_VFRPP_PATH          = DEF(VS2012_BIN)\cl.exe
+*_VS2012_IA32_SLINK_PATH          = DEF(VS2012_BIN)\lib.exe
+*_VS2012_IA32_DLINK_PATH          = DEF(VS2012_BIN)\link.exe
+*_VS2012_IA32_APP_PATH            = DEF(VS2012_BIN)\cl.exe
+*_VS2012_IA32_PP_PATH             = DEF(VS2012_BIN)\cl.exe
+*_VS2012_IA32_ASM_PATH            = DEF(VS2012_BIN)\ml.exe
+*_VS2012_IA32_ASLCC_PATH          = DEF(VS2012_BIN)\cl.exe
+*_VS2012_IA32_ASLPP_PATH          = DEF(VS2012_BIN)\cl.exe
+*_VS2012_IA32_ASLDLINK_PATH       = DEF(VS2012_BIN)\link.exe
+
+      *_VS2012_IA32_MAKE_FLAGS    = /nologo
+  DEBUG_VS2012_IA32_CC_FLAGS      = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm
+RELEASE_VS2012_IA32_CC_FLAGS      = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF
+NOOPT_VS2012_IA32_CC_FLAGS        = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /Od
+
+  DEBUG_VS2012_IA32_ASM_FLAGS     = /nologo /c /WX /W3 /Cx /coff /Zd /Zi
+RELEASE_VS2012_IA32_ASM_FLAGS     = /nologo /c /WX /W3 /Cx /coff /Zd
+NOOPT_VS2012_IA32_ASM_FLAGS       = /nologo /c /WX /W3 /Cx /coff /Zd /Zi
+
+  DEBUG_VS2012_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
+RELEASE_VS2012_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text
+NOOPT_VS2012_IA32_DLINK_FLAGS     = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
+
+##################
+# X64 definitions
+##################
+*_VS2012_X64_*_DLL         = DEF(VS2012_DLL)
+
+*_VS2012_X64_CC_PATH       = DEF(VS2012_BINX64)\cl.exe
+*_VS2012_X64_PP_PATH       = DEF(VS2012_BINX64)\cl.exe
+*_VS2012_X64_APP_PATH      = DEF(VS2012_BINX64)\cl.exe
+*_VS2012_X64_VFRPP_PATH    = DEF(VS2012_BINX64)\cl.exe
+*_VS2012_X64_ASM_PATH      = DEF(VS2012_BINX64)\ml64.exe
+*_VS2012_X64_SLINK_PATH    = DEF(VS2012_BINX64)\lib.exe
+*_VS2012_X64_DLINK_PATH    = DEF(VS2012_BINX64)\link.exe
+*_VS2012_X64_ASLCC_PATH    = DEF(VS2012_BINX64)\cl.exe
+*_VS2012_X64_ASLPP_PATH    = DEF(VS2012_BINX64)\cl.exe
+*_VS2012_X64_ASLDLINK_PATH = DEF(VS2012_BINX64)\link.exe
+
+  DEBUG_VS2012_X64_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm
+RELEASE_VS2012_X64_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF
+NOOPT_VS2012_X64_CC_FLAGS       = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od
+
+  DEBUG_VS2012_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi
+RELEASE_VS2012_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd
+NOOPT_VS2012_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi
+
+  DEBUG_VS2012_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
+RELEASE_VS2012_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text
+NOOPT_VS2012_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SE...
 
[truncated message content]

SF.net SVN: edk2-buildtools:[2616] trunk/BaseTools/Conf/tools_def.template

[<yz...@us...>]

Revision: 2616
          http://sourceforge.net/p/edk2-buildtools/code/2616
Author:   yzhen22
Date:     2013-11-27 05:55:10 +0000 (Wed, 27 Nov 2013)
Log Message:
-----------
Change *_GCC44_*_APP_FLAGS to resolve  building a EDKI module file with a dxs file specified using GCC4 fail issue

Signed-off-by: Yuxin Zheng <yux...@in...>
Reviewed-by: Chen, Hesheng <hes...@in...>
Reviewed-by: Liu, Yingke D <Yin...@in... >
Reviewed-by: Feng, Bob C <bob...@in...>

Modified Paths:
--------------
    trunk/BaseTools/Conf/tools_def.template

Modified: trunk/BaseTools/Conf/tools_def.template
===================================================================
--- trunk/BaseTools/Conf/tools_def.template	2013-11-27 05:51:40 UTC (rev 2615)
+++ trunk/BaseTools/Conf/tools_def.template	2013-11-27 05:55:10 UTC (rev 2616)
@@ -3292,7 +3292,7 @@
 *_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)
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: edk2-buildtools:[2618] trunk/BaseTools/Conf/tools_def.template

[<oli...@us...>]

Revision: 2618
          http://sourceforge.net/p/edk2-buildtools/code/2618
Author:   oliviermartin
Date:     2013-11-27 10:13:14 +0000 (Wed, 27 Nov 2013)
Log Message:
-----------
BaseTools/tools_def.template: Fixed ARM GCC47 definitions

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <oli...@ar...>
Reviewed-by: Yingke Liu <yin...@in...>

Modified Paths:
--------------
    trunk/BaseTools/Conf/tools_def.template

Modified: trunk/BaseTools/Conf/tools_def.template
===================================================================
--- trunk/BaseTools/Conf/tools_def.template	2013-11-27 05:58:54 UTC (rev 2617)
+++ trunk/BaseTools/Conf/tools_def.template	2013-11-27 10:13:14 UTC (rev 2618)
@@ -3579,8 +3579,8 @@
 *_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_ASM_FLAGS            = DEF(GCC47_ARM_ASM_FLAGS)
 *_GCC47_ARM_DLINK_FLAGS          = DEF(GCC47_ARM_DLINK_FLAGS)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: edk2-buildtools:[2619] trunk/BaseTools/Conf/tools_def.template

[<oli...@us...>]

Revision: 2619
          http://sourceforge.net/p/edk2-buildtools/code/2619
Author:   oliviermartin
Date:     2013-11-27 10:15:34 +0000 (Wed, 27 Nov 2013)
Log Message:
-----------
BaseTools/tools_def.template: Added support to build ACPI Tables with ARM and AARCH64 GCC Toolchains

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <oli...@ar...>
Reviewed-by: Yingke Liu <yin...@in...>

Modified Paths:
--------------
    trunk/BaseTools/Conf/tools_def.template

Modified: trunk/BaseTools/Conf/tools_def.template
===================================================================
--- trunk/BaseTools/Conf/tools_def.template	2013-11-27 10:13:14 UTC (rev 2618)
+++ trunk/BaseTools/Conf/tools_def.template	2013-11-27 10:15:34 UTC (rev 2619)
@@ -3133,6 +3133,7 @@
 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 +3177,7 @@
 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 +3192,8 @@
 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)
 
 ####################################################################################
 #
@@ -3490,6 +3494,8 @@
 *_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
@@ -3582,6 +3588,8 @@
 *_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 +3614,8 @@
 *_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   =
@@ -5532,7 +5542,7 @@
 *_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 +5636,7 @@
 *_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

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: edk2-buildtools:[2620] trunk/BaseTools/Conf/tools_def.template

[<oli...@us...>]

Revision: 2620
          http://sourceforge.net/p/edk2-buildtools/code/2620
Author:   oliviermartin
Date:     2013-11-27 10:18:34 +0000 (Wed, 27 Nov 2013)
Log Message:
-----------
BaseTools/tools_def.template: Added GCC 4.8 toolchain

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <oli...@ar...>
Reviewed-by: Jordan Justen <jor...@in...>

Modified Paths:
--------------
    trunk/BaseTools/Conf/tools_def.template

Modified: trunk/BaseTools/Conf/tools_def.template
===================================================================
--- trunk/BaseTools/Conf/tools_def.template	2013-11-27 10:15:34 UTC (rev 2619)
+++ trunk/BaseTools/Conf/tools_def.template	2013-11-27 10:18:34 UTC (rev 2620)
@@ -159,6 +159,9 @@
 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 @@
 #                             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:
@@ -3195,6 +3204,22 @@
 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)
+
 ####################################################################################
 #
 # Unix GCC And Intel Linux ACPI Compiler
@@ -3628,6 +3653,126 @@
 
 ####################################################################################
 #
+# 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
 #
 ####################################################################################

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: edk2-buildtools:[2641] trunk/BaseTools/Conf/tools_def.template

[<oli...@us...>]

Revision: 2641
          http://sourceforge.net/p/edk2-buildtools/code/2641
Author:   oliviermartin
Date:     2014-01-15 12:32:24 +0000 (Wed, 15 Jan 2014)
Log Message:
-----------
BaseTools/tools_def.template: Remove the unused sections from the generated binary (ARM GCC toolchain)

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <oli...@ar...>

Modified Paths:
--------------
    trunk/BaseTools/Conf/tools_def.template

Modified: trunk/BaseTools/Conf/tools_def.template
===================================================================
--- trunk/BaseTools/Conf/tools_def.template	2014-01-09 09:14:08 UTC (rev 2640)
+++ trunk/BaseTools/Conf/tools_def.template	2014-01-15 12:32:24 UTC (rev 2641)
@@ -3140,7 +3140,7 @@
 DEFINE GCC_AARCH64_CC_FLAGS        = DEF(GCC_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 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_ARM_AARCH64_DLINK_COMMON= -Ttext=0x0 --emit-relocs -nostdlib --gc-sections -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

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: edk2-buildtools:[2642] trunk/BaseTools/Conf/tools_def.template

[<oli...@us...>]

Revision: 2642
          http://sourceforge.net/p/edk2-buildtools/code/2642
Author:   oliviermartin
Date:     2014-01-15 12:32:57 +0000 (Wed, 15 Jan 2014)
Log Message:
-----------
BaseTools/tools_def.template: Make ARMGCC and ARMLINUXGCC use GCC_ARM_AARCH64_DLINK_COMMON

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <oli...@ar...>

Modified Paths:
--------------
    trunk/BaseTools/Conf/tools_def.template

Modified: trunk/BaseTools/Conf/tools_def.template
===================================================================
--- trunk/BaseTools/Conf/tools_def.template	2014-01-15 12:32:24 UTC (rev 2641)
+++ trunk/BaseTools/Conf/tools_def.template	2014-01-15 12:32:57 UTC (rev 2642)
@@ -5719,7 +5719,7 @@
 *_ARMGCC_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
 
 *_ARMGCC_ARM_SLINK_FLAGS =  -rc
-*_ARMGCC_ARM_DLINK_FLAGS =  $(ARCHDLINK_FLAGS) -Ttext=0x0 --oformat=elf32-littlearm --emit-relocs -nostdlib -u $(IMAGE_ENTRY_POINT) -e $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
+*_ARMGCC_ARM_DLINK_FLAGS =  $(ARCHDLINK_FLAGS) DEF(GCC_ARM_AARCH64_DLINK_COMMON) --oformat=elf32-littlearm
 
   DEBUG_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARM_CC_FLAGS) -O0
 RELEASE_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARM_CC_FLAGS) -Wno-unused
@@ -5755,7 +5755,7 @@
 *_ARMGCC_AARCH64_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
 
 *_ARMGCC_AARCH64_SLINK_FLAGS =  -rc
-*_ARMGCC_AARCH64_DLINK_FLAGS =  $(ARCHDLINK_FLAGS) -Ttext=0x0 --emit-relocs -nostdlib -u $(IMAGE_ENTRY_POINT) -e $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
+*_ARMGCC_AARCH64_DLINK_FLAGS =  $(ARCHDLINK_FLAGS) DEF(GCC_ARM_AARCH64_DLINK_COMMON)
 
   DEBUG_ARMGCC_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_AARCH64_CC_FLAGS) -Wno-address -O0
 RELEASE_ARMGCC_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_AARCH64_CC_FLAGS) -Wno-address -Wno-unused-but-set-variable
@@ -5813,7 +5813,7 @@
 *_ARMLINUXGCC_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
 
 *_ARMLINUXGCC_ARM_SLINK_FLAGS =  -rc
-*_ARMLINUXGCC_ARM_DLINK_FLAGS =  $(ARCHDLINK_FLAGS) -Ttext=0x0 --oformat=elf32-littlearm --emit-relocs -nostdlib -u $(IMAGE_ENTRY_POINT) -e $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
+*_ARMLINUXGCC_ARM_DLINK_FLAGS =  $(ARCHDLINK_FLAGS) DEF(GCC_ARM_AARCH64_DLINK_COMMON) --oformat=elf32-littlearm
 
   DEBUG_ARMLINUXGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARM_CC_FLAGS) -fno-stack-protector -mno-unaligned-access -O0
 RELEASE_ARMLINUXGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARM_CC_FLAGS) -fno-stack-protector  -mno-unaligned-access -Wno-unused-but-set-variable
@@ -5849,7 +5849,7 @@
 *_ARMLINUXGCC_AARCH64_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
 
 *_ARMLINUXGCC_AARCH64_SLINK_FLAGS =  -rc
-*_ARMLINUXGCC_AARCH64_DLINK_FLAGS =  $(ARCHDLINK_FLAGS) -Ttext=0x0 --emit-relocs -nostdlib -u $(IMAGE_ENTRY_POINT) -e $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
+*_ARMLINUXGCC_AARCH64_DLINK_FLAGS =  $(ARCHDLINK_FLAGS) DEF(GCC_ARM_AARCH64_DLINK_COMMON)
 
   DEBUG_ARMLINUXGCC_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_AARCH64_CC_FLAGS) -Wno-address -O0
 RELEASE_ARMLINUXGCC_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_AARCH64_CC_FLAGS) -Wno-address -Wno-unused-but-set-variable

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: edk2-buildtools:[2643] trunk/BaseTools/Conf/tools_def.template

[<oli...@us...>]

Revision: 2643
          http://sourceforge.net/p/edk2-buildtools/code/2643
Author:   oliviermartin
Date:     2014-01-15 12:34:01 +0000 (Wed, 15 Jan 2014)
Log Message:
-----------
BaseTools/tools_def.template: Bring GCC47 into line with ARMLINUXGCC and ARMGCC

For GCC47 this ensures that all code is compiled for Thumb with -Os.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <oli...@ar...>

Modified Paths:
--------------
    trunk/BaseTools/Conf/tools_def.template

Modified: trunk/BaseTools/Conf/tools_def.template
===================================================================
--- trunk/BaseTools/Conf/tools_def.template	2014-01-15 12:32:57 UTC (rev 2642)
+++ trunk/BaseTools/Conf/tools_def.template	2014-01-15 12:34:01 UTC (rev 2643)
@@ -3136,7 +3136,7 @@
 DEFINE GCC_IA32_CC_FLAGS           = DEF(GCC_ALL_CC_FLAGS) -m32 -malign-double -freorder-blocks -freorder-blocks-and-partition -O2 -mno-stack-arg-probe
 DEFINE GCC_X64_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -mno-red-zone -Wno-address -mno-stack-arg-probe
 DEFINE GCC_IPF_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -minline-int-divide-min-latency
-DEFINE GCC_ARM_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -mword-relocations -mlittle-endian -mabi=aapcs -mapcs -fno-short-enums -save-temps -fsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -Wno-address
+DEFINE GCC_ARM_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -mword-relocations -mlittle-endian -mabi=aapcs -mapcs -fno-short-enums -save-temps -fsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -Wno-address -mthumb
 DEFINE GCC_AARCH64_CC_FLAGS        = DEF(GCC_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 GCC_DLINK_FLAGS_COMMON      = -nostdlib --pie
 DEFINE GCC_IA32_X64_DLINK_COMMON   = DEF(GCC_DLINK_FLAGS_COMMON) --gc-sections
@@ -3184,7 +3184,7 @@
 DEFINE GCC46_X64_DLINK_FLAGS         = DEF(GCC45_X64_DLINK_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) -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_CC_FLAGS            = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC44_ALL_CC_FLAGS) DEF(GCC_ARM_CC_FLAGS) -mno-unaligned-access
 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
 
@@ -3198,7 +3198,7 @@
 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
 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_AARCH64_CC_FLAGS        = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC44_ALL_CC_FLAGS) DEF(GCC_AARCH64_CC_FLAGS)
 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)
@@ -3516,7 +3516,7 @@
 *_GCC46_ARM_ASLPP_PATH           = ENV(GCC46_ARM_PREFIX)gcc
 *_GCC46_ARM_RC_PATH              = ENV(GCC46_ARM_PREFIX)objcopy
 
-*_GCC46_ARM_ARCHCC_FLAGS         = -mthumb
+*_GCC46_ARM_ARCHCC_FLAGS         =
 *_GCC46_ARM_PLATFORM_FLAGS       = -march=armv7-a
 
 *_GCC46_ARM_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS)
@@ -3610,7 +3610,7 @@
 *_GCC47_ARM_ASLPP_PATH           = ENV(GCC47_ARM_PREFIX)gcc
 *_GCC47_ARM_RC_PATH              = ENV(GCC47_ARM_PREFIX)objcopy
 
-*_GCC47_ARM_ARCHCC_FLAGS         = -mthumb
+*_GCC47_ARM_ARCHCC_FLAGS         =
 *_GCC47_ARM_PLATFORM_FLAGS       = -march=armv7-a
 
 *_GCC47_ARM_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS)
@@ -5707,7 +5707,7 @@
 #
 # Use default values, or override in DSC file
 #
-*_ARMGCC_ARM_ARCHCC_FLAGS    = -mthumb
+*_ARMGCC_ARM_ARCHCC_FLAGS    =
 *_ARMGCC_ARM_ARCHASM_FLAGS   =
 *_ARMGCC_ARM_ARCHDLINK_FLAGS =
 *_ARMGCC_ARM_PLATFORM_FLAGS  = -march=armv7-a
@@ -5801,7 +5801,7 @@
 #
 # Use default values, or override in DSC file
 #
-*_ARMLINUXGCC_ARM_ARCHCC_FLAGS    = -mthumb
+*_ARMLINUXGCC_ARM_ARCHCC_FLAGS    =
 *_ARMLINUXGCC_ARM_ARCHASM_FLAGS   = 
 *_ARMLINUXGCC_ARM_ARCHDLINK_FLAGS =
 *_ARMLINUXGCC_ARM_PLATFORM_FLAGS  = -march=armv7-a

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: edk2-buildtools:[2644] trunk/BaseTools/Conf/tools_def.template

[<oli...@us...>]

Revision: 2644
          http://sourceforge.net/p/edk2-buildtools/code/2644
Author:   oliviermartin
Date:     2014-01-15 17:07:09 +0000 (Wed, 15 Jan 2014)
Log Message:
-----------
tools_def.template: Change CLANG_BIN from DEF to ENV

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <oli...@ar...>
Reviewed-by: Andrew Fish <af...@ap...>

Modified Paths:
--------------
    trunk/BaseTools/Conf/tools_def.template

Modified: trunk/BaseTools/Conf/tools_def.template
===================================================================
--- trunk/BaseTools/Conf/tools_def.template	2014-01-15 12:34:01 UTC (rev 2643)
+++ trunk/BaseTools/Conf/tools_def.template	2014-01-15 17:07:09 UTC (rev 2644)
@@ -192,11 +192,6 @@
 
 DEFINE SOURCERY_CYGWIN_TOOLS = /cygdrive/c/Program Files/CodeSourcery/Sourcery G++ Lite/bin
 
-#
-# Change to the location clang was built
-#
-DEFINE CLANG_BIN = /usr/bin/
-
 ####################################################################################
 #
 # format: TARGET_TOOLCHAIN_ARCH_COMMANDTYPE_ATTRIBUTE = <string>
@@ -5484,15 +5479,15 @@
 RELEASE_XCLANG_*_MTOC_FLAGS = -align 0x20
 
 
-*_XCLANG_*_CC_PATH      = DEF(CLANG_BIN)clang
+*_XCLANG_*_CC_PATH      = ENV(CLANG_BIN)clang
 *_XCLANG_*_SLINK_PATH   = libtool
 *_XCLANG_*_DLINK_PATH   = ld
 *_XCLANG_*_ASM_PATH     = as
-*_XCLANG_*_PP_PATH      = DEF(CLANG_BIN)clang
-*_XCLANG_*_VFRPP_PATH   = DEF(CLANG_BIN)clang
+*_XCLANG_*_PP_PATH      = ENV(CLANG_BIN)clang
+*_XCLANG_*_VFRPP_PATH   = ENV(CLANG_BIN)clang
 *_XCLANG_*_ASL_PATH     = iasl
-*_XCLANG_*_ASLCC_PATH   = DEF(CLANG_BIN)clang
-*_XCLANG_*_ASLPP_PATH   = DEF(CLANG_BIN)clang
+*_XCLANG_*_ASLCC_PATH   = ENV(CLANG_BIN)clang
+*_XCLANG_*_ASLPP_PATH   = ENV(CLANG_BIN)clang
 *_XCLANG_*_ASLDLINK_PATH  = ld
 
 ####################

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: edk2-buildtools:[2647] trunk/BaseTools/Conf/tools_def.template

[<oli...@us...>]

Revision: 2647
          http://sourceforge.net/p/edk2-buildtools/code/2647
Author:   oliviermartin
Date:     2014-01-23 01:02:47 +0000 (Thu, 23 Jan 2014)
Log Message:
-----------
BaseTools/tools_def.template: Ensure Software floating point is used to build ARM32

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <oli...@ar...>

Modified Paths:
--------------
    trunk/BaseTools/Conf/tools_def.template

Modified: trunk/BaseTools/Conf/tools_def.template
===================================================================
--- trunk/BaseTools/Conf/tools_def.template	2014-01-22 07:15:25 UTC (rev 2646)
+++ trunk/BaseTools/Conf/tools_def.template	2014-01-23 01:02:47 UTC (rev 2647)
@@ -3131,7 +3131,7 @@
 DEFINE GCC_IA32_CC_FLAGS           = DEF(GCC_ALL_CC_FLAGS) -m32 -malign-double -freorder-blocks -freorder-blocks-and-partition -O2 -mno-stack-arg-probe
 DEFINE GCC_X64_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -mno-red-zone -Wno-address -mno-stack-arg-probe
 DEFINE GCC_IPF_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -minline-int-divide-min-latency
-DEFINE GCC_ARM_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -mword-relocations -mlittle-endian -mabi=aapcs -mapcs -fno-short-enums -save-temps -fsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -Wno-address -mthumb
+DEFINE GCC_ARM_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -mword-relocations -mlittle-endian -mabi=aapcs -mapcs -fno-short-enums -save-temps -fsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -Wno-address -mthumb -mfloat-abi=soft
 DEFINE GCC_AARCH64_CC_FLAGS        = DEF(GCC_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 GCC_DLINK_FLAGS_COMMON      = -nostdlib --pie
 DEFINE GCC_IA32_X64_DLINK_COMMON   = DEF(GCC_DLINK_FLAGS_COMMON) --gc-sections
@@ -5545,7 +5545,7 @@
 #
 # Use default values, or override in DSC file
 #
-*_RVCT_ARM_ARCHCC_FLAGS    = --thumb
+*_RVCT_ARM_ARCHCC_FLAGS    = --thumb --fpu=softvfp
 *_RVCT_ARM_ARCHASM_FLAGS   = 
 *_RVCT_ARM_ARCHDLINK_FLAGS = 
 *_RVCT_ARM_PLATFORM_FLAGS  = --cpu 7-A
@@ -5587,7 +5587,7 @@
 #
 # Use default values, or override in DSC file
 #
-*_RVCTLINUX_ARM_ARCHCC_FLAGS    = --thumb
+*_RVCTLINUX_ARM_ARCHCC_FLAGS    = --thumb --fpu=softvfp
 *_RVCTLINUX_ARM_ARCHASM_FLAGS   = 
 *_RVCTLINUX_ARM_ARCHDLINK_FLAGS = 
 *_RVCTLINUX_ARM_PLATFORM_FLAGS  = --cpu 7-A
@@ -5634,7 +5634,7 @@
 #
 # Use default values, or override in DSC file
 #
-*_RVCTCYGWIN_ARM_ARCHCC_FLAGS    = --thumb
+*_RVCTCYGWIN_ARM_ARCHCC_FLAGS    = --thumb --fpu=softvfp
 *_RVCTCYGWIN_ARM_ARCHASM_FLAGS   =
 *_RVCTCYGWIN_ARM_ARCHDLINK_FLAGS = 
 *_RVCTCYGWIN_ARM_PLATFORM_FLAGS  = --cpu 7-A

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: edk2-buildtools:[2656] trunk/BaseTools/Conf/tools_def.template

[<yi...@us...>]

Revision: 2656
          http://sourceforge.net/p/edk2-buildtools/code/2656
Author:   yingke
Date:     2014-02-27 05:20:21 +0000 (Thu, 27 Feb 2014)
Log Message:
-----------
Add DLL path for DDK3790 tool chain.

Reviewed-by: Liming Gao <lim...@in...>
Signed-off-by: Yu Wang <yu...@in...>

Modified Paths:
--------------
    trunk/BaseTools/Conf/tools_def.template

Modified: trunk/BaseTools/Conf/tools_def.template
===================================================================
--- trunk/BaseTools/Conf/tools_def.template	2014-02-26 00:34:46 UTC (rev 2655)
+++ trunk/BaseTools/Conf/tools_def.template	2014-02-27 05:20:21 UTC (rev 2656)
@@ -2875,6 +2875,7 @@
 #   ASL  - Intel ACPI Source Language Compiler (iasl.exe)
 *_DDK3790_*_*_FAMILY        = MSFT
 
+*_DDK3790_*_*_DLL           = DEF(WINDDK_BIN32)
 *_DDK3790_*_MAKE_PATH       = DEF(WINDDK_BIN32)\nmake.exe
 *_DDK3790_*_MAKE_FLAGS           = /nologo
 *_DDK3790_*_RC_PATH         = DEF(WINDDK_BIN32)\rc.exe
@@ -3000,6 +3001,7 @@
 #   ASL          - Microsoft ACPI Source Language Compiler (asl.exe)
 *_DDK3790xASL_*_*_FAMILY        = MSFT
 
+*_DDK3790xASL_*_*_DLL           = DEF(WINDDK_BIN32)
 *_DDK3790xASL_*_MAKE_PATH       = DEF(WINDDK_BIN32)\nmake.exe
 *_DDK3790xASL_*_MAKE_FLAGS           = /nologo
 *_DDK3790xASL_*_RC_PATH         = DEF(WINDDK_BIN32)\rc.exe

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: edk2-buildtools:[2664] trunk/BaseTools/Conf/tools_def.template

[<oli...@us...>]

Revision: 2664
          http://sourceforge.net/p/edk2-buildtools/code/2664
Author:   oliviermartin
Date:     2014-05-19 09:53:07 +0000 (Mon, 19 May 2014)
Log Message:
-----------
BaseTools/tools_def.template: Remove the hardcoded path for 'iasl' on Unix system

Most Linux distributions do not provide an up to date IASL compiler.
This older IASL compilers fail to build recent ACPI tables.

We could expect more regular update of the ACPI spec after its governance
moved to a larger organisation (the UEFI Forum). Engineers would need to
update their IASL compiler more often.

The OS environment variable IASL_PREFIX allows to define a specific IASL
compiler. Otherwise, the binary in the PATH would be used.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <oli...@ar...>
Reviewed-by: Jordan Justen <jor...@in...>
Reviewed-by: Gao, Liming <lim...@in...>
Reviewed-by: Liu, Yingke D <yin...@in...>

Modified Paths:
--------------
    trunk/BaseTools/Conf/tools_def.template

Modified: trunk/BaseTools/Conf/tools_def.template
===================================================================
--- trunk/BaseTools/Conf/tools_def.template	2014-04-30 01:08:26 UTC (rev 2663)
+++ trunk/BaseTools/Conf/tools_def.template	2014-05-19 09:53:07 UTC (rev 2664)
@@ -162,8 +162,7 @@
 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 UNIX_IASL_BIN           = ENV(IASL_PREFIX)iasl
 DEFINE WIN_ASL_BIN_DIR         = C:\ASL
 DEFINE WIN_IASL_BIN            = DEF(WIN_ASL_BIN_DIR)\iasl.exe
 DEFINE WIN_ASL_BIN             = DEF(WIN_ASL_BIN_DIR)\asl.exe

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: edk2-buildtools:[2670] trunk/BaseTools/Conf/tools_def.template

[<lg...@us...>]

Revision: 2670
          http://sourceforge.net/p/edk2-buildtools/code/2670
Author:   lgao4
Date:     2014-06-25 04:59:46 +0000 (Wed, 25 Jun 2014)
Log Message:
-----------
-Wno-missing-braces option is used to disable warning when the initialized value without braces is set into structure. To remove this option can detect such wrong case in source code. 

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Gao, Liming <lim...@in...>
Reviewed-By: Olivier Martin <Oli...@ar...>
Tested-By: Olivier Martin <Oli...@ar...>

Modified Paths:
--------------
    trunk/BaseTools/Conf/tools_def.template

Modified: trunk/BaseTools/Conf/tools_def.template
===================================================================
--- trunk/BaseTools/Conf/tools_def.template	2014-06-18 02:15:55 UTC (rev 2669)
+++ trunk/BaseTools/Conf/tools_def.template	2014-06-25 04:59:46 UTC (rev 2670)
@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
 #  Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
 #  Portions copyright (c) 2011 - 2013, ARM Ltd. All rights reserved.<BR>
 #
@@ -3128,7 +3128,7 @@
 DEBUG_*_*_OBJCOPY_ADDDEBUGFLAG     = --add-gnu-debuglink=$(DEBUG_DIR)\$(MODULE_NAME).debug
 RELEASE_*_*_OBJCOPY_ADDDEBUGFLAG   =
 
-DEFINE GCC_ALL_CC_FLAGS            = -g -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -Wno-array-bounds -c -include AutoGen.h
+DEFINE GCC_ALL_CC_FLAGS            = -g -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -c -include AutoGen.h
 DEFINE GCC_IA32_CC_FLAGS           = DEF(GCC_ALL_CC_FLAGS) -m32 -malign-double -freorder-blocks -freorder-blocks-and-partition -O2 -mno-stack-arg-probe
 DEFINE GCC_X64_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -mno-red-zone -Wno-address -mno-stack-arg-probe
 DEFINE GCC_IPF_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -minline-int-divide-min-latency
@@ -3155,7 +3155,7 @@
 DEFINE GCC_ARM_RC_FLAGS            = -I binary -O elf32-littlearm     -B arm     --rename-section .data=.hii
 DEFINE GCC_AARCH64_RC_FLAGS        = -I binary -O elf64-littleaarch64 -B aarch64 --rename-section .data=.hii
 
-DEFINE GCC44_ALL_CC_FLAGS            = -g -fshort-wchar -fno-stack-protector -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -Wno-array-bounds -ffunction-sections -fdata-sections -c -include AutoGen.h -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
+DEFINE GCC44_ALL_CC_FLAGS            = -g -fshort-wchar -fno-stack-protector -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 -D EFI32
 DEFINE GCC44_X64_CC_FLAGS            = DEF(GCC44_ALL_CC_FLAGS) -m64 "-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
@@ -4037,7 +4037,7 @@
 *_ELFGCC_X64_VFRPP_PATH            = DEF(ELFGCC_BIN)/gcc
 *_ELFGCC_X64_RC_PATH               = DEF(ELFGCC_BIN)/objcopy
 
-*_ELFGCC_X64_CC_FLAGS              = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -Wno-address -Wno-array-bounds -c -include AutoGen.h -D_EFI_P64
+*_ELFGCC_X64_CC_FLAGS              = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-address -Wno-array-bounds -c -include AutoGen.h -D_EFI_P64
 *_ELFGCC_X64_DLINK_FLAGS           = -nostdlib --shared --entry $(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
 *_ELFGCC_X64_SLINK_FLAGS           =
 *_ELFGCC_X64_ASM_FLAGS             = -c -x assembler -imacros $(DEST_DIR_DEBUG)/AutoGen.h

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.