diff options
| author | Laszlo Ersek <lersek@redhat.com> | 2019-01-02 20:22:14 +0100 |
|---|---|---|
| committer | Laszlo Ersek <lersek@redhat.com> | 2019-01-08 02:34:05 +0100 |
| commit | 8ff122119941fdf23234134892c2d76a214f5f2d (patch) | |
| tree | aabf17d517e554badd70e1a9ddf16f7df198de1d /EmulatorPkg | |
| parent | 46f4c9677c615d862649459392f8f55b3e6567c2 (diff) | |
| download | edk2-8ff122119941fdf23234134892c2d76a214f5f2d.tar.gz edk2-8ff122119941fdf23234134892c2d76a214f5f2d.tar.bz2 edk2-8ff122119941fdf23234134892c2d76a214f5f2d.zip | |
EmulatorPkg: require GCC48 or later
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 <afish@apple.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1377
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Diffstat (limited to 'EmulatorPkg')
| -rw-r--r-- | EmulatorPkg/Unix/Host/Host.inf | 4 | ||||
| -rwxr-xr-x | 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 9bcdfd8533..6db269842e 100644 --- a/EmulatorPkg/Unix/Host/Host.inf +++ b/EmulatorPkg/Unix/Host/Host.inf @@ -124,10 +124,6 @@ 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 9ed59387d1..2daaaadcd4 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 ;; |