EmulatorPkg: Add support for GCC48 & GCC49 toolchains

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15699 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EmulatorPkg/Unix/Host/Host.inf b/EmulatorPkg/Unix/Host/Host.inf
index 814a8c38e8d299288a9be56571e2a6617afb168e..dee2e0df23289a5fad4218537be0032c4ad4b68c 100644 (file)
--- a/EmulatorPkg/Unix/Host/Host.inf
+++ b/EmulatorPkg/Unix/Host/Host.inf
@@ -127,6 +127,8 @@
    GCC:*_GCC45_X64_CC_FLAGS = "-DEFIAPI=__attribute__((ms_abi))"\r
    GCC:*_GCC46_X64_CC_FLAGS = "-DEFIAPI=__attribute__((ms_abi))"\r
    GCC:*_GCC47_X64_CC_FLAGS = "-DEFIAPI=__attribute__((ms_abi))"\r
    GCC:*_GCC45_X64_CC_FLAGS = "-DEFIAPI=__attribute__((ms_abi))"\r
    GCC:*_GCC46_X64_CC_FLAGS = "-DEFIAPI=__attribute__((ms_abi))"\r
    GCC:*_GCC47_X64_CC_FLAGS = "-DEFIAPI=__attribute__((ms_abi))"\r

+   GCC:*_GCC48_X64_CC_FLAGS = "-DEFIAPI=__attribute__((ms_abi))"\r
+   GCC:*_GCC49_X64_CC_FLAGS = "-DEFIAPI=__attribute__((ms_abi))"\r

    GCC:*_*_X64_PP_FLAGS == -m64 -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h\r
    GCC:*_*_X64_ASM_FLAGS == -m64 -c -x assembler -imacros $(DEST_DIR_DEBUG)/AutoGen.h\r
 \r
    GCC:*_*_X64_PP_FLAGS == -m64 -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h\r
    GCC:*_*_X64_ASM_FLAGS == -m64 -c -x assembler -imacros $(DEST_DIR_DEBUG)/AutoGen.h\r
 \r

diff --git a/EmulatorPkg/build.sh b/EmulatorPkg/build.sh
index 67648f509a38b601f422531caa9640336085f886..fc8ae493cd493e42e746a1bd902dd0029c67dd44 100755 (executable)
--- a/EmulatorPkg/build.sh
+++ b/EmulatorPkg/build.sh
@@ -90,9 +90,15 @@ case `uname` in
       4.6.*)
         TARGET_TOOLS=GCC46
         ;;
       4.6.*)
         TARGET_TOOLS=GCC46
         ;;

-      4.[789].*)
+      4.7.*)

         TARGET_TOOLS=GCC47
         ;;
         TARGET_TOOLS=GCC47
         ;;

+      4.8.*)
+        TARGET_TOOLS=GCC48
+        ;;
+      4.9.*|4.1[0-9].*)
+        TARGET_TOOLS=GCC49
+        ;;

       *)
         TARGET_TOOLS=GCC44
         ;;
       *)
         TARGET_TOOLS=GCC44
         ;;