From cfb7c293dc2b3cabdc65925a33891fc3b007fbe8 Mon Sep 17 00:00:00 2001 From: Mike Beaton Date: Sat, 24 Jan 2026 16:40:26 +0000 Subject: [PATCH] OvmfPkg: Remove references to GCC5 in scripts and tools Note the GCC tool chain tag is currently intended to be compatible with gcc releases 8 and higher. Signed-off-by: Mike Beaton --- OvmfPkg/CloudHv/README | 2 +- OvmfPkg/IntelTdx/README.md | 6 +++--- OvmfPkg/LoongArchVirt/Readme.md | 6 +++--- OvmfPkg/PlatformCI/ReadMe.md | 2 +- OvmfPkg/RiscVVirt/README.md | 4 ++-- OvmfPkg/build.sh | 10 ++-------- 6 files changed, 12 insertions(+), 18 deletions(-) diff --git a/OvmfPkg/CloudHv/README b/OvmfPkg/CloudHv/README index 63e28860e0..10c48219b0 100644 --- a/OvmfPkg/CloudHv/README +++ b/OvmfPkg/CloudHv/README @@ -46,7 +46,7 @@ follows: ./cloud-hypervisor \ --cpus boot=1 \ --memory size=1G \ - --kernel Build/CloudHvX64/DEBUG_GCC5/FV/CLOUDHV.fd \ + --kernel Build/CloudHvX64/DEBUG_GCC/FV/CLOUDHV.fd \ --disk path=/path/to/disk.raw Releases diff --git a/OvmfPkg/IntelTdx/README.md b/OvmfPkg/IntelTdx/README.md index 83739efed0..8ed964c256 100644 --- a/OvmfPkg/IntelTdx/README.md +++ b/OvmfPkg/IntelTdx/README.md @@ -62,17 +62,17 @@ cd /path/to/edk2 source edksetup.sh ## CC_MEASUREMENT disabled -build -p OvmfPkg/OvmfPkgX64.dsc -a X64 -t GCC5 -D CC_MEASUREMENT_ENABLE=FALSE -b RELEASE +build -p OvmfPkg/OvmfPkgX64.dsc -a X64 -t GCC -D CC_MEASUREMENT_ENABLE=FALSE -b RELEASE ## CC_MEASUREMENT enabled -build -p OvmfPkg/OvmfPkgX64.dsc -a X64 -t GCC5 -D CC_MEASUREMENT_ENABLE=TRUE -b RELEASE +build -p OvmfPkg/OvmfPkgX64.dsc -a X64 -t GCC -D CC_MEASUREMENT_ENABLE=TRUE -b RELEASE ``` - Build the TDVF (Config-B) target: ``` cd /path/to/edk2 source edksetup.sh -build -p OvmfPkg/IntelTdx/IntelTdxX64.dsc -a X64 -t GCC5 -b RELEASE +build -p OvmfPkg/IntelTdx/IntelTdxX64.dsc -a X64 -t GCC -b RELEASE ``` Usage diff --git a/OvmfPkg/LoongArchVirt/Readme.md b/OvmfPkg/LoongArchVirt/Readme.md index 5e409d5070..dd00a36ec0 100644 --- a/OvmfPkg/LoongArchVirt/Readme.md +++ b/OvmfPkg/LoongArchVirt/Readme.md @@ -43,13 +43,13 @@ Note: Please refer to QEMU compilation rules, located in qemu/doc/system/loongar #### Building LoongArch QEMU virt FW with GCC export WORKSPACE=`pwd` - export GCC5_LOONGARCH64_PREFIX=loongarch64-unknown-linux-gnu- + export GCC_LOONGARCH64_PREFIX=loongarch64-unknown-linux-gnu- export PACKAGES_PATH=$WORKSPACE/edk2 export EDK_TOOLS_PATH=$WORKSPACE/edk2/BaseTools source edk2/edksetup.sh --reconfig make -C edk2/BaseTools source edk2/edksetup.sh BaseTools - build -b RELEASE -t GCC5 -a LOONGARCH64 -p OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc + build -b RELEASE -t GCC -a LOONGARCH64 -p OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc ## Test LoongArch QEMU virtual machine firmware qemu-system-loongarch64 \ @@ -57,7 +57,7 @@ Note: Please refer to QEMU compilation rules, located in qemu/doc/system/loongar -M virt \ -smp 2 \ -cpu la464 \ - -bios Build/LoongArchVirtQemu/RELEASE_GCC5/FV/QEMU_EFI.fd \ + -bios Build/LoongArchVirtQemu/RELEASE_GCC/FV/QEMU_EFI.fd \ -serial stdio ## Test LoongArch QEMU virtual machine OS diff --git a/OvmfPkg/PlatformCI/ReadMe.md b/OvmfPkg/PlatformCI/ReadMe.md index bb7734e315..5fc059ec23 100644 --- a/OvmfPkg/PlatformCI/ReadMe.md +++ b/OvmfPkg/PlatformCI/ReadMe.md @@ -6,7 +6,7 @@ to use the same Pytools based build infrastructure locally. ## Supported Configuration Details This solution for building and running OvmfPkg has only been validated with Windows 10 -with VS2022 and Ubuntu 18.04 with GCC5 toolchain. Four different firmware builds are +with VS2022 and Ubuntu 18.04 with GCC toolchain. Four different firmware builds are supported and are described below. | Configuration name | Architectures | DSC File |Additional Flags | diff --git a/OvmfPkg/RiscVVirt/README.md b/OvmfPkg/RiscVVirt/README.md index e57e161075..79460a004f 100644 --- a/OvmfPkg/RiscVVirt/README.md +++ b/OvmfPkg/RiscVVirt/README.md @@ -22,13 +22,13 @@ which supports separate pflash devices for EDK2 code and variable storage. **Prerequisite**: RISC-V GNU compiler toolchain should be installed. export WORKSPACE=`pwd` - export GCC5_RISCV64_PREFIX=riscv64-linux-gnu- + export GCC_RISCV64_PREFIX=riscv64-linux-gnu- export PACKAGES_PATH=$WORKSPACE/edk2 export EDK_TOOLS_PATH=$WORKSPACE/edk2/BaseTools source edk2/edksetup.sh --reconfig make -C edk2/BaseTools source edk2/edksetup.sh BaseTools - build -a RISCV64 --buildtarget RELEASE -p OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc -t GCC5 + build -a RISCV64 --buildtarget RELEASE -p OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc -t GCC ### Using CLANGDWARF toolchain (clang + lld) **Prerequisite**: LLVM toolchain with clang and lld should be installed. diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh index 164c11f641..ed3ed001b4 100755 --- a/OvmfPkg/build.sh +++ b/OvmfPkg/build.sh @@ -76,16 +76,10 @@ case `uname` in Linux*) gcc_version=$(gcc -v 2>&1 | tail -1 | awk '{print $3}') case $gcc_version in - [1-3].*|4.[0-7].*) - echo OvmfPkg requires GCC4.8 or later + [1-7].*) + echo OvmfPkg requires GCC8 or later exit 1 ;; - 4.8.*) - TARGET_TOOLS=GCC48 - ;; - 4.9.*|6.[0-2].*) - TARGET_TOOLS=GCC49 - ;; *) TARGET_TOOLS=GCC ;;