We're about to remove BaseTools support for GCC44..GCC47. Reject those gcc versions cleanly in "EmulatorPkg/build.sh", and drop build flags too that are specific to them.
No GCC44..GCC47 references remain under EmulatorPkg after this patch. Cc: Andrew Fish <[email protected]> Cc: Jordan Justen <[email protected]> Cc: Ruiyu Ni <[email protected]> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1377 Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Laszlo Ersek <[email protected]> --- Notes: I tested that, after this patch, "build.sh" successfully builds EmulatorPkg with GCC48. I did no runtime tests, nor did I test the rejection path with any of gcc-4.4 through gcc-4.7. EmulatorPkg/Unix/Host/Host.inf | 4 ---- EmulatorPkg/build.sh | 18 +++--------------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/EmulatorPkg/Unix/Host/Host.inf b/EmulatorPkg/Unix/Host/Host.inf index 9bcdfd85332b..6db269842e1b 100644 --- a/EmulatorPkg/Unix/Host/Host.inf +++ b/EmulatorPkg/Unix/Host/Host.inf @@ -124,10 +124,6 @@ [BuildOptions] GCC:*_*_X64_DLINK_FLAGS == -o $(BIN_DIR)/Host -m64 -L/usr/X11R6/lib GCC:*_GCC5_X64_DLINK_FLAGS == -flto -o $(BIN_DIR)/Host -m64 -L/usr/X11R6/lib GCC:*_*_X64_CC_FLAGS == -m64 -g -fshort-wchar -fno-strict-aliasing -Wall -malign-double -idirafter/usr/include -c -include $(DEST_DIR_DEBUG)/AutoGen.h -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings - 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:*_GCC48_X64_CC_FLAGS = "-DEFIAPI=__attribute__((ms_abi))" GCC:*_GCC49_X64_CC_FLAGS = "-DEFIAPI=__attribute__((ms_abi))" GCC:*_GCC5_X64_CC_FLAGS = "-DEFIAPI=__attribute__((ms_abi))" -flto -DUSING_LTO -Os diff --git a/EmulatorPkg/build.sh b/EmulatorPkg/build.sh index 9ed59387d197..2daaaadcd421 100755 --- a/EmulatorPkg/build.sh +++ b/EmulatorPkg/build.sh @@ -48,7 +48,7 @@ PLATFORMFILE= LAST_ARG= RUN_EMULATOR=no CLEAN_TYPE=none -TARGET_TOOLS=GCC44 +TARGET_TOOLS=GCC48 NETWORK_SUPPORT= BUILD_NEW_SHELL= BUILD_FAT= @@ -93,22 +93,10 @@ case `uname` in gcc_version=$(gcc -v 2>&1 | tail -1 | awk '{print $3}') case $gcc_version in - [1-3].*|4.[0-3].*) - echo EmulatorPkg requires GCC4.4 or later + [1-3].*|4.[0-7].*) + echo EmulatorPkg requires GCC4.8 or later exit 1 ;; - 4.4.*) - TARGET_TOOLS=GCC44 - ;; - 4.5.*) - TARGET_TOOLS=GCC45 - ;; - 4.6.*) - TARGET_TOOLS=GCC46 - ;; - 4.7.*) - TARGET_TOOLS=GCC47 - ;; 4.8.*) TARGET_TOOLS=GCC48 ;; -- 2.19.1.3.g30247aa5d201 _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
