From 8d7cdfae8cb8952505f80e5f7fa42838406e34f2 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 2 Jan 2019 20:37:02 +0100 Subject: [PATCH] OvmfPkg: require GCC48 or later MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit We're about to remove BaseTools support for GCC44..GCC47. Reject those gcc versions cleanly in "OvmfPkg/build.sh". In "OvmfPkg/README", upgrade any mentions of the same gcc versions to GCC48. No GCC44..GCC47 references remain under OvmfPkg after this patch. Cc: Anthony Perard Cc: Ard Biesheuvel Cc: Jordan Justen Cc: Julien Grall Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1377 Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Laszlo Ersek Reviewed-by: Ard Biesheuvel Reviewed-by: Jordan Justen Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Liming Gao --- OvmfPkg/README | 6 +++--- OvmfPkg/build.sh | 16 ++-------------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/OvmfPkg/README b/OvmfPkg/README index 7415419d2d..68ce0750af 100644 --- a/OvmfPkg/README +++ b/OvmfPkg/README @@ -115,8 +115,8 @@ $ OvmfPkg/build.sh -a X64 qemu And to run a 64-bit UEFI bootable ISO image: $ OvmfPkg/build.sh -a X64 qemu -cdrom /path/to/disk-image.iso -To build a 32-bit OVMF without debug messages using GCC 4.5: -$ OvmfPkg/build.sh -a IA32 -b RELEASE -t GCC45 +To build a 32-bit OVMF without debug messages using GCC 4.8: +$ OvmfPkg/build.sh -a IA32 -b RELEASE -t GCC48 === SMM support === @@ -406,7 +406,7 @@ volume image. If you build with the UNIXGCC toolchain, then debugging will be disabled due to larger image sizes being produced by the UNIXGCC toolchain. The -first choice recommendation is to use GCC44 or newer instead. +first choice recommendation is to use GCC48 or newer instead. If you must use UNIXGCC, then you can override the build options for particular libraries and modules in the .dsc to re-enable debugging diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh index 6821552025..6821742e7a 100755 --- a/OvmfPkg/build.sh +++ b/OvmfPkg/build.sh @@ -83,22 +83,10 @@ case `uname` in Linux*) gcc_version=$(gcc -v 2>&1 | tail -1 | awk '{print $3}') case $gcc_version in - [1-3].*|4.[0-3].*) - echo OvmfPkg requires GCC4.4 or later + [1-3].*|4.[0-7].*) + echo OvmfPkg 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.39.5