Adapt the qemu_edk2_get_toolchain() function in "roms/edk2-funcs.sh" in
advance to edk2 commit 8d7cdfae8cb8 ("OvmfPkg: require GCC48 or later",
2019-01-08), which is part of the "edk2-stable201903" tag.
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Tested-by: Igor Mammedov <imammedo@redhat.com>
---
Notes:
v4:
- no change
v3:
- pick up Igor's T-b
v2:
- pick up Phil's R-b / T-b
- pick up Michal's and Michael's R-b's
roms/edk2-funcs.sh | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/roms/edk2-funcs.sh b/roms/edk2-funcs.sh
index 8930479dcb44..d1cb1e4a111e 100644
--- a/roms/edk2-funcs.sh
+++ b/roms/edk2-funcs.sh
@@ -149,23 +149,11 @@ qemu_edk2_get_toolchain()
# Run "git-blame" on "OvmfPkg/build.sh" in edk2 for more information on
# the mapping below.
case "$gcc_version" in
- ([1-3].*|4.[0-3].*)
+ ([1-3].*|4.[0-7].*)
printf '%s: unsupported gcc version "%s"\n' \
"$program_name" "$gcc_version" >&2
return 1
;;
- (4.4.*)
- printf 'GCC44\n'
- ;;
- (4.5.*)
- printf 'GCC45\n'
- ;;
- (4.6.*)
- printf 'GCC46\n'
- ;;
- (4.7.*)
- printf 'GCC47\n'
- ;;
(4.8.*)
printf 'GCC48\n'
;;
--
2.19.1.3.g30247aa5d201