public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: Laszlo Ersek <lersek@redhat.com>
To: edk2-devel-01 <edk2-devel@lists.01.org>
Cc: Andrew Fish <afish@apple.com>,
	Jordan Justen <jordan.l.justen@intel.com>,
	Ruiyu Ni <ruiyu.ni@intel.com>
Subject: [PATCH 01/26] EmulatorPkg: require GCC48 or later
Date: Thu,  3 Jan 2019 03:47:51 +0100	[thread overview]
Message-ID: <20190103024816.9236-2-lersek@redhat.com> (raw)
In-Reply-To: <20190103024816.9236-1-lersek@redhat.com>

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>
---

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




  reply	other threads:[~2019-01-03  2:48 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-03  2:47 [PATCH 00/26] remove the GCC44 through GCC47 toolchains Laszlo Ersek
2019-01-03  2:47 ` Laszlo Ersek [this message]
2019-01-03  2:47 ` [PATCH 02/26] OvmfPkg: require GCC48 or later Laszlo Ersek
2019-01-03  9:33   ` Ard Biesheuvel
2019-01-03  2:47 ` [PATCH 03/26] Vlv2TbltDevicePkg: assume " Laszlo Ersek
2019-01-04  6:53   ` Sun, Zailiang
2019-01-03  2:47 ` [PATCH 04/26] BaseTools/Conf/tools_def.template: drop ARM/AARCH support from GCC46/GCC47 Laszlo Ersek
2019-01-03  2:47 ` [PATCH 05/26] BaseTools/tools_def.template: fix up LF-only line terminator Laszlo Ersek
2019-01-03  2:47 ` [PATCH 06/26] BaseTools/tools_def.template: strip trailing whitespace Laszlo Ersek
2019-01-03  2:47 ` [PATCH 07/26] BaseTools/tools_def.template: remove GCC48_IA32_X64_DLINK_COMMON dead-end Laszlo Ersek
2019-01-03  2:47 ` [PATCH 08/26] BaseTools/tools_def.template: remove GCC47 leaf definitions Laszlo Ersek
2019-01-03  2:47 ` [PATCH 09/26] BaseTools/tools_def.template: propagate loss of GCC47 references Laszlo Ersek
2019-01-03  2:48 ` [PATCH 10/26] BaseTools/tools_def.template: remove GCC47 documentation Laszlo Ersek
2019-01-03  2:48 ` [PATCH 11/26] BaseTools/tools_def.template: remove GCC46 leaf definitions Laszlo Ersek
2019-01-03  2:48 ` [PATCH 12/26] BaseTools/tools_def.template: propagate loss of GCC46 references Laszlo Ersek
2019-01-03  2:48 ` [PATCH 13/26] BaseTools/tools_def.template: remove GCC46 documentation Laszlo Ersek
2019-01-03  2:48 ` [PATCH 14/26] BaseTools/tools_def.template: remove GCC45 leaf definitions Laszlo Ersek
2019-01-03  2:48 ` [PATCH 15/26] BaseTools/tools_def.template: propagate loss of GCC45 references Laszlo Ersek
2019-01-03  2:48 ` [PATCH 16/26] BaseTools/tools_def.template: remove GCC45 documentation Laszlo Ersek
2019-01-03  2:48 ` [PATCH 17/26] BaseTools/tools_def.template: remove GCC44 leaf definitions Laszlo Ersek
2019-01-03  2:48 ` [PATCH 18/26] BaseTools/tools_def.template: propagate loss of GCC44 references Laszlo Ersek
2019-01-03  2:48 ` [PATCH 19/26] BaseTools/tools_def.template: rename GCC44_ALL_CC_FLAGS to GCC48_ALL_CC_FLAGS Laszlo Ersek
2019-01-03  2:48 ` [PATCH 20/26] BaseTools/tools_def.template: eliminate GCC44_IA32_X64_DLINK_FLAGS Laszlo Ersek
2019-01-03  2:48 ` [PATCH 21/26] BaseTools/tools_def.template: rename GCC44_IA32_X64_DLINK_COMMON to GCC48_IA32_X64_DLINK_COMMON Laszlo Ersek
2019-01-03  2:48 ` [PATCH 22/26] BaseTools/tools_def.template: remove comment about GCC44 + LzmaF86Compress Laszlo Ersek
2019-01-03  2:48 ` [PATCH 23/26] BaseTools/tools_def.template: remove GCC44 documentation Laszlo Ersek
2019-01-03  2:48 ` [PATCH 24/26] ArmPkg/ArmSoftFloatLib: drop build flags specific to GCC46/GCC47 Laszlo Ersek
2019-01-03  9:33   ` Ard Biesheuvel
2019-01-03  2:48 ` [PATCH 25/26] CryptoPkg/BaseCryptLib: drop build flags specific to GCC44 Laszlo Ersek
2019-01-03  5:02   ` Wang, Jian J
2019-01-03  2:48 ` [PATCH 26/26] Revert "MdePkg: avoid __builtin_unreachable() on GCC v4.4" Laszlo Ersek
2019-01-03  9:34   ` Ard Biesheuvel
2019-01-03 13:25   ` Marvin Häuser
2019-01-03 20:21 ` [PATCH 00/26] remove the GCC44 through GCC47 toolchains Jordan Justen
2019-01-07  9:44 ` Philippe Mathieu-Daudé
2019-01-07 12:15   ` Gao, Liming
2019-01-07 18:08     ` Laszlo Ersek
2019-01-08  1:54       ` Laszlo Ersek
2019-01-08 11:34         ` Ard Biesheuvel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190103024816.9236-2-lersek@redhat.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox