From 35cfa92c5a79f645279b4f4c700bae2f69de961b Mon Sep 17 00:00:00 2001 From: jljusten Date: Mon, 13 Aug 2012 17:06:39 +0000 Subject: [PATCH] EmulatorPkg: Support GCC47 toolchain When GCC >= 4.7 is detected, use the GCC47 toolchain. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Paolo Bonzini Signed-off-by: Laszlo Ersek [jordan.l.justen@intel.com: reword commit message for EmulatorPkg] Reviewed-by: Jordan Justen git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13629 6f19259b-4bc3-4df7-8a09-765794883524 --- EmulatorPkg/Unix/Host/Host.inf | 1 + EmulatorPkg/build.sh | 3 +++ 2 files changed, 4 insertions(+) diff --git a/EmulatorPkg/Unix/Host/Host.inf b/EmulatorPkg/Unix/Host/Host.inf index 496bd770b3..3d262a760e 100644 --- a/EmulatorPkg/Unix/Host/Host.inf +++ b/EmulatorPkg/Unix/Host/Host.inf @@ -126,6 +126,7 @@ GCC:*_GCC44_X64_CC_FLAGS = "-DEFIAPI=__attribute__((ms_abi))" GCC:*_GCC45_X64_CC_FLAGS = "-DEFIAPI=__attribute__((ms_abi))" GCC:*_GCC46_X64_CC_FLAGS = "-DEFIAPI=__attribute__((ms_abi))" + GCC:*_GCC47_X64_CC_FLAGS = "-DEFIAPI=__attribute__((ms_abi))" GCC:*_*_X64_PP_FLAGS == -m64 -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h GCC:*_*_X64_ASM_FLAGS == -m64 -c -x assembler -imacros $(DEST_DIR_DEBUG)/AutoGen.h diff --git a/EmulatorPkg/build.sh b/EmulatorPkg/build.sh index b34d11a7ff..67648f509a 100755 --- a/EmulatorPkg/build.sh +++ b/EmulatorPkg/build.sh @@ -90,6 +90,9 @@ case `uname` in 4.6.*) TARGET_TOOLS=GCC46 ;; + 4.[789].*) + TARGET_TOOLS=GCC47 + ;; *) TARGET_TOOLS=GCC44 ;;