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 <mjsbeaton@gmail.com>
This commit is contained in:
Mike Beaton 2026-01-24 16:40:26 +00:00 committed by mergify[bot]
parent 2afee514d7
commit cfb7c293dc
6 changed files with 12 additions and 18 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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