[edk2-stable202305 PATCH 0/1] Rename GCC5 to GCC in filenames, scripts and documentation

public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed

* [edk2-stable202305 PATCH 0/1] Rename GCC5 to GCC in filenames, scripts and documentation
@ 2023-05-17 18:58 Rebecca Cran
  2023-05-17 18:58 ` [edk2-stable202305 PATCH 1/1] Rename GCC5 toolchain references in docs and scripts to GCC Rebecca Cran
  0 siblings, 1 reply; 4+ messages in thread
From: Rebecca Cran @ 2023-05-17 18:58 UTC (permalink / raw)
  To: devel, Sean Brogan, Michael Kubacki, Liming Gao, Leif Lindholm,
	Ard Biesheuvel, Sami Mujawar, Gerd Hoffmann, Bob Feng, Yuwei Chen,
	Sami Mujawar, Alexei Fedorov, Pierre Gondois, Andrew Fish, Ray Ni,
	Jiewen Yao, Jordan Justen, Sebastien Boeuf, Nate DeSimone
  Cc: Rebecca Cran

Rename GCC5 toolchain references in docs and scripts to GCC
    
The GCC5 toolchain has been deprecated, and GCC should be used going
forward.
    
Update references to GCC5 in filenames, scripts and documentation.

Branch: https://github.com/bcran/edk2/tree/toolchain_docs
PR https://github.com/tianocore/edk2/pull/4396/

Rebecca Cran (1):
  Rename GCC5 toolchain references in docs and scripts to GCC

 .azurepipelines/{Ubuntu-GCC5.yml => Ubuntu-GCC.yml}                        |  4 ++--
 .azurepipelines/templates/platform-build-run-steps.yml                     |  2 +-
 .azurepipelines/templates/pr-gate-build-job.yml                            |  2 +-
 .azurepipelines/templates/pr-gate-steps.yml                                |  2 +-
 ArmPlatformPkg/Scripts/Makefile                                            |  2 +-
 ArmVirtPkg/PlatformCI/.azurepipelines/{Ubuntu-GCC5.yml => Ubuntu-GCC.yml}  |  4 ++--
 ArmVirtPkg/PlatformCI/ReadMe.md                                            |  2 +-
 BaseTools/Edk2ToolsBuild.py                                                |  2 +-
 BaseTools/Plugin/HostBasedUnitTestRunner/HostBasedUnitTestRunner.py        |  2 +-
 DynamicTablesPkg/Readme.md                                                 | 10 ++++-----
 EmulatorPkg/PlatformCI/.azurepipelines/{Ubuntu-GCC5.yml => Ubuntu-GCC.yml} |  4 ++--
 EmulatorPkg/PlatformCI/ReadMe.md                                           |  2 +-
 EmulatorPkg/Readme.md                                                      |  8 +++----
 EmulatorPkg/build.sh                                                       | 14 ++++---------
 OvmfPkg/CloudHv/README                                                     |  2 +-
 OvmfPkg/IntelTdx/README                                                    |  4 ++--
 OvmfPkg/PlatformCI/.azurepipelines/{Ubuntu-GCC5.yml => Ubuntu-GCC.yml}     |  4 ++--
 OvmfPkg/PlatformCI/ReadMe.md                                               |  2 +-
 OvmfPkg/build.sh                                                           | 12 +++--------
 PrmPkg/Readme.md                                                           |  6 +++---
 ReadMe.rst                                                                 | 22 ++++++++++----------
 UnitTestFrameworkPkg/ReadMe.md                                             |  8 +++----
 22 files changed, 54 insertions(+), 66 deletions(-)
 rename .azurepipelines/{Ubuntu-GCC5.yml => Ubuntu-GCC.yml} (84%)
 rename ArmVirtPkg/PlatformCI/.azurepipelines/{Ubuntu-GCC5.yml => Ubuntu-GCC.yml} (96%)
 rename EmulatorPkg/PlatformCI/.azurepipelines/{Ubuntu-GCC5.yml => Ubuntu-GCC.yml} (95%)
 rename OvmfPkg/PlatformCI/.azurepipelines/{Ubuntu-GCC5.yml => Ubuntu-GCC.yml} (96%)

-- 
2.39.2


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [edk2-stable202305 PATCH 1/1] Rename GCC5 toolchain references in docs and scripts to GCC
  2023-05-17 18:58 [edk2-stable202305 PATCH 0/1] Rename GCC5 to GCC in filenames, scripts and documentation Rebecca Cran
@ 2023-05-17 18:58 ` Rebecca Cran
  2023-05-18  0:10   ` [edk2-devel] " Michael D Kinney
  0 siblings, 1 reply; 4+ messages in thread
From: Rebecca Cran @ 2023-05-17 18:58 UTC (permalink / raw)
  To: devel, Sean Brogan, Michael Kubacki, Liming Gao, Leif Lindholm,
	Ard Biesheuvel, Sami Mujawar, Gerd Hoffmann, Bob Feng, Yuwei Chen,
	Sami Mujawar, Alexei Fedorov, Pierre Gondois, Andrew Fish, Ray Ni,
	Jiewen Yao, Jordan Justen, Sebastien Boeuf, Nate DeSimone
  Cc: Rebecca Cran

The GCC5 toolchain has been deprecated, and GCC should be used going
forward.

Update references to GCC5 in filenames, scripts and documentation.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
---
 .azurepipelines/{Ubuntu-GCC5.yml => Ubuntu-GCC.yml}                        |  4 ++--
 .azurepipelines/templates/platform-build-run-steps.yml                     |  2 +-
 .azurepipelines/templates/pr-gate-build-job.yml                            |  2 +-
 .azurepipelines/templates/pr-gate-steps.yml                                |  2 +-
 ArmPlatformPkg/Scripts/Makefile                                            |  2 +-
 ArmVirtPkg/PlatformCI/.azurepipelines/{Ubuntu-GCC5.yml => Ubuntu-GCC.yml}  |  4 ++--
 ArmVirtPkg/PlatformCI/ReadMe.md                                            |  2 +-
 BaseTools/Edk2ToolsBuild.py                                                |  2 +-
 BaseTools/Plugin/HostBasedUnitTestRunner/HostBasedUnitTestRunner.py        |  2 +-
 DynamicTablesPkg/Readme.md                                                 | 10 ++++-----
 EmulatorPkg/PlatformCI/.azurepipelines/{Ubuntu-GCC5.yml => Ubuntu-GCC.yml} |  4 ++--
 EmulatorPkg/PlatformCI/ReadMe.md                                           |  2 +-
 EmulatorPkg/Readme.md                                                      |  8 +++----
 EmulatorPkg/build.sh                                                       | 14 ++++---------
 OvmfPkg/CloudHv/README                                                     |  2 +-
 OvmfPkg/IntelTdx/README                                                    |  4 ++--
 OvmfPkg/PlatformCI/.azurepipelines/{Ubuntu-GCC5.yml => Ubuntu-GCC.yml}     |  4 ++--
 OvmfPkg/PlatformCI/ReadMe.md                                               |  2 +-
 OvmfPkg/build.sh                                                           | 12 +++--------
 PrmPkg/Readme.md                                                           |  6 +++---
 ReadMe.rst                                                                 | 22 ++++++++++----------
 UnitTestFrameworkPkg/ReadMe.md                                             |  8 +++----
 22 files changed, 54 insertions(+), 66 deletions(-)

diff --git a/.azurepipelines/Ubuntu-GCC5.yml b/.azurepipelines/Ubuntu-GCC.yml
similarity index 84%
rename from .azurepipelines/Ubuntu-GCC5.yml
rename to .azurepipelines/Ubuntu-GCC.yml
index b9a3b851cf3c..c6ddcc7f9af6 100644
--- a/.azurepipelines/Ubuntu-GCC5.yml
+++ b/.azurepipelines/Ubuntu-GCC.yml
@@ -1,5 +1,5 @@
 ## @file
-# Azure Pipeline build file for a build using ubuntu and GCC5
+# Azure Pipeline build file for a build using ubuntu and GCC
 #
 # Copyright (c) Microsoft Corporation.
 # Copyright (c) 2020, Hewlett Packard Enterprise Development LP. All rights reserved.<BR>
@@ -19,7 +19,7 @@ variables:
 jobs:
 - template: templates/pr-gate-build-job.yml
   parameters:
-    tool_chain_tag: 'GCC5'
+    tool_chain_tag: 'GCC'
     vm_image: 'ubuntu-22.04'
     container: ${{ variables.default_linux_image }}
     arch_list: "IA32,X64,ARM,AARCH64,RISCV64,LOONGARCH64"
diff --git a/.azurepipelines/templates/platform-build-run-steps.yml b/.azurepipelines/templates/platform-build-run-steps.yml
index 8be46cda0e2d..3d7515d76a8e 100644
--- a/.azurepipelines/templates/platform-build-run-steps.yml
+++ b/.azurepipelines/templates/platform-build-run-steps.yml
@@ -43,7 +43,7 @@ steps:
     echo "##vso[task.prependpath]${HOME}/.local/bin"
     echo "new PATH=${PATH}"
   displayName: Set PATH
-  condition: eq('${{ parameters.tool_chain_tag }}', 'GCC5')
+  condition: eq('${{ parameters.tool_chain_tag }}', 'GCC')
 
 - checkout: self
   clean: true
diff --git a/.azurepipelines/templates/pr-gate-build-job.yml b/.azurepipelines/templates/pr-gate-build-job.yml
index 689e2f0987ed..a52ef638ea79 100644
--- a/.azurepipelines/templates/pr-gate-build-job.yml
+++ b/.azurepipelines/templates/pr-gate-build-job.yml
@@ -24,7 +24,7 @@ jobs:
   #Use matrix to speed up the build process
   strategy:
     matrix:
-      ${{ if eq(parameters.tool_chain_tag, 'GCC5') }}:
+      ${{ if eq(parameters.tool_chain_tag, 'GCC') }}:
         TARGET_GCC_ONLY:
           Build.Pkgs: 'EmbeddedPkg'
           Build.Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
diff --git a/.azurepipelines/templates/pr-gate-steps.yml b/.azurepipelines/templates/pr-gate-steps.yml
index 78b2b2c8d934..2ca9e134be39 100644
--- a/.azurepipelines/templates/pr-gate-steps.yml
+++ b/.azurepipelines/templates/pr-gate-steps.yml
@@ -20,7 +20,7 @@ steps:
     echo "##vso[task.prependpath]${HOME}/.local/bin"
     echo "new PATH=${PATH}"
   displayName: Set PATH
-  condition: eq('${{ parameters.tool_chain_tag }}', 'GCC5')
+  condition: eq('${{ parameters.tool_chain_tag }}', 'GCC')
 
 - checkout: self
   clean: true
diff --git a/ArmPlatformPkg/Scripts/Makefile b/ArmPlatformPkg/Scripts/Makefile
index baa618456413..686b68614f03 100644
--- a/ArmPlatformPkg/Scripts/Makefile
+++ b/ArmPlatformPkg/Scripts/Makefile
@@ -5,7 +5,7 @@
 #
 #*/
 
-EDK2_TOOLCHAIN ?= GCC5
+EDK2_TOOLCHAIN ?= GCC
 EDK2_ARCH ?= ARM
 EDK2_BUILD ?= DEBUG
 
diff --git a/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml b/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml
similarity index 96%
rename from ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
rename to ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml
index d1772a65fc3a..dfc5c119096f 100644
--- a/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
+++ b/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml
@@ -3,7 +3,7 @@
 #
 # Platform: ArmVirtQemu
 # OS: Ubuntu
-# Toolchain: GCC5
+# Toolchain: GCC
 #
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -151,7 +151,7 @@ jobs:
     steps:
     - template: ../../../.azurepipelines/templates/platform-build-run-steps.yml
       parameters:
-        tool_chain_tag: GCC5
+        tool_chain_tag: GCC
         build_pkg: $(package)
         build_target: $(Build.Target)
         build_arch: $(Build.Arch)
diff --git a/ArmVirtPkg/PlatformCI/ReadMe.md b/ArmVirtPkg/PlatformCI/ReadMe.md
index ee8d8cd61e73..bf9f7f5cac7e 100644
--- a/ArmVirtPkg/PlatformCI/ReadMe.md
+++ b/ArmVirtPkg/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 ArmVirtPkg has only been validated with Ubuntu
-18.04 and the GCC5 toolchain. Two different firmware builds are supported and are
+18.04 and the GCC toolchain. Two different firmware builds are supported and are
 described below.
 
 | Configuration name      | Architecture       | DSC File         |Additional Flags |
diff --git a/BaseTools/Edk2ToolsBuild.py b/BaseTools/Edk2ToolsBuild.py
index f862468ce275..9053a4bcaba7 100644
--- a/BaseTools/Edk2ToolsBuild.py
+++ b/BaseTools/Edk2ToolsBuild.py
@@ -1,7 +1,7 @@
 # @file Edk2ToolsBuild.py
 # Invocable class that builds the basetool c files.
 #
-# Supports VS2017, VS2019, and GCC5
+# Supports VS2017, VS2019, and GCC
 ##
 # Copyright (c) Microsoft Corporation
 #
diff --git a/BaseTools/Plugin/HostBasedUnitTestRunner/HostBasedUnitTestRunner.py b/BaseTools/Plugin/HostBasedUnitTestRunner/HostBasedUnitTestRunner.py
index 2e5c462cd2fb..583e977295aa 100644
--- a/BaseTools/Plugin/HostBasedUnitTestRunner/HostBasedUnitTestRunner.py
+++ b/BaseTools/Plugin/HostBasedUnitTestRunner/HostBasedUnitTestRunner.py
@@ -129,7 +129,7 @@ class HostBasedUnitTestRunner(IUefiBuildPlugin):
                                         failure_count += 1
 
             if thebuilder.env.GetValue("CODE_COVERAGE") != "FALSE":
-                if thebuilder.env.GetValue("TOOL_CHAIN_TAG") == "GCC5":
+                if thebuilder.env.GetValue("TOOL_CHAIN_TAG") == "GCC":
                     ret = self.gen_code_coverage_gcc(thebuilder)
                     if ret != 0:
                         failure_count += 1
diff --git a/DynamicTablesPkg/Readme.md b/DynamicTablesPkg/Readme.md
index 6b0a6c7a4001..0dc4d6beacdd 100644
--- a/DynamicTablesPkg/Readme.md
+++ b/DynamicTablesPkg/Readme.md
@@ -194,12 +194,12 @@ parameter to the edk2 build system.
 Example:
 
 >build -a AARCH64 -p Platform\ARM\JunoPkg\ArmJuno.dsc
-   -t GCC5 **-D DYNAMIC_TABLES_FRAMEWORK**
+   -t GCC **-D DYNAMIC_TABLES_FRAMEWORK**
 
 or
 
 >build -a AARCH64 -p Platform\ARM\VExpressPkg\ArmVExpress-FVP-AArch64.dsc
-   -t GCC5 **-D DYNAMIC_TABLES_FRAMEWORK**
+   -t GCC **-D DYNAMIC_TABLES_FRAMEWORK**
 
 # Prerequisites
 
@@ -248,7 +248,7 @@ The instructions to setup the CI environment are in *'edk2\\.pytool\\Readme.md'*
     ```
         stuart_setup -c .pytool/CISettings.py TOOL_CHAIN_TAG=<TOOL_CHAIN_TAG> -a <TARGET_ARCH>
 
-        e.g. stuart_setup -c .pytool/CISettings.py TOOL_CHAIN_TAG=GCC5
+        e.g. stuart_setup -c .pytool/CISettings.py TOOL_CHAIN_TAG=GCC
     ```
 
 5. Initialize & Update Dependencies - only as needed when ext_deps change
@@ -256,7 +256,7 @@ The instructions to setup the CI environment are in *'edk2\\.pytool\\Readme.md'*
     ```
         stuart_update -c .pytool/CISettings.py TOOL_CHAIN_TAG=<TOOL_CHAIN_TAG> -a <TARGET_ARCH>
 
-        e.g. stuart_update -c .pytool/CISettings.py TOOL_CHAIN_TAG=GCC5
+        e.g. stuart_update -c .pytool/CISettings.py TOOL_CHAIN_TAG=GCC
     ```
 
 6. Compile the basetools if necessary - only when basetools C source files change
@@ -270,7 +270,7 @@ The instructions to setup the CI environment are in *'edk2\\.pytool\\Readme.md'*
     ```
         stuart_build-c .pytool/CISettings.py TOOL_CHAIN_TAG=<TOOL_CHAIN_TAG> -a <TARGET_ARCH>
 
-        e.g. stuart_ci_build -c .pytool/CISettings.py TOOL_CHAIN_TAG=GCC5 -p DynamicTablesPkg -a AARCH64 --verbose
+        e.g. stuart_ci_build -c .pytool/CISettings.py TOOL_CHAIN_TAG=GCC -p DynamicTablesPkg -a AARCH64 --verbose
     ```
 
     - use `stuart_build -c .pytool/CISettings.py -h` option to see help on additional options.
diff --git a/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml b/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml
similarity index 95%
rename from EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
rename to EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml
index 8af4c9c778cb..2b5c3ac4dccd 100644
--- a/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
+++ b/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml
@@ -3,7 +3,7 @@
 #
 # Platform: EmulatorPkg
 # OS: Ubuntu
-# Toolchain: GCC5
+# Toolchain: GCC
 #
 # Copyright (c) Microsoft Corporation.
 # Copyright (c) 2020, Intel Corporation. All rights reserved.
@@ -84,7 +84,7 @@ jobs:
     steps:
     - template: ../../../.azurepipelines/templates/platform-build-run-steps.yml
       parameters:
-        tool_chain_tag: GCC5
+        tool_chain_tag: GCC
         build_pkg: $(package)
         build_target: $(Build.Target)
         build_arch: $(Build.Arch)
diff --git a/EmulatorPkg/PlatformCI/ReadMe.md b/EmulatorPkg/PlatformCI/ReadMe.md
index f123bb2a4892..53d032e37ea9 100644
--- a/EmulatorPkg/PlatformCI/ReadMe.md
+++ b/EmulatorPkg/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 EmulatorPkg has only been validated with Windows 10
-with VS2019 and Ubuntu 18.04 with GCC5 toolchain. Four different firmware builds are
+with VS2019 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/EmulatorPkg/Readme.md b/EmulatorPkg/Readme.md
index 0c2eea6a9a02..00e8c7a28499 100644
--- a/EmulatorPkg/Readme.md
+++ b/EmulatorPkg/Readme.md
@@ -29,11 +29,11 @@ https://github.com/tianocore/tianocore.github.io/wiki/EmulatorPkg
 
   * 32bit emulator in Linux:
 
-    `build -p EmulatorPkg\EmulatorPkg.dsc -t GCC5 -a IA32`
+    `build -p EmulatorPkg\EmulatorPkg.dsc -t GCC -a IA32`
 
   * 64bit emulator in Linux:
 
-    `build -p EmulatorPkg\EmulatorPkg.dsc -t GCC5 -a X64`
+    `build -p EmulatorPkg\EmulatorPkg.dsc -t GCC -a X64`
 
 **You can start/run the emulator using the following command:**
   * 32bit emulator in Windows:
@@ -46,11 +46,11 @@ https://github.com/tianocore/tianocore.github.io/wiki/EmulatorPkg
 
   * 32bit emulator in Linux:
 
-    `cd Build/EmulatorIA32/DEBUG_GCC5/IA32/ && ./Host`
+    `cd Build/EmulatorIA32/DEBUG_GCC/IA32/ && ./Host`
 
   * 64bit emulator in Linux:
 
-    `cd Build/EmulatorX64/DEBUG_GCC5/X64/ && ./Host`
+    `cd Build/EmulatorX64/DEBUG_GCC/X64/ && ./Host`
 
 **On posix-like environment with the bash shell you can use EmulatorPkg/build.sh to simplify building and running
 emulator.**
diff --git a/EmulatorPkg/build.sh b/EmulatorPkg/build.sh
index 76c22dfaf8d4..1bb170cd77fd 100755
--- a/EmulatorPkg/build.sh
+++ b/EmulatorPkg/build.sh
@@ -42,7 +42,7 @@ PLATFORMFILE=
 LAST_ARG=
 RUN_EMULATOR=no
 CLEAN_TYPE=none
-TARGET_TOOLS=GCC48
+TARGET_TOOLS=GCC
 NETWORK_SUPPORT=
 BUILD_NEW_SHELL=
 BUILD_FAT=
@@ -87,18 +87,12 @@ case `uname` in
 
     gcc_version=$(gcc -v 2>&1 | tail -1 | awk '{print $3}')
     case $gcc_version in
-      [1-3].*|4.[0-7].*)
-        echo EmulatorPkg requires GCC4.8 or later
+      [1-4].*)
+        echo EmulatorPkg requires GCC 5 or newer
         exit 1
         ;;
-      4.8.*)
-        TARGET_TOOLS=GCC48
-        ;;
-      4.9.*|6.[0-2].*)
-        TARGET_TOOLS=GCC49
-        ;;
       *)
-        TARGET_TOOLS=GCC5
+        TARGET_TOOLS=GCC
         ;;
     esac
     ;;
diff --git a/OvmfPkg/CloudHv/README b/OvmfPkg/CloudHv/README
index 63e28860e058..10c48219b0dd 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 b/OvmfPkg/IntelTdx/README
index 7307ede78faf..4d4e30aad204 100644
--- a/OvmfPkg/IntelTdx/README
+++ b/OvmfPkg/IntelTdx/README
@@ -55,13 +55,13 @@ Build
 - Build the TDVF (Config-A) target:
 `cd /path/to/edk2`
 `source edksetup.sh`
-`build.sh -p OvmfPkg/OvmfPkgX64.dsc -a X64 -t GCC5`
+`build.sh -p OvmfPkg/OvmfPkgX64.dsc -a X64 -t GCC`
 
 - Build the TDVF (Config-B) target:
 `cd /path/to/edk2`
 `set PACKAGES_PATH=/path/to/edk2/OvmfPkg`
 `source edksetup.sh`
-`build.sh -p OvmfPkg/IntelTdx/IntelTdxX64.dsc -a X64 -t GCC5`
+`build.sh -p OvmfPkg/IntelTdx/IntelTdxX64.dsc -a X64 -t GCC`
 
 Usage
 -----
diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml
similarity index 96%
rename from OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
rename to OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml
index ad43f9fad2fd..1d21a31d4bda 100644
--- a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
+++ b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml
@@ -3,7 +3,7 @@
 #
 # Platform: OVMF
 # OS: Ubuntu
-# Toolchain: GCC5
+# Toolchain: GCC
 #
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -194,7 +194,7 @@ jobs:
     steps:
     - template: ../../../.azurepipelines/templates/platform-build-run-steps.yml
       parameters:
-        tool_chain_tag: GCC5
+        tool_chain_tag: GCC
         build_pkg: $(package)
         build_target: $(Build.Target)
         build_arch: $(Build.Arch)
diff --git a/OvmfPkg/PlatformCI/ReadMe.md b/OvmfPkg/PlatformCI/ReadMe.md
index 10fa32ac489f..9d21165a8295 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 VS2019 and Ubuntu 18.04 with GCC5 toolchain. Four different firmware builds are
+with VS2019 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/build.sh b/OvmfPkg/build.sh
index b0334fb76e74..a800f594ba48 100755
--- a/OvmfPkg/build.sh
+++ b/OvmfPkg/build.sh
@@ -77,18 +77,12 @@ 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-4])
+        echo OvmfPkg requires GCC 5 or newer
         exit 1
         ;;
-      4.8.*)
-        TARGET_TOOLS=GCC48
-        ;;
-      4.9.*|6.[0-2].*)
-        TARGET_TOOLS=GCC49
-        ;;
       *)
-        TARGET_TOOLS=GCC5
+        TARGET_TOOLS=GCC
         ;;
     esac
 esac
diff --git a/PrmPkg/Readme.md b/PrmPkg/Readme.md
index 3191c039fd64..b89d276f4bf0 100644
--- a/PrmPkg/Readme.md
+++ b/PrmPkg/Readme.md
@@ -69,10 +69,10 @@ The PrmPkg can be built targetting the IA32/X64 and AArch64 architectures.
 > later in this document and dump the PRMT table in the OS to check if your PRM module is represented as expected.
 
  - AArch64
-    ``build -p PrmPkg/PrmPkg.dsc -a AARCH64 -t GCC5``
+    ``build -p PrmPkg/PrmPkg.dsc -a AARCH64 -t GCC``
 
-   > ***Note***: Only builds with the GCC5 toolchain have been tested.
-   > ***Note***: For builds with the GCC5 toolchain, the PrmModuleExportDescriptor and any other handler entry points symbols, to be listed in the PRMT, must be explicitly preserved by enumerating these in the AARCH64 linker flags. The --require-defined linker flag must be used for each symbol to be preserved.
+   > ***Note***: Only builds with the GCC toolchain have been tested.
+   > ***Note***: For builds with the GCC toolchain, the PrmModuleExportDescriptor and any other handler entry points symbols, to be listed in the PRMT, must be explicitly preserved by enumerating these in the AARCH64 linker flags. The --require-defined linker flag must be used for each symbol to be preserved.
 
 ### PRM Platform GUID
 
diff --git a/ReadMe.rst b/ReadMe.rst
index ed1d4822459b..7e39547a8a1e 100644
--- a/ReadMe.rst
+++ b/ReadMe.rst
@@ -12,7 +12,7 @@ Core CI Build Status
  Host Type & Toolchain        Build Status      Test Status     Code Coverage
 ============================= ================= =============== ===================
 Windows_VS2019_               |WindowsCiBuild|  |WindowsCiTest| |WindowsCiCoverage|
-Ubuntu_GCC5_                  |UbuntuCiBuild|   |UbuntuCiTest|  |UbuntuCiCoverage|
+Ubuntu_GCC_                  |UbuntuCiBuild|   |UbuntuCiTest|  |UbuntuCiCoverage|
 ============================= ================= =============== ===================
 
 `More CI Build information <.pytool/Readme.md>`__
@@ -36,27 +36,27 @@ OvmfPkg_Win_VS2019_           | IA32            |op32d|       |op32r|       |op3
 |                             | IA32 X64 FULL   |op3264fd|    |op3264fr|    |op3264fn|
 ============================= ================= ============= ============= ==============
 
-Ubuntu 18.04 GCC5
+Ubuntu 18.04 GCC
 `````````````````
 
 ============================= ================= ============= ============= ==============
  Toolchain                    CONFIG            DEBUG         RELEASE       NOOPT
 ============================= ================= ============= ============= ==============
-ArmVirtPkg_Ubuntu_GCC5_       | AARCH64         |avAArch64du| |avAArch64ru| |avAArch64nu|
+ArmVirtPkg_Ubuntu_GCC_       | AARCH64         |avAArch64du| |avAArch64ru| |avAArch64nu|
 |                             | ARM             |avArmdu|     |avArmru|     |avArmnu|
-EmulatorPkg_Ubuntu_GCC5_      | IA32            |em32du|      |em32ru|      |em32nu|
+EmulatorPkg_Ubuntu_GCC_      | IA32            |em32du|      |em32ru|      |em32nu|
 |                             | X64             |em64du|      |em64ru|      |em64nu|
 |                             | IA32 FULL       |em32fdu|     |em32fru|     |em32fnu|
 |                             | X64 FULL        |em64fdu|     |em64fru|     |em64fnu|
-OvmfPkg_Ubuntu_GCC5_          | IA32            |op32du|      |op32ru|      |op32nu|
+OvmfPkg_Ubuntu_GCC_          | IA32            |op32du|      |op32ru|      |op32nu|
 |                             | X64             |op64du|      |op64ru|      |op64nu|
 |                             | IA32 X64        |op3264du|    |op3264ru|    |op3264nu|
 |                             | IA32 X64 FULL   |op3264fdu|   |op3264fru|   |op3264fru|
 ============================= ================= ============= ============= ==============
 
-|TCBZ_2668|_ - EmulatorPkg Ubuntu GCC5 Segfaults during execution.
+|TCBZ_2668|_ - EmulatorPkg Ubuntu GCC Segfaults during execution.
 
-|TCBZ_2639|_ - EmulatorPkg Ubuntu GCC5 Segfaults during execution.
+|TCBZ_2639|_ - EmulatorPkg Ubuntu GCC Segfaults during execution.
 
 `More ArmVirtPkg CI Build Information <ArmVirtPkg/PlatformCI/ReadMe.md>`__
 
@@ -294,14 +294,14 @@ use.
 .. |WindowsCiTest| image:: https://img.shields.io/azure-devops/tests/tianocore/edk2-ci/32.svg
 .. |WindowsCiCoverage| image:: https://img.shields.io/badge/coverage-coming_soon-blue
 
-.. _Ubuntu_GCC5: https://dev.azure.com/tianocore/edk2-ci/_build/latest?definitionId=31&branchName=master
+.. _Ubuntu_GCC: https://dev.azure.com/tianocore/edk2-ci/_build/latest?definitionId=31&branchName=master
 .. |UbuntuCiBuild| image:: https://dev.azure.com/tianocore/edk2-ci/_apis/build/status/Ubuntu%20GCC5%20CI?branchName=master
 .. |UbuntuCiTest| image:: https://img.shields.io/azure-devops/tests/tianocore/edk2-ci/31.svg
 .. |UbuntuCiCoverage| image:: https://img.shields.io/badge/coverage-coming_soon-blue
 
 .. ArmVirtPkg
 
-.. _ArmVirtPkg_Ubuntu_GCC5: https://dev.azure.com/tianocore/edk2-ci/_build/latest?definitionId=46&branchName=master
+.. _ArmVirtPkg_Ubuntu_GCC: https://dev.azure.com/tianocore/edk2-ci/_build/latest?definitionId=46&branchName=master
 .. |avAArch64du| image:: https://dev.azure.com/tianocore/edk2-ci/_apis/build/status/PlatformCI_ArmVirtPkg_Ubuntu_GCC5_CI?branchName=master&jobName=Platform_CI&configuration=Platform_CI%20QEMU_AARCH64_DEBUG
 .. |avAArch64ru| image:: https://dev.azure.com/tianocore/edk2-ci/_apis/build/status/PlatformCI_ArmVirtPkg_Ubuntu_GCC5_CI?branchName=master&jobName=Platform_CI&configuration=Platform_CI%20QEMU_AARCH64_RELEASE
 .. |avAArch64nu| image:: https://dev.azure.com/tianocore/edk2-ci/_apis/build/status/PlatformCI_ArmVirtPkg_Ubuntu_GCC5_CI?branchName=master&jobName=Platform_CI&configuration=Platform_CI%20QEMU_AARCH64_NOOPT
@@ -319,7 +319,7 @@ use.
 .. _TCBZ_2639: https://bugzilla.tianocore.org/show_bug.cgi?id=2639
 
 .. _EmulatorPkg_Win_VS2019:  https://dev.azure.com/tianocore/edk2-ci/_build/latest?definitionId=44&branchName=master
-.. _EmulatorPkg_Ubuntu_GCC5: https://dev.azure.com/tianocore/edk2-ci/_build/latest?definitionId=43&branchName=master
+.. _EmulatorPkg_Ubuntu_GCC: https://dev.azure.com/tianocore/edk2-ci/_build/latest?definitionId=43&branchName=master
 
 .. |em32d| image:: https://dev.azure.com/tianocore/edk2-ci/_apis/build/status/PlatformCI_EmulatorPkg_Windows_VS2019_CI?branchName=master&jobName=Platform_CI&configuration=Platform_CI%20EmulatorPkg_IA32_DEBUG
 .. |em32du| image:: https://dev.azure.com/tianocore/edk2-ci/_apis/build/status/PlatformCI_EmulatorPkg_Ubuntu_GCC5_CI?branchName=master&jobName=Platform_CI&configuration=Platform_CI%20EmulatorPkg_IA32_DEBUG
@@ -355,7 +355,7 @@ use.
 .. _TCBZ_2661: https://bugzilla.tianocore.org/show_bug.cgi?id=2661
 
 .. _OvmfPkg_Win_VS2019:  https://dev.azure.com/tianocore/edk2-ci/_build/latest?definitionId=50&branchName=master
-.. _OvmfPkg_Ubuntu_GCC5: https://dev.azure.com/tianocore/edk2-ci/_build/latest?definitionId=48&branchName=master
+.. _OvmfPkg_Ubuntu_GCC: https://dev.azure.com/tianocore/edk2-ci/_build/latest?definitionId=48&branchName=master
 
 .. |op32d| image:: https://dev.azure.com/tianocore/edk2-ci/_apis/build/status/PlatformCI_OvmfPkg_Windows_VS2019_CI?branchName=master&jobName=Platform_CI&configuration=Platform_CI%20OVMF_IA32_DEBUG
 .. |op32du| image:: https://dev.azure.com/tianocore/edk2-ci/_apis/build/status/PlatformCI_OvmfPkg_Ubuntu_GCC5_CI?branchName=master&jobName=Platform_CI&configuration=Platform_CI%20OVMF_IA32_DEBUG
diff --git a/UnitTestFrameworkPkg/ReadMe.md b/UnitTestFrameworkPkg/ReadMe.md
index 7da6a320a7f1..bedf0f7add34 100644
--- a/UnitTestFrameworkPkg/ReadMe.md
+++ b/UnitTestFrameworkPkg/ReadMe.md
@@ -1377,15 +1377,15 @@ After that, the following commands will set up the build and run the host-based
 
 ```bash
 # Setup repo for building
-# stuart_setup -c ./.pytool/CISettings.py TOOL_CHAIN_TAG=<GCC5, VS2019, etc.>
+# stuart_setup -c ./.pytool/CISettings.py TOOL_CHAIN_TAG=<GCC, VS2019, etc.>
 stuart_setup -c ./.pytool/CISettings.py TOOL_CHAIN_TAG=VS2019
 
 # Update all binary dependencies
-# stuart_update -c ./.pytool/CISettings.py TOOL_CHAIN_TAG=<GCC5, VS2019, etc.>
+# stuart_update -c ./.pytool/CISettings.py TOOL_CHAIN_TAG=<GCC, VS2019, etc.>
 stuart_update -c ./.pytool/CISettings.py TOOL_CHAIN_TAG=VS2019
 
 # Build and run the tests
-# stuart_ci_build -c ./.pytool/CISettings.py TOOL_CHAIN_TAG=<GCC5, VS2019, etc.> -t NOOPT [-p <Package Name>]
+# stuart_ci_build -c ./.pytool/CISettings.py TOOL_CHAIN_TAG=<GCC, VS2019, etc.> -t NOOPT [-p <Package Name>]
 stuart_ci_build -c ./.pytool/CISettings.py TOOL_CHAIN_TAG=VS2019 -t NOOPT -p MdePkg
 ```
 
@@ -1530,7 +1530,7 @@ lcov linux tool, and parsed using the lcov_cobertura python tool to parse it to
   ```bash
   sudo apt-get install -y lcov
   python -m pip install --upgrade -r ./pip-requirements.txt
-  stuart_ci_build -c .pytool/CISettings.py  -t NOOPT TOOL_CHAIN_TAG=GCC5 -p MdeModulePkg
+  stuart_ci_build -c .pytool/CISettings.py  -t NOOPT TOOL_CHAIN_TAG=GCC -p MdeModulePkg
   Open Build/coverage.xml
   ```
   - How to see code coverage data on IDE Visual Studio Code
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [edk2-devel] [edk2-stable202305 PATCH 1/1] Rename GCC5 toolchain references in docs and scripts to GCC
  2023-05-17 18:58 ` [edk2-stable202305 PATCH 1/1] Rename GCC5 toolchain references in docs and scripts to GCC Rebecca Cran
@ 2023-05-18  0:10   ` Michael D Kinney
  2023-05-18 17:56     ` Rebecca Cran
  0 siblings, 1 reply; 4+ messages in thread
From: Michael D Kinney @ 2023-05-18  0:10 UTC (permalink / raw)
  To: devel@edk2.groups.io, rebecca@bsdio.com, Sean Brogan,
	Michael Kubacki, Gao, Liming, Leif Lindholm, Ard Biesheuvel,
	Sami Mujawar, Gerd Hoffmann, Feng, Bob C, Chen, Christine,
	Alexei Fedorov, Pierre Gondois, Andrew Fish, Ni, Ray, Yao, Jiewen,
	Justen, Jordan L, Boeuf, Sebastien, Desimone, Nathaniel L
  Cc: Kinney, Michael D

Please add Cc lines for all package owners so it matches typical email filters.

I agree this is a good cleanup to use GCC instead of GCC5 consistently.

We should let each package owner provide feedback on if this change should go in before or after the stable tag.

It is not a critical bug fix, so it does not meet the standard criteria for a fix in hard freeze.

Mike

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Rebecca
> Cran
> Sent: Wednesday, May 17, 2023 11:59 AM
> To: devel@edk2.groups.io; Sean Brogan <sean.brogan@microsoft.com>;
> Michael Kubacki <mikuback@linux.microsoft.com>; Gao, Liming
> <gaoliming@byosoft.com.cn>; Leif Lindholm <quic_llindhol@quicinc.com>;
> Ard Biesheuvel <ardb+tianocore@kernel.org>; Sami Mujawar
> <sami.mujawar@arm.com>; Gerd Hoffmann <kraxel@redhat.com>; Feng, Bob
> C <bob.c.feng@intel.com>; Chen, Christine <yuwei.chen@intel.com>; Sami
> Mujawar <Sami.Mujawar@arm.com>; Alexei Fedorov
> <Alexei.Fedorov@arm.com>; Pierre Gondois <pierre.gondois@arm.com>;
> Andrew Fish <afish@apple.com>; Ni, Ray <ray.ni@intel.com>; Yao, Jiewen
> <jiewen.yao@intel.com>; Justen, Jordan L <jordan.l.justen@intel.com>; Boeuf,
> Sebastien <sebastien.boeuf@intel.com>; Desimone, Nathaniel L
> <nathaniel.l.desimone@intel.com>
> Cc: Rebecca Cran <rebecca@bsdio.com>
> Subject: [edk2-devel] [edk2-stable202305 PATCH 1/1] Rename GCC5 toolchain
> references in docs and scripts to GCC
> 
> The GCC5 toolchain has been deprecated, and GCC should be used going
> forward.
> 
> Update references to GCC5 in filenames, scripts and documentation.
> 
> Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
> ---
>  .azurepipelines/{Ubuntu-GCC5.yml => Ubuntu-GCC.yml}                        |  4 ++-
> -
>  .azurepipelines/templates/platform-build-run-steps.yml                     |  2 +-
>  .azurepipelines/templates/pr-gate-build-job.yml                            |  2 +-
>  .azurepipelines/templates/pr-gate-steps.yml                                |  2 +-
>  ArmPlatformPkg/Scripts/Makefile                                            |  2 +-
>  ArmVirtPkg/PlatformCI/.azurepipelines/{Ubuntu-GCC5.yml => Ubuntu-
> GCC.yml}  |  4 ++--
>  ArmVirtPkg/PlatformCI/ReadMe.md                                            |  2 +-
>  BaseTools/Edk2ToolsBuild.py                                                |  2 +-
>  BaseTools/Plugin/HostBasedUnitTestRunner/HostBasedUnitTestRunner.py
> |  2 +-
>  DynamicTablesPkg/Readme.md                                                 | 10 ++++-----
>  EmulatorPkg/PlatformCI/.azurepipelines/{Ubuntu-GCC5.yml => Ubuntu-
> GCC.yml} |  4 ++--
>  EmulatorPkg/PlatformCI/ReadMe.md                                           |  2 +-
>  EmulatorPkg/Readme.md                                                      |  8 +++----
>  EmulatorPkg/build.sh                                                       | 14 ++++---------
>  OvmfPkg/CloudHv/README                                                     |  2 +-
>  OvmfPkg/IntelTdx/README                                                    |  4 ++--
>  OvmfPkg/PlatformCI/.azurepipelines/{Ubuntu-GCC5.yml => Ubuntu-GCC.yml}
> |  4 ++--
>  OvmfPkg/PlatformCI/ReadMe.md                                               |  2 +-
>  OvmfPkg/build.sh                                                           | 12 +++--------
>  PrmPkg/Readme.md                                                           |  6 +++---
>  ReadMe.rst                                                                 | 22 ++++++++++----------
>  UnitTestFrameworkPkg/ReadMe.md                                             |  8 +++----
>  22 files changed, 54 insertions(+), 66 deletions(-)
> 
> diff --git a/.azurepipelines/Ubuntu-GCC5.yml b/.azurepipelines/Ubuntu-
> GCC.yml
> similarity index 84%
> rename from .azurepipelines/Ubuntu-GCC5.yml
> rename to .azurepipelines/Ubuntu-GCC.yml
> index b9a3b851cf3c..c6ddcc7f9af6 100644
> --- a/.azurepipelines/Ubuntu-GCC5.yml
> +++ b/.azurepipelines/Ubuntu-GCC.yml
> @@ -1,5 +1,5 @@
>  ## @file
> -# Azure Pipeline build file for a build using ubuntu and GCC5
> +# Azure Pipeline build file for a build using ubuntu and GCC
>  #
>  # Copyright (c) Microsoft Corporation.
>  # Copyright (c) 2020, Hewlett Packard Enterprise Development LP. All rights
> reserved.<BR>
> @@ -19,7 +19,7 @@ variables:
>  jobs:
>  - template: templates/pr-gate-build-job.yml
>    parameters:
> -    tool_chain_tag: 'GCC5'
> +    tool_chain_tag: 'GCC'
>      vm_image: 'ubuntu-22.04'
>      container: ${{ variables.default_linux_image }}
>      arch_list: "IA32,X64,ARM,AARCH64,RISCV64,LOONGARCH64"
> diff --git a/.azurepipelines/templates/platform-build-run-steps.yml
> b/.azurepipelines/templates/platform-build-run-steps.yml
> index 8be46cda0e2d..3d7515d76a8e 100644
> --- a/.azurepipelines/templates/platform-build-run-steps.yml
> +++ b/.azurepipelines/templates/platform-build-run-steps.yml
> @@ -43,7 +43,7 @@ steps:
>      echo "##vso[task.prependpath]${HOME}/.local/bin"
>      echo "new PATH=${PATH}"
>    displayName: Set PATH
> -  condition: eq('${{ parameters.tool_chain_tag }}', 'GCC5')
> +  condition: eq('${{ parameters.tool_chain_tag }}', 'GCC')
> 
>  - checkout: self
>    clean: true
> diff --git a/.azurepipelines/templates/pr-gate-build-job.yml
> b/.azurepipelines/templates/pr-gate-build-job.yml
> index 689e2f0987ed..a52ef638ea79 100644
> --- a/.azurepipelines/templates/pr-gate-build-job.yml
> +++ b/.azurepipelines/templates/pr-gate-build-job.yml
> @@ -24,7 +24,7 @@ jobs:
>    #Use matrix to speed up the build process
>    strategy:
>      matrix:
> -      ${{ if eq(parameters.tool_chain_tag, 'GCC5') }}:
> +      ${{ if eq(parameters.tool_chain_tag, 'GCC') }}:
>          TARGET_GCC_ONLY:
>            Build.Pkgs: 'EmbeddedPkg'
>            Build.Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
> diff --git a/.azurepipelines/templates/pr-gate-steps.yml
> b/.azurepipelines/templates/pr-gate-steps.yml
> index 78b2b2c8d934..2ca9e134be39 100644
> --- a/.azurepipelines/templates/pr-gate-steps.yml
> +++ b/.azurepipelines/templates/pr-gate-steps.yml
> @@ -20,7 +20,7 @@ steps:
>      echo "##vso[task.prependpath]${HOME}/.local/bin"
>      echo "new PATH=${PATH}"
>    displayName: Set PATH
> -  condition: eq('${{ parameters.tool_chain_tag }}', 'GCC5')
> +  condition: eq('${{ parameters.tool_chain_tag }}', 'GCC')
> 
>  - checkout: self
>    clean: true
> diff --git a/ArmPlatformPkg/Scripts/Makefile
> b/ArmPlatformPkg/Scripts/Makefile
> index baa618456413..686b68614f03 100644
> --- a/ArmPlatformPkg/Scripts/Makefile
> +++ b/ArmPlatformPkg/Scripts/Makefile
> @@ -5,7 +5,7 @@
>  #
>  #*/
> 
> -EDK2_TOOLCHAIN ?= GCC5
> +EDK2_TOOLCHAIN ?= GCC
>  EDK2_ARCH ?= ARM
>  EDK2_BUILD ?= DEBUG
> 
> diff --git a/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
> b/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml
> similarity index 96%
> rename from ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
> rename to ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml
> index d1772a65fc3a..dfc5c119096f 100644
> --- a/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
> +++ b/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml
> @@ -3,7 +3,7 @@
>  #
>  # Platform: ArmVirtQemu
>  # OS: Ubuntu
> -# Toolchain: GCC5
> +# Toolchain: GCC
>  #
>  # Copyright (c) Microsoft Corporation.
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
> @@ -151,7 +151,7 @@ jobs:
>      steps:
>      - template: ../../../.azurepipelines/templates/platform-build-run-steps.yml
>        parameters:
> -        tool_chain_tag: GCC5
> +        tool_chain_tag: GCC
>          build_pkg: $(package)
>          build_target: $(Build.Target)
>          build_arch: $(Build.Arch)
> diff --git a/ArmVirtPkg/PlatformCI/ReadMe.md
> b/ArmVirtPkg/PlatformCI/ReadMe.md
> index ee8d8cd61e73..bf9f7f5cac7e 100644
> --- a/ArmVirtPkg/PlatformCI/ReadMe.md
> +++ b/ArmVirtPkg/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 ArmVirtPkg has only been validated
> with Ubuntu
> -18.04 and the GCC5 toolchain. Two different firmware builds are supported
> and are
> +18.04 and the GCC toolchain. Two different firmware builds are supported
> and are
>  described below.
> 
>  | Configuration name      | Architecture       | DSC File         |Additional Flags |
> diff --git a/BaseTools/Edk2ToolsBuild.py b/BaseTools/Edk2ToolsBuild.py
> index f862468ce275..9053a4bcaba7 100644
> --- a/BaseTools/Edk2ToolsBuild.py
> +++ b/BaseTools/Edk2ToolsBuild.py
> @@ -1,7 +1,7 @@
>  # @file Edk2ToolsBuild.py
>  # Invocable class that builds the basetool c files.
>  #
> -# Supports VS2017, VS2019, and GCC5
> +# Supports VS2017, VS2019, and GCC
>  ##
>  # Copyright (c) Microsoft Corporation
>  #
> diff --git
> a/BaseTools/Plugin/HostBasedUnitTestRunner/HostBasedUnitTestRunner.py
> b/BaseTools/Plugin/HostBasedUnitTestRunner/HostBasedUnitTestRunner.py
> index 2e5c462cd2fb..583e977295aa 100644
> ---
> a/BaseTools/Plugin/HostBasedUnitTestRunner/HostBasedUnitTestRunner.py
> +++
> b/BaseTools/Plugin/HostBasedUnitTestRunner/HostBasedUnitTestRunner.py
> @@ -129,7 +129,7 @@ class HostBasedUnitTestRunner(IUefiBuildPlugin):
>                                          failure_count += 1
> 
>              if thebuilder.env.GetValue("CODE_COVERAGE") != "FALSE":
> -                if thebuilder.env.GetValue("TOOL_CHAIN_TAG") == "GCC5":
> +                if thebuilder.env.GetValue("TOOL_CHAIN_TAG") == "GCC":
>                      ret = self.gen_code_coverage_gcc(thebuilder)
>                      if ret != 0:
>                          failure_count += 1
> diff --git a/DynamicTablesPkg/Readme.md b/DynamicTablesPkg/Readme.md
> index 6b0a6c7a4001..0dc4d6beacdd 100644
> --- a/DynamicTablesPkg/Readme.md
> +++ b/DynamicTablesPkg/Readme.md
> @@ -194,12 +194,12 @@ parameter to the edk2 build system.
>  Example:
> 
>  >build -a AARCH64 -p Platform\ARM\JunoPkg\ArmJuno.dsc
> -   -t GCC5 **-D DYNAMIC_TABLES_FRAMEWORK**
> +   -t GCC **-D DYNAMIC_TABLES_FRAMEWORK**
> 
>  or
> 
>  >build -a AARCH64 -p Platform\ARM\VExpressPkg\ArmVExpress-FVP-
> AArch64.dsc
> -   -t GCC5 **-D DYNAMIC_TABLES_FRAMEWORK**
> +   -t GCC **-D DYNAMIC_TABLES_FRAMEWORK**
> 
>  # Prerequisites
> 
> @@ -248,7 +248,7 @@ The instructions to setup the CI environment are in
> *'edk2\\.pytool\\Readme.md'*
>      ```
>          stuart_setup -c .pytool/CISettings.py
> TOOL_CHAIN_TAG=<TOOL_CHAIN_TAG> -a <TARGET_ARCH>
> 
> -        e.g. stuart_setup -c .pytool/CISettings.py TOOL_CHAIN_TAG=GCC5
> +        e.g. stuart_setup -c .pytool/CISettings.py TOOL_CHAIN_TAG=GCC
>      ```
> 
>  5. Initialize & Update Dependencies - only as needed when ext_deps change
> @@ -256,7 +256,7 @@ The instructions to setup the CI environment are in
> *'edk2\\.pytool\\Readme.md'*
>      ```
>          stuart_update -c .pytool/CISettings.py
> TOOL_CHAIN_TAG=<TOOL_CHAIN_TAG> -a <TARGET_ARCH>
> 
> -        e.g. stuart_update -c .pytool/CISettings.py TOOL_CHAIN_TAG=GCC5
> +        e.g. stuart_update -c .pytool/CISettings.py TOOL_CHAIN_TAG=GCC
>      ```
> 
>  6. Compile the basetools if necessary - only when basetools C source files
> change
> @@ -270,7 +270,7 @@ The instructions to setup the CI environment are in
> *'edk2\\.pytool\\Readme.md'*
>      ```
>          stuart_build-c .pytool/CISettings.py
> TOOL_CHAIN_TAG=<TOOL_CHAIN_TAG> -a <TARGET_ARCH>
> 
> -        e.g. stuart_ci_build -c .pytool/CISettings.py TOOL_CHAIN_TAG=GCC5 -p
> DynamicTablesPkg -a AARCH64 --verbose
> +        e.g. stuart_ci_build -c .pytool/CISettings.py TOOL_CHAIN_TAG=GCC -p
> DynamicTablesPkg -a AARCH64 --verbose
>      ```
> 
>      - use `stuart_build -c .pytool/CISettings.py -h` option to see help on
> additional options.
> diff --git a/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
> b/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml
> similarity index 95%
> rename from EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
> rename to EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml
> index 8af4c9c778cb..2b5c3ac4dccd 100644
> --- a/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
> +++ b/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml
> @@ -3,7 +3,7 @@
>  #
>  # Platform: EmulatorPkg
>  # OS: Ubuntu
> -# Toolchain: GCC5
> +# Toolchain: GCC
>  #
>  # Copyright (c) Microsoft Corporation.
>  # Copyright (c) 2020, Intel Corporation. All rights reserved.
> @@ -84,7 +84,7 @@ jobs:
>      steps:
>      - template: ../../../.azurepipelines/templates/platform-build-run-steps.yml
>        parameters:
> -        tool_chain_tag: GCC5
> +        tool_chain_tag: GCC
>          build_pkg: $(package)
>          build_target: $(Build.Target)
>          build_arch: $(Build.Arch)
> diff --git a/EmulatorPkg/PlatformCI/ReadMe.md
> b/EmulatorPkg/PlatformCI/ReadMe.md
> index f123bb2a4892..53d032e37ea9 100644
> --- a/EmulatorPkg/PlatformCI/ReadMe.md
> +++ b/EmulatorPkg/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 EmulatorPkg has only been validated
> with Windows 10
> -with VS2019 and Ubuntu 18.04 with GCC5 toolchain. Four different firmware
> builds are
> +with VS2019 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/EmulatorPkg/Readme.md b/EmulatorPkg/Readme.md
> index 0c2eea6a9a02..00e8c7a28499 100644
> --- a/EmulatorPkg/Readme.md
> +++ b/EmulatorPkg/Readme.md
> @@ -29,11 +29,11 @@
> https://github.com/tianocore/tianocore.github.io/wiki/EmulatorPkg
> 
>    * 32bit emulator in Linux:
> 
> -    `build -p EmulatorPkg\EmulatorPkg.dsc -t GCC5 -a IA32`
> +    `build -p EmulatorPkg\EmulatorPkg.dsc -t GCC -a IA32`
> 
>    * 64bit emulator in Linux:
> 
> -    `build -p EmulatorPkg\EmulatorPkg.dsc -t GCC5 -a X64`
> +    `build -p EmulatorPkg\EmulatorPkg.dsc -t GCC -a X64`
> 
>  **You can start/run the emulator using the following command:**
>    * 32bit emulator in Windows:
> @@ -46,11 +46,11 @@
> https://github.com/tianocore/tianocore.github.io/wiki/EmulatorPkg
> 
>    * 32bit emulator in Linux:
> 
> -    `cd Build/EmulatorIA32/DEBUG_GCC5/IA32/ && ./Host`
> +    `cd Build/EmulatorIA32/DEBUG_GCC/IA32/ && ./Host`
> 
>    * 64bit emulator in Linux:
> 
> -    `cd Build/EmulatorX64/DEBUG_GCC5/X64/ && ./Host`
> +    `cd Build/EmulatorX64/DEBUG_GCC/X64/ && ./Host`
> 
>  **On posix-like environment with the bash shell you can use
> EmulatorPkg/build.sh to simplify building and running
>  emulator.**
> diff --git a/EmulatorPkg/build.sh b/EmulatorPkg/build.sh
> index 76c22dfaf8d4..1bb170cd77fd 100755
> --- a/EmulatorPkg/build.sh
> +++ b/EmulatorPkg/build.sh
> @@ -42,7 +42,7 @@ PLATFORMFILE=
>  LAST_ARG=
>  RUN_EMULATOR=no
>  CLEAN_TYPE=none
> -TARGET_TOOLS=GCC48
> +TARGET_TOOLS=GCC
>  NETWORK_SUPPORT=
>  BUILD_NEW_SHELL=
>  BUILD_FAT=
> @@ -87,18 +87,12 @@ case `uname` in
> 
>      gcc_version=$(gcc -v 2>&1 | tail -1 | awk '{print $3}')
>      case $gcc_version in
> -      [1-3].*|4.[0-7].*)
> -        echo EmulatorPkg requires GCC4.8 or later
> +      [1-4].*)
> +        echo EmulatorPkg requires GCC 5 or newer
>          exit 1
>          ;;
> -      4.8.*)
> -        TARGET_TOOLS=GCC48
> -        ;;
> -      4.9.*|6.[0-2].*)
> -        TARGET_TOOLS=GCC49
> -        ;;
>        *)
> -        TARGET_TOOLS=GCC5
> +        TARGET_TOOLS=GCC
>          ;;
>      esac
>      ;;
> diff --git a/OvmfPkg/CloudHv/README b/OvmfPkg/CloudHv/README
> index 63e28860e058..10c48219b0dd 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 b/OvmfPkg/IntelTdx/README
> index 7307ede78faf..4d4e30aad204 100644
> --- a/OvmfPkg/IntelTdx/README
> +++ b/OvmfPkg/IntelTdx/README
> @@ -55,13 +55,13 @@ Build
>  - Build the TDVF (Config-A) target:
>  `cd /path/to/edk2`
>  `source edksetup.sh`
> -`build.sh -p OvmfPkg/OvmfPkgX64.dsc -a X64 -t GCC5`
> +`build.sh -p OvmfPkg/OvmfPkgX64.dsc -a X64 -t GCC`
> 
>  - Build the TDVF (Config-B) target:
>  `cd /path/to/edk2`
>  `set PACKAGES_PATH=/path/to/edk2/OvmfPkg`
>  `source edksetup.sh`
> -`build.sh -p OvmfPkg/IntelTdx/IntelTdxX64.dsc -a X64 -t GCC5`
> +`build.sh -p OvmfPkg/IntelTdx/IntelTdxX64.dsc -a X64 -t GCC`
> 
>  Usage
>  -----
> diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
> b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml
> similarity index 96%
> rename from OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
> rename to OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml
> index ad43f9fad2fd..1d21a31d4bda 100644
> --- a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
> +++ b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml
> @@ -3,7 +3,7 @@
>  #
>  # Platform: OVMF
>  # OS: Ubuntu
> -# Toolchain: GCC5
> +# Toolchain: GCC
>  #
>  # Copyright (c) Microsoft Corporation.
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
> @@ -194,7 +194,7 @@ jobs:
>      steps:
>      - template: ../../../.azurepipelines/templates/platform-build-run-steps.yml
>        parameters:
> -        tool_chain_tag: GCC5
> +        tool_chain_tag: GCC
>          build_pkg: $(package)
>          build_target: $(Build.Target)
>          build_arch: $(Build.Arch)
> diff --git a/OvmfPkg/PlatformCI/ReadMe.md
> b/OvmfPkg/PlatformCI/ReadMe.md
> index 10fa32ac489f..9d21165a8295 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 VS2019 and Ubuntu 18.04 with GCC5 toolchain. Four different firmware
> builds are
> +with VS2019 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/build.sh b/OvmfPkg/build.sh
> index b0334fb76e74..a800f594ba48 100755
> --- a/OvmfPkg/build.sh
> +++ b/OvmfPkg/build.sh
> @@ -77,18 +77,12 @@ 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-4])
> +        echo OvmfPkg requires GCC 5 or newer
>          exit 1
>          ;;
> -      4.8.*)
> -        TARGET_TOOLS=GCC48
> -        ;;
> -      4.9.*|6.[0-2].*)
> -        TARGET_TOOLS=GCC49
> -        ;;
>        *)
> -        TARGET_TOOLS=GCC5
> +        TARGET_TOOLS=GCC
>          ;;
>      esac
>  esac
> diff --git a/PrmPkg/Readme.md b/PrmPkg/Readme.md
> index 3191c039fd64..b89d276f4bf0 100644
> --- a/PrmPkg/Readme.md
> +++ b/PrmPkg/Readme.md
> @@ -69,10 +69,10 @@ The PrmPkg can be built targetting the IA32/X64 and
> AArch64 architectures.
>  > later in this document and dump the PRMT table in the OS to check if your
> PRM module is represented as expected.
> 
>   - AArch64
> -    ``build -p PrmPkg/PrmPkg.dsc -a AARCH64 -t GCC5``
> +    ``build -p PrmPkg/PrmPkg.dsc -a AARCH64 -t GCC``
> 
> -   > ***Note***: Only builds with the GCC5 toolchain have been tested.
> -   > ***Note***: For builds with the GCC5 toolchain, the
> PrmModuleExportDescriptor and any other handler entry points symbols, to
> be listed in the PRMT, must be explicitly preserved by enumerating these in
> the AARCH64 linker flags. The --require-defined linker flag must be used for
> each symbol to be preserved.
> +   > ***Note***: Only builds with the GCC toolchain have been tested.
> +   > ***Note***: For builds with the GCC toolchain, the
> PrmModuleExportDescriptor and any other handler entry points symbols, to
> be listed in the PRMT, must be explicitly preserved by enumerating these in
> the AARCH64 linker flags. The --require-defined linker flag must be used for
> each symbol to be preserved.
> 
>  ### PRM Platform GUID
> 
> diff --git a/ReadMe.rst b/ReadMe.rst
> index ed1d4822459b..7e39547a8a1e 100644
> --- a/ReadMe.rst
> +++ b/ReadMe.rst
> @@ -12,7 +12,7 @@ Core CI Build Status
>   Host Type & Toolchain        Build Status      Test Status     Code Coverage
>  ============================= ================= ===============
> ===================
>  Windows_VS2019_               |WindowsCiBuild|  |WindowsCiTest|
> |WindowsCiCoverage|
> -Ubuntu_GCC5_                  |UbuntuCiBuild|   |UbuntuCiTest|
> |UbuntuCiCoverage|
> +Ubuntu_GCC_                  |UbuntuCiBuild|   |UbuntuCiTest|
> |UbuntuCiCoverage|
>  ============================= ================= ===============
> ===================
> 
>  `More CI Build information <.pytool/Readme.md>`__
> @@ -36,27 +36,27 @@ OvmfPkg_Win_VS2019_           | IA32            |op32d|
> |op32r|       |op3
>  |                             | IA32 X64 FULL   |op3264fd|    |op3264fr|    |op3264fn|
>  ============================= ================= =============
> ============= ==============
> 
> -Ubuntu 18.04 GCC5
> +Ubuntu 18.04 GCC
>  `````````````````
> 
>  ============================= ================= =============
> ============= ==============
>   Toolchain                    CONFIG            DEBUG         RELEASE       NOOPT
>  ============================= ================= =============
> ============= ==============
> -ArmVirtPkg_Ubuntu_GCC5_       | AARCH64         |avAArch64du|
> |avAArch64ru| |avAArch64nu|
> +ArmVirtPkg_Ubuntu_GCC_       | AARCH64         |avAArch64du|
> |avAArch64ru| |avAArch64nu|
>  |                             | ARM             |avArmdu|     |avArmru|     |avArmnu|
> -EmulatorPkg_Ubuntu_GCC5_      | IA32            |em32du|      |em32ru|
> |em32nu|
> +EmulatorPkg_Ubuntu_GCC_      | IA32            |em32du|      |em32ru|
> |em32nu|
>  |                             | X64             |em64du|      |em64ru|      |em64nu|
>  |                             | IA32 FULL       |em32fdu|     |em32fru|     |em32fnu|
>  |                             | X64 FULL        |em64fdu|     |em64fru|     |em64fnu|
> -OvmfPkg_Ubuntu_GCC5_          | IA32            |op32du|      |op32ru|
> |op32nu|
> +OvmfPkg_Ubuntu_GCC_          | IA32            |op32du|      |op32ru|
> |op32nu|
>  |                             | X64             |op64du|      |op64ru|      |op64nu|
>  |                             | IA32 X64        |op3264du|    |op3264ru|    |op3264nu|
>  |                             | IA32 X64 FULL   |op3264fdu|   |op3264fru|   |op3264fru|
>  ============================= ================= =============
> ============= ==============
> 
> -|TCBZ_2668|_ - EmulatorPkg Ubuntu GCC5 Segfaults during execution.
> +|TCBZ_2668|_ - EmulatorPkg Ubuntu GCC Segfaults during execution.
> 
> -|TCBZ_2639|_ - EmulatorPkg Ubuntu GCC5 Segfaults during execution.
> +|TCBZ_2639|_ - EmulatorPkg Ubuntu GCC Segfaults during execution.
> 
>  `More ArmVirtPkg CI Build Information
> <ArmVirtPkg/PlatformCI/ReadMe.md>`__
> 
> @@ -294,14 +294,14 @@ use.
>  .. |WindowsCiTest| image:: https://img.shields.io/azure-
> devops/tests/tianocore/edk2-ci/32.svg
>  .. |WindowsCiCoverage| image:: https://img.shields.io/badge/coverage-
> coming_soon-blue
> 
> -.. _Ubuntu_GCC5: https://dev.azure.com/tianocore/edk2-
> ci/_build/latest?definitionId=31&branchName=master
> +.. _Ubuntu_GCC: https://dev.azure.com/tianocore/edk2-
> ci/_build/latest?definitionId=31&branchName=master
>  .. |UbuntuCiBuild| image:: https://dev.azure.com/tianocore/edk2-
> ci/_apis/build/status/Ubuntu%20GCC5%20CI?branchName=master
>  .. |UbuntuCiTest| image:: https://img.shields.io/azure-
> devops/tests/tianocore/edk2-ci/31.svg
>  .. |UbuntuCiCoverage| image:: https://img.shields.io/badge/coverage-
> coming_soon-blue
> 
>  .. ArmVirtPkg
> 
> -.. _ArmVirtPkg_Ubuntu_GCC5: https://dev.azure.com/tianocore/edk2-
> ci/_build/latest?definitionId=46&branchName=master
> +.. _ArmVirtPkg_Ubuntu_GCC: https://dev.azure.com/tianocore/edk2-
> ci/_build/latest?definitionId=46&branchName=master
>  .. |avAArch64du| image:: https://dev.azure.com/tianocore/edk2-
> ci/_apis/build/status/PlatformCI_ArmVirtPkg_Ubuntu_GCC5_CI?branchName=
> master&jobName=Platform_CI&configuration=Platform_CI%20QEMU_AARCH6
> 4_DEBUG
>  .. |avAArch64ru| image:: https://dev.azure.com/tianocore/edk2-
> ci/_apis/build/status/PlatformCI_ArmVirtPkg_Ubuntu_GCC5_CI?branchName=
> master&jobName=Platform_CI&configuration=Platform_CI%20QEMU_AARCH6
> 4_RELEASE
>  .. |avAArch64nu| image:: https://dev.azure.com/tianocore/edk2-
> ci/_apis/build/status/PlatformCI_ArmVirtPkg_Ubuntu_GCC5_CI?branchName=
> master&jobName=Platform_CI&configuration=Platform_CI%20QEMU_AARCH6
> 4_NOOPT
> @@ -319,7 +319,7 @@ use.
>  .. _TCBZ_2639: https://bugzilla.tianocore.org/show_bug.cgi?id=2639
> 
>  .. _EmulatorPkg_Win_VS2019:  https://dev.azure.com/tianocore/edk2-
> ci/_build/latest?definitionId=44&branchName=master
> -.. _EmulatorPkg_Ubuntu_GCC5: https://dev.azure.com/tianocore/edk2-
> ci/_build/latest?definitionId=43&branchName=master
> +.. _EmulatorPkg_Ubuntu_GCC: https://dev.azure.com/tianocore/edk2-
> ci/_build/latest?definitionId=43&branchName=master
> 
>  .. |em32d| image:: https://dev.azure.com/tianocore/edk2-
> ci/_apis/build/status/PlatformCI_EmulatorPkg_Windows_VS2019_CI?branchN
> ame=master&jobName=Platform_CI&configuration=Platform_CI%20Emulator
> Pkg_IA32_DEBUG
>  .. |em32du| image:: https://dev.azure.com/tianocore/edk2-
> ci/_apis/build/status/PlatformCI_EmulatorPkg_Ubuntu_GCC5_CI?branchNam
> e=master&jobName=Platform_CI&configuration=Platform_CI%20EmulatorPkg
> _IA32_DEBUG
> @@ -355,7 +355,7 @@ use.
>  .. _TCBZ_2661: https://bugzilla.tianocore.org/show_bug.cgi?id=2661
> 
>  .. _OvmfPkg_Win_VS2019:  https://dev.azure.com/tianocore/edk2-
> ci/_build/latest?definitionId=50&branchName=master
> -.. _OvmfPkg_Ubuntu_GCC5: https://dev.azure.com/tianocore/edk2-
> ci/_build/latest?definitionId=48&branchName=master
> +.. _OvmfPkg_Ubuntu_GCC: https://dev.azure.com/tianocore/edk2-
> ci/_build/latest?definitionId=48&branchName=master
> 
>  .. |op32d| image:: https://dev.azure.com/tianocore/edk2-
> ci/_apis/build/status/PlatformCI_OvmfPkg_Windows_VS2019_CI?branchName
> =master&jobName=Platform_CI&configuration=Platform_CI%20OVMF_IA32_D
> EBUG
>  .. |op32du| image:: https://dev.azure.com/tianocore/edk2-
> ci/_apis/build/status/PlatformCI_OvmfPkg_Ubuntu_GCC5_CI?branchName=m
> aster&jobName=Platform_CI&configuration=Platform_CI%20OVMF_IA32_DEB
> UG
> diff --git a/UnitTestFrameworkPkg/ReadMe.md
> b/UnitTestFrameworkPkg/ReadMe.md
> index 7da6a320a7f1..bedf0f7add34 100644
> --- a/UnitTestFrameworkPkg/ReadMe.md
> +++ b/UnitTestFrameworkPkg/ReadMe.md
> @@ -1377,15 +1377,15 @@ After that, the following commands will set up
> the build and run the host-based
> 
>  ```bash
>  # Setup repo for building
> -# stuart_setup -c ./.pytool/CISettings.py TOOL_CHAIN_TAG=<GCC5, VS2019,
> etc.>
> +# stuart_setup -c ./.pytool/CISettings.py TOOL_CHAIN_TAG=<GCC, VS2019,
> etc.>
>  stuart_setup -c ./.pytool/CISettings.py TOOL_CHAIN_TAG=VS2019
> 
>  # Update all binary dependencies
> -# stuart_update -c ./.pytool/CISettings.py TOOL_CHAIN_TAG=<GCC5, VS2019,
> etc.>
> +# stuart_update -c ./.pytool/CISettings.py TOOL_CHAIN_TAG=<GCC, VS2019,
> etc.>
>  stuart_update -c ./.pytool/CISettings.py TOOL_CHAIN_TAG=VS2019
> 
>  # Build and run the tests
> -# stuart_ci_build -c ./.pytool/CISettings.py TOOL_CHAIN_TAG=<GCC5, VS2019,
> etc.> -t NOOPT [-p <Package Name>]
> +# stuart_ci_build -c ./.pytool/CISettings.py TOOL_CHAIN_TAG=<GCC, VS2019,
> etc.> -t NOOPT [-p <Package Name>]
>  stuart_ci_build -c ./.pytool/CISettings.py TOOL_CHAIN_TAG=VS2019 -t NOOPT
> -p MdePkg
>  ```
> 
> @@ -1530,7 +1530,7 @@ lcov linux tool, and parsed using the lcov_cobertura
> python tool to parse it to
>    ```bash
>    sudo apt-get install -y lcov
>    python -m pip install --upgrade -r ./pip-requirements.txt
> -  stuart_ci_build -c .pytool/CISettings.py  -t NOOPT TOOL_CHAIN_TAG=GCC5 -
> p MdeModulePkg
> +  stuart_ci_build -c .pytool/CISettings.py  -t NOOPT TOOL_CHAIN_TAG=GCC -p
> MdeModulePkg
>    Open Build/coverage.xml
>    ```
>    - How to see code coverage data on IDE Visual Studio Code
> --
> 2.39.2
> 
> 
> 
> 
> 


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [edk2-devel] [edk2-stable202305 PATCH 1/1] Rename GCC5 toolchain references in docs and scripts to GCC
  2023-05-18  0:10   ` [edk2-devel] " Michael D Kinney
@ 2023-05-18 17:56     ` Rebecca Cran
  0 siblings, 0 replies; 4+ messages in thread
From: Rebecca Cran @ 2023-05-18 17:56 UTC (permalink / raw)
  To: Kinney, Michael D, devel@edk2.groups.io, Sean Brogan,
	Michael Kubacki, Gao, Liming, Leif Lindholm, Ard Biesheuvel,
	Sami Mujawar, Gerd Hoffmann, Feng, Bob C, Chen, Christine,
	Alexei Fedorov, Pierre Gondois, Andrew Fish, Ni, Ray, Yao, Jiewen,
	Justen, Jordan L, Boeuf, Sebastien, Desimone, Nathaniel L

I'm not sure I understand. Do you mean adding Cc lines to the commit 
message, or splitting the patch into a series with the package name in 
the subject? Or just moving the package owners from the To: line to Cc:?


-- 
Rebecca


On 5/17/23 18:10, Kinney, Michael D wrote:
> Please add Cc lines for all package owners so it matches typical email filters.
>
> I agree this is a good cleanup to use GCC instead of GCC5 consistently.
>
> We should let each package owner provide feedback on if this change should go in before or after the stable tag.
>
> It is not a critical bug fix, so it does not meet the standard criteria for a fix in hard freeze.
>
> Mike
>
>> -----Original Message-----
>> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Rebecca
>> Cran
>> Sent: Wednesday, May 17, 2023 11:59 AM
>> To: devel@edk2.groups.io; Sean Brogan <sean.brogan@microsoft.com>;
>> Michael Kubacki <mikuback@linux.microsoft.com>; Gao, Liming
>> <gaoliming@byosoft.com.cn>; Leif Lindholm <quic_llindhol@quicinc.com>;
>> Ard Biesheuvel <ardb+tianocore@kernel.org>; Sami Mujawar
>> <sami.mujawar@arm.com>; Gerd Hoffmann <kraxel@redhat.com>; Feng, Bob
>> C <bob.c.feng@intel.com>; Chen, Christine <yuwei.chen@intel.com>; Sami
>> Mujawar <Sami.Mujawar@arm.com>; Alexei Fedorov
>> <Alexei.Fedorov@arm.com>; Pierre Gondois <pierre.gondois@arm.com>;
>> Andrew Fish <afish@apple.com>; Ni, Ray <ray.ni@intel.com>; Yao, Jiewen
>> <jiewen.yao@intel.com>; Justen, Jordan L <jordan.l.justen@intel.com>; Boeuf,
>> Sebastien <sebastien.boeuf@intel.com>; Desimone, Nathaniel L
>> <nathaniel.l.desimone@intel.com>
>> Cc: Rebecca Cran <rebecca@bsdio.com>
>> Subject: [edk2-devel] [edk2-stable202305 PATCH 1/1] Rename GCC5 toolchain
>> references in docs and scripts to GCC
>>
>> The GCC5 toolchain has been deprecated, and GCC should be used going
>> forward.
>>
>> Update references to GCC5 in filenames, scripts and documentation.
>>
>> Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
>> ---
>>   .azurepipelines/{Ubuntu-GCC5.yml => Ubuntu-GCC.yml}                        |  4 ++-
>> -
>>   .azurepipelines/templates/platform-build-run-steps.yml                     |  2 +-
>>   .azurepipelines/templates/pr-gate-build-job.yml                            |  2 +-
>>   .azurepipelines/templates/pr-gate-steps.yml                                |  2 +-
>>   ArmPlatformPkg/Scripts/Makefile                                            |  2 +-
>>   ArmVirtPkg/PlatformCI/.azurepipelines/{Ubuntu-GCC5.yml => Ubuntu-
>> GCC.yml}  |  4 ++--
>>   ArmVirtPkg/PlatformCI/ReadMe.md                                            |  2 +-
>>   BaseTools/Edk2ToolsBuild.py                                                |  2 +-
>>   BaseTools/Plugin/HostBasedUnitTestRunner/HostBasedUnitTestRunner.py
>> |  2 +-
>>   DynamicTablesPkg/Readme.md                                                 | 10 ++++-----
>>   EmulatorPkg/PlatformCI/.azurepipelines/{Ubuntu-GCC5.yml => Ubuntu-
>> GCC.yml} |  4 ++--
>>   EmulatorPkg/PlatformCI/ReadMe.md                                           |  2 +-
>>   EmulatorPkg/Readme.md                                                      |  8 +++----
>>   EmulatorPkg/build.sh                                                       | 14 ++++---------
>>   OvmfPkg/CloudHv/README                                                     |  2 +-
>>   OvmfPkg/IntelTdx/README                                                    |  4 ++--
>>   OvmfPkg/PlatformCI/.azurepipelines/{Ubuntu-GCC5.yml => Ubuntu-GCC.yml}
>> |  4 ++--
>>   OvmfPkg/PlatformCI/ReadMe.md                                               |  2 +-
>>   OvmfPkg/build.sh                                                           | 12 +++--------
>>   PrmPkg/Readme.md                                                           |  6 +++---
>>   ReadMe.rst                                                                 | 22 ++++++++++----------
>>   UnitTestFrameworkPkg/ReadMe.md                                             |  8 +++----
>>   22 files changed, 54 insertions(+), 66 deletions(-)
>>
>> diff --git a/.azurepipelines/Ubuntu-GCC5.yml b/.azurepipelines/Ubuntu-
>> GCC.yml
>> similarity index 84%
>> rename from .azurepipelines/Ubuntu-GCC5.yml
>> rename to .azurepipelines/Ubuntu-GCC.yml
>> index b9a3b851cf3c..c6ddcc7f9af6 100644
>> --- a/.azurepipelines/Ubuntu-GCC5.yml
>> +++ b/.azurepipelines/Ubuntu-GCC.yml
>> @@ -1,5 +1,5 @@
>>   ## @file
>> -# Azure Pipeline build file for a build using ubuntu and GCC5
>> +# Azure Pipeline build file for a build using ubuntu and GCC
>>   #
>>   # Copyright (c) Microsoft Corporation.
>>   # Copyright (c) 2020, Hewlett Packard Enterprise Development LP. All rights
>> reserved.<BR>
>> @@ -19,7 +19,7 @@ variables:
>>   jobs:
>>   - template: templates/pr-gate-build-job.yml
>>     parameters:
>> -    tool_chain_tag: 'GCC5'
>> +    tool_chain_tag: 'GCC'
>>       vm_image: 'ubuntu-22.04'
>>       container: ${{ variables.default_linux_image }}
>>       arch_list: "IA32,X64,ARM,AARCH64,RISCV64,LOONGARCH64"
>> diff --git a/.azurepipelines/templates/platform-build-run-steps.yml
>> b/.azurepipelines/templates/platform-build-run-steps.yml
>> index 8be46cda0e2d..3d7515d76a8e 100644
>> --- a/.azurepipelines/templates/platform-build-run-steps.yml
>> +++ b/.azurepipelines/templates/platform-build-run-steps.yml
>> @@ -43,7 +43,7 @@ steps:
>>       echo "##vso[task.prependpath]${HOME}/.local/bin"
>>       echo "new PATH=${PATH}"
>>     displayName: Set PATH
>> -  condition: eq('${{ parameters.tool_chain_tag }}', 'GCC5')
>> +  condition: eq('${{ parameters.tool_chain_tag }}', 'GCC')
>>
>>   - checkout: self
>>     clean: true
>> diff --git a/.azurepipelines/templates/pr-gate-build-job.yml
>> b/.azurepipelines/templates/pr-gate-build-job.yml
>> index 689e2f0987ed..a52ef638ea79 100644
>> --- a/.azurepipelines/templates/pr-gate-build-job.yml
>> +++ b/.azurepipelines/templates/pr-gate-build-job.yml
>> @@ -24,7 +24,7 @@ jobs:
>>     #Use matrix to speed up the build process
>>     strategy:
>>       matrix:
>> -      ${{ if eq(parameters.tool_chain_tag, 'GCC5') }}:
>> +      ${{ if eq(parameters.tool_chain_tag, 'GCC') }}:
>>           TARGET_GCC_ONLY:
>>             Build.Pkgs: 'EmbeddedPkg'
>>             Build.Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
>> diff --git a/.azurepipelines/templates/pr-gate-steps.yml
>> b/.azurepipelines/templates/pr-gate-steps.yml
>> index 78b2b2c8d934..2ca9e134be39 100644
>> --- a/.azurepipelines/templates/pr-gate-steps.yml
>> +++ b/.azurepipelines/templates/pr-gate-steps.yml
>> @@ -20,7 +20,7 @@ steps:
>>       echo "##vso[task.prependpath]${HOME}/.local/bin"
>>       echo "new PATH=${PATH}"
>>     displayName: Set PATH
>> -  condition: eq('${{ parameters.tool_chain_tag }}', 'GCC5')
>> +  condition: eq('${{ parameters.tool_chain_tag }}', 'GCC')
>>
>>   - checkout: self
>>     clean: true
>> diff --git a/ArmPlatformPkg/Scripts/Makefile
>> b/ArmPlatformPkg/Scripts/Makefile
>> index baa618456413..686b68614f03 100644
>> --- a/ArmPlatformPkg/Scripts/Makefile
>> +++ b/ArmPlatformPkg/Scripts/Makefile
>> @@ -5,7 +5,7 @@
>>   #
>>   #*/
>>
>> -EDK2_TOOLCHAIN ?= GCC5
>> +EDK2_TOOLCHAIN ?= GCC
>>   EDK2_ARCH ?= ARM
>>   EDK2_BUILD ?= DEBUG
>>
>> diff --git a/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
>> b/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml
>> similarity index 96%
>> rename from ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
>> rename to ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml
>> index d1772a65fc3a..dfc5c119096f 100644
>> --- a/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
>> +++ b/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml
>> @@ -3,7 +3,7 @@
>>   #
>>   # Platform: ArmVirtQemu
>>   # OS: Ubuntu
>> -# Toolchain: GCC5
>> +# Toolchain: GCC
>>   #
>>   # Copyright (c) Microsoft Corporation.
>>   # SPDX-License-Identifier: BSD-2-Clause-Patent
>> @@ -151,7 +151,7 @@ jobs:
>>       steps:
>>       - template: ../../../.azurepipelines/templates/platform-build-run-steps.yml
>>         parameters:
>> -        tool_chain_tag: GCC5
>> +        tool_chain_tag: GCC
>>           build_pkg: $(package)
>>           build_target: $(Build.Target)
>>           build_arch: $(Build.Arch)
>> diff --git a/ArmVirtPkg/PlatformCI/ReadMe.md
>> b/ArmVirtPkg/PlatformCI/ReadMe.md
>> index ee8d8cd61e73..bf9f7f5cac7e 100644
>> --- a/ArmVirtPkg/PlatformCI/ReadMe.md
>> +++ b/ArmVirtPkg/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 ArmVirtPkg has only been validated
>> with Ubuntu
>> -18.04 and the GCC5 toolchain. Two different firmware builds are supported
>> and are
>> +18.04 and the GCC toolchain. Two different firmware builds are supported
>> and are
>>   described below.
>>
>>   | Configuration name      | Architecture       | DSC File         |Additional Flags |
>> diff --git a/BaseTools/Edk2ToolsBuild.py b/BaseTools/Edk2ToolsBuild.py
>> index f862468ce275..9053a4bcaba7 100644
>> --- a/BaseTools/Edk2ToolsBuild.py
>> +++ b/BaseTools/Edk2ToolsBuild.py
>> @@ -1,7 +1,7 @@
>>   # @file Edk2ToolsBuild.py
>>   # Invocable class that builds the basetool c files.
>>   #
>> -# Supports VS2017, VS2019, and GCC5
>> +# Supports VS2017, VS2019, and GCC
>>   ##
>>   # Copyright (c) Microsoft Corporation
>>   #
>> diff --git
>> a/BaseTools/Plugin/HostBasedUnitTestRunner/HostBasedUnitTestRunner.py
>> b/BaseTools/Plugin/HostBasedUnitTestRunner/HostBasedUnitTestRunner.py
>> index 2e5c462cd2fb..583e977295aa 100644
>> ---
>> a/BaseTools/Plugin/HostBasedUnitTestRunner/HostBasedUnitTestRunner.py
>> +++
>> b/BaseTools/Plugin/HostBasedUnitTestRunner/HostBasedUnitTestRunner.py
>> @@ -129,7 +129,7 @@ class HostBasedUnitTestRunner(IUefiBuildPlugin):
>>                                           failure_count += 1
>>
>>               if thebuilder.env.GetValue("CODE_COVERAGE") != "FALSE":
>> -                if thebuilder.env.GetValue("TOOL_CHAIN_TAG") == "GCC5":
>> +                if thebuilder.env.GetValue("TOOL_CHAIN_TAG") == "GCC":
>>                       ret = self.gen_code_coverage_gcc(thebuilder)
>>                       if ret != 0:
>>                           failure_count += 1
>> diff --git a/DynamicTablesPkg/Readme.md b/DynamicTablesPkg/Readme.md
>> index 6b0a6c7a4001..0dc4d6beacdd 100644
>> --- a/DynamicTablesPkg/Readme.md
>> +++ b/DynamicTablesPkg/Readme.md
>> @@ -194,12 +194,12 @@ parameter to the edk2 build system.
>>   Example:
>>
>>   >build -a AARCH64 -p Platform\ARM\JunoPkg\ArmJuno.dsc
>> -   -t GCC5 **-D DYNAMIC_TABLES_FRAMEWORK**
>> +   -t GCC **-D DYNAMIC_TABLES_FRAMEWORK**
>>
>>   or
>>
>>   >build -a AARCH64 -p Platform\ARM\VExpressPkg\ArmVExpress-FVP-
>> AArch64.dsc
>> -   -t GCC5 **-D DYNAMIC_TABLES_FRAMEWORK**
>> +   -t GCC **-D DYNAMIC_TABLES_FRAMEWORK**
>>
>>   # Prerequisites
>>
>> @@ -248,7 +248,7 @@ The instructions to setup the CI environment are in
>> *'edk2\\.pytool\\Readme.md'*
>>       ```
>>           stuart_setup -c .pytool/CISettings.py
>> TOOL_CHAIN_TAG=<TOOL_CHAIN_TAG> -a <TARGET_ARCH>
>>
>> -        e.g. stuart_setup -c .pytool/CISettings.py TOOL_CHAIN_TAG=GCC5
>> +        e.g. stuart_setup -c .pytool/CISettings.py TOOL_CHAIN_TAG=GCC
>>       ```
>>
>>   5. Initialize & Update Dependencies - only as needed when ext_deps change
>> @@ -256,7 +256,7 @@ The instructions to setup the CI environment are in
>> *'edk2\\.pytool\\Readme.md'*
>>       ```
>>           stuart_update -c .pytool/CISettings.py
>> TOOL_CHAIN_TAG=<TOOL_CHAIN_TAG> -a <TARGET_ARCH>
>>
>> -        e.g. stuart_update -c .pytool/CISettings.py TOOL_CHAIN_TAG=GCC5
>> +        e.g. stuart_update -c .pytool/CISettings.py TOOL_CHAIN_TAG=GCC
>>       ```
>>
>>   6. Compile the basetools if necessary - only when basetools C source files
>> change
>> @@ -270,7 +270,7 @@ The instructions to setup the CI environment are in
>> *'edk2\\.pytool\\Readme.md'*
>>       ```
>>           stuart_build-c .pytool/CISettings.py
>> TOOL_CHAIN_TAG=<TOOL_CHAIN_TAG> -a <TARGET_ARCH>
>>
>> -        e.g. stuart_ci_build -c .pytool/CISettings.py TOOL_CHAIN_TAG=GCC5 -p
>> DynamicTablesPkg -a AARCH64 --verbose
>> +        e.g. stuart_ci_build -c .pytool/CISettings.py TOOL_CHAIN_TAG=GCC -p
>> DynamicTablesPkg -a AARCH64 --verbose
>>       ```
>>
>>       - use `stuart_build -c .pytool/CISettings.py -h` option to see help on
>> additional options.
>> diff --git a/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
>> b/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml
>> similarity index 95%
>> rename from EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
>> rename to EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml
>> index 8af4c9c778cb..2b5c3ac4dccd 100644
>> --- a/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
>> +++ b/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml
>> @@ -3,7 +3,7 @@
>>   #
>>   # Platform: EmulatorPkg
>>   # OS: Ubuntu
>> -# Toolchain: GCC5
>> +# Toolchain: GCC
>>   #
>>   # Copyright (c) Microsoft Corporation.
>>   # Copyright (c) 2020, Intel Corporation. All rights reserved.
>> @@ -84,7 +84,7 @@ jobs:
>>       steps:
>>       - template: ../../../.azurepipelines/templates/platform-build-run-steps.yml
>>         parameters:
>> -        tool_chain_tag: GCC5
>> +        tool_chain_tag: GCC
>>           build_pkg: $(package)
>>           build_target: $(Build.Target)
>>           build_arch: $(Build.Arch)
>> diff --git a/EmulatorPkg/PlatformCI/ReadMe.md
>> b/EmulatorPkg/PlatformCI/ReadMe.md
>> index f123bb2a4892..53d032e37ea9 100644
>> --- a/EmulatorPkg/PlatformCI/ReadMe.md
>> +++ b/EmulatorPkg/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 EmulatorPkg has only been validated
>> with Windows 10
>> -with VS2019 and Ubuntu 18.04 with GCC5 toolchain. Four different firmware
>> builds are
>> +with VS2019 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/EmulatorPkg/Readme.md b/EmulatorPkg/Readme.md
>> index 0c2eea6a9a02..00e8c7a28499 100644
>> --- a/EmulatorPkg/Readme.md
>> +++ b/EmulatorPkg/Readme.md
>> @@ -29,11 +29,11 @@
>> https://github.com/tianocore/tianocore.github.io/wiki/EmulatorPkg
>>
>>     * 32bit emulator in Linux:
>>
>> -    `build -p EmulatorPkg\EmulatorPkg.dsc -t GCC5 -a IA32`
>> +    `build -p EmulatorPkg\EmulatorPkg.dsc -t GCC -a IA32`
>>
>>     * 64bit emulator in Linux:
>>
>> -    `build -p EmulatorPkg\EmulatorPkg.dsc -t GCC5 -a X64`
>> +    `build -p EmulatorPkg\EmulatorPkg.dsc -t GCC -a X64`
>>
>>   **You can start/run the emulator using the following command:**
>>     * 32bit emulator in Windows:
>> @@ -46,11 +46,11 @@
>> https://github.com/tianocore/tianocore.github.io/wiki/EmulatorPkg
>>
>>     * 32bit emulator in Linux:
>>
>> -    `cd Build/EmulatorIA32/DEBUG_GCC5/IA32/ && ./Host`
>> +    `cd Build/EmulatorIA32/DEBUG_GCC/IA32/ && ./Host`
>>
>>     * 64bit emulator in Linux:
>>
>> -    `cd Build/EmulatorX64/DEBUG_GCC5/X64/ && ./Host`
>> +    `cd Build/EmulatorX64/DEBUG_GCC/X64/ && ./Host`
>>
>>   **On posix-like environment with the bash shell you can use
>> EmulatorPkg/build.sh to simplify building and running
>>   emulator.**
>> diff --git a/EmulatorPkg/build.sh b/EmulatorPkg/build.sh
>> index 76c22dfaf8d4..1bb170cd77fd 100755
>> --- a/EmulatorPkg/build.sh
>> +++ b/EmulatorPkg/build.sh
>> @@ -42,7 +42,7 @@ PLATFORMFILE=
>>   LAST_ARG=
>>   RUN_EMULATOR=no
>>   CLEAN_TYPE=none
>> -TARGET_TOOLS=GCC48
>> +TARGET_TOOLS=GCC
>>   NETWORK_SUPPORT=
>>   BUILD_NEW_SHELL=
>>   BUILD_FAT=
>> @@ -87,18 +87,12 @@ case `uname` in
>>
>>       gcc_version=$(gcc -v 2>&1 | tail -1 | awk '{print $3}')
>>       case $gcc_version in
>> -      [1-3].*|4.[0-7].*)
>> -        echo EmulatorPkg requires GCC4.8 or later
>> +      [1-4].*)
>> +        echo EmulatorPkg requires GCC 5 or newer
>>           exit 1
>>           ;;
>> -      4.8.*)
>> -        TARGET_TOOLS=GCC48
>> -        ;;
>> -      4.9.*|6.[0-2].*)
>> -        TARGET_TOOLS=GCC49
>> -        ;;
>>         *)
>> -        TARGET_TOOLS=GCC5
>> +        TARGET_TOOLS=GCC
>>           ;;
>>       esac
>>       ;;
>> diff --git a/OvmfPkg/CloudHv/README b/OvmfPkg/CloudHv/README
>> index 63e28860e058..10c48219b0dd 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 b/OvmfPkg/IntelTdx/README
>> index 7307ede78faf..4d4e30aad204 100644
>> --- a/OvmfPkg/IntelTdx/README
>> +++ b/OvmfPkg/IntelTdx/README
>> @@ -55,13 +55,13 @@ Build
>>   - Build the TDVF (Config-A) target:
>>   `cd /path/to/edk2`
>>   `source edksetup.sh`
>> -`build.sh -p OvmfPkg/OvmfPkgX64.dsc -a X64 -t GCC5`
>> +`build.sh -p OvmfPkg/OvmfPkgX64.dsc -a X64 -t GCC`
>>
>>   - Build the TDVF (Config-B) target:
>>   `cd /path/to/edk2`
>>   `set PACKAGES_PATH=/path/to/edk2/OvmfPkg`
>>   `source edksetup.sh`
>> -`build.sh -p OvmfPkg/IntelTdx/IntelTdxX64.dsc -a X64 -t GCC5`
>> +`build.sh -p OvmfPkg/IntelTdx/IntelTdxX64.dsc -a X64 -t GCC`
>>
>>   Usage
>>   -----
>> diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
>> b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml
>> similarity index 96%
>> rename from OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
>> rename to OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml
>> index ad43f9fad2fd..1d21a31d4bda 100644
>> --- a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
>> +++ b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml
>> @@ -3,7 +3,7 @@
>>   #
>>   # Platform: OVMF
>>   # OS: Ubuntu
>> -# Toolchain: GCC5
>> +# Toolchain: GCC
>>   #
>>   # Copyright (c) Microsoft Corporation.
>>   # SPDX-License-Identifier: BSD-2-Clause-Patent
>> @@ -194,7 +194,7 @@ jobs:
>>       steps:
>>       - template: ../../../.azurepipelines/templates/platform-build-run-steps.yml
>>         parameters:
>> -        tool_chain_tag: GCC5
>> +        tool_chain_tag: GCC
>>           build_pkg: $(package)
>>           build_target: $(Build.Target)
>>           build_arch: $(Build.Arch)
>> diff --git a/OvmfPkg/PlatformCI/ReadMe.md
>> b/OvmfPkg/PlatformCI/ReadMe.md
>> index 10fa32ac489f..9d21165a8295 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 VS2019 and Ubuntu 18.04 with GCC5 toolchain. Four different firmware
>> builds are
>> +with VS2019 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/build.sh b/OvmfPkg/build.sh
>> index b0334fb76e74..a800f594ba48 100755
>> --- a/OvmfPkg/build.sh
>> +++ b/OvmfPkg/build.sh
>> @@ -77,18 +77,12 @@ 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-4])
>> +        echo OvmfPkg requires GCC 5 or newer
>>           exit 1
>>           ;;
>> -      4.8.*)
>> -        TARGET_TOOLS=GCC48
>> -        ;;
>> -      4.9.*|6.[0-2].*)
>> -        TARGET_TOOLS=GCC49
>> -        ;;
>>         *)
>> -        TARGET_TOOLS=GCC5
>> +        TARGET_TOOLS=GCC
>>           ;;
>>       esac
>>   esac
>> diff --git a/PrmPkg/Readme.md b/PrmPkg/Readme.md
>> index 3191c039fd64..b89d276f4bf0 100644
>> --- a/PrmPkg/Readme.md
>> +++ b/PrmPkg/Readme.md
>> @@ -69,10 +69,10 @@ The PrmPkg can be built targetting the IA32/X64 and
>> AArch64 architectures.
>>   > later in this document and dump the PRMT table in the OS to check if your
>> PRM module is represented as expected.
>>
>>    - AArch64
>> -    ``build -p PrmPkg/PrmPkg.dsc -a AARCH64 -t GCC5``
>> +    ``build -p PrmPkg/PrmPkg.dsc -a AARCH64 -t GCC``
>>
>> -   > ***Note***: Only builds with the GCC5 toolchain have been tested.
>> -   > ***Note***: For builds with the GCC5 toolchain, the
>> PrmModuleExportDescriptor and any other handler entry points symbols, to
>> be listed in the PRMT, must be explicitly preserved by enumerating these in
>> the AARCH64 linker flags. The --require-defined linker flag must be used for
>> each symbol to be preserved.
>> +   > ***Note***: Only builds with the GCC toolchain have been tested.
>> +   > ***Note***: For builds with the GCC toolchain, the
>> PrmModuleExportDescriptor and any other handler entry points symbols, to
>> be listed in the PRMT, must be explicitly preserved by enumerating these in
>> the AARCH64 linker flags. The --require-defined linker flag must be used for
>> each symbol to be preserved.
>>
>>   ### PRM Platform GUID
>>
>> diff --git a/ReadMe.rst b/ReadMe.rst
>> index ed1d4822459b..7e39547a8a1e 100644
>> --- a/ReadMe.rst
>> +++ b/ReadMe.rst
>> @@ -12,7 +12,7 @@ Core CI Build Status
>>    Host Type & Toolchain        Build Status      Test Status     Code Coverage
>>   ============================= ================= ===============
>> ===================
>>   Windows_VS2019_               |WindowsCiBuild|  |WindowsCiTest|
>> |WindowsCiCoverage|
>> -Ubuntu_GCC5_                  |UbuntuCiBuild|   |UbuntuCiTest|
>> |UbuntuCiCoverage|
>> +Ubuntu_GCC_                  |UbuntuCiBuild|   |UbuntuCiTest|
>> |UbuntuCiCoverage|
>>   ============================= ================= ===============
>> ===================
>>
>>   `More CI Build information <.pytool/Readme.md>`__
>> @@ -36,27 +36,27 @@ OvmfPkg_Win_VS2019_           | IA32            |op32d|
>> |op32r|       |op3
>>   |                             | IA32 X64 FULL   |op3264fd|    |op3264fr|    |op3264fn|
>>   ============================= ================= =============
>> ============= ==============
>>
>> -Ubuntu 18.04 GCC5
>> +Ubuntu 18.04 GCC
>>   `````````````````
>>
>>   ============================= ================= =============
>> ============= ==============
>>    Toolchain                    CONFIG            DEBUG         RELEASE       NOOPT
>>   ============================= ================= =============
>> ============= ==============
>> -ArmVirtPkg_Ubuntu_GCC5_       | AARCH64         |avAArch64du|
>> |avAArch64ru| |avAArch64nu|
>> +ArmVirtPkg_Ubuntu_GCC_       | AARCH64         |avAArch64du|
>> |avAArch64ru| |avAArch64nu|
>>   |                             | ARM             |avArmdu|     |avArmru|     |avArmnu|
>> -EmulatorPkg_Ubuntu_GCC5_      | IA32            |em32du|      |em32ru|
>> |em32nu|
>> +EmulatorPkg_Ubuntu_GCC_      | IA32            |em32du|      |em32ru|
>> |em32nu|
>>   |                             | X64             |em64du|      |em64ru|      |em64nu|
>>   |                             | IA32 FULL       |em32fdu|     |em32fru|     |em32fnu|
>>   |                             | X64 FULL        |em64fdu|     |em64fru|     |em64fnu|
>> -OvmfPkg_Ubuntu_GCC5_          | IA32            |op32du|      |op32ru|
>> |op32nu|
>> +OvmfPkg_Ubuntu_GCC_          | IA32            |op32du|      |op32ru|
>> |op32nu|
>>   |                             | X64             |op64du|      |op64ru|      |op64nu|
>>   |                             | IA32 X64        |op3264du|    |op3264ru|    |op3264nu|
>>   |                             | IA32 X64 FULL   |op3264fdu|   |op3264fru|   |op3264fru|
>>   ============================= ================= =============
>> ============= ==============
>>
>> -|TCBZ_2668|_ - EmulatorPkg Ubuntu GCC5 Segfaults during execution.
>> +|TCBZ_2668|_ - EmulatorPkg Ubuntu GCC Segfaults during execution.
>>
>> -|TCBZ_2639|_ - EmulatorPkg Ubuntu GCC5 Segfaults during execution.
>> +|TCBZ_2639|_ - EmulatorPkg Ubuntu GCC Segfaults during execution.
>>
>>   `More ArmVirtPkg CI Build Information
>> <ArmVirtPkg/PlatformCI/ReadMe.md>`__
>>
>> @@ -294,14 +294,14 @@ use.
>>   .. |WindowsCiTest| image:: https://img.shields.io/azure-
>> devops/tests/tianocore/edk2-ci/32.svg
>>   .. |WindowsCiCoverage| image:: https://img.shields.io/badge/coverage-
>> coming_soon-blue
>>
>> -.. _Ubuntu_GCC5: https://dev.azure.com/tianocore/edk2-
>> ci/_build/latest?definitionId=31&branchName=master
>> +.. _Ubuntu_GCC: https://dev.azure.com/tianocore/edk2-
>> ci/_build/latest?definitionId=31&branchName=master
>>   .. |UbuntuCiBuild| image:: https://dev.azure.com/tianocore/edk2-
>> ci/_apis/build/status/Ubuntu%20GCC5%20CI?branchName=master
>>   .. |UbuntuCiTest| image:: https://img.shields.io/azure-
>> devops/tests/tianocore/edk2-ci/31.svg
>>   .. |UbuntuCiCoverage| image:: https://img.shields.io/badge/coverage-
>> coming_soon-blue
>>
>>   .. ArmVirtPkg
>>
>> -.. _ArmVirtPkg_Ubuntu_GCC5: https://dev.azure.com/tianocore/edk2-
>> ci/_build/latest?definitionId=46&branchName=master
>> +.. _ArmVirtPkg_Ubuntu_GCC: https://dev.azure.com/tianocore/edk2-
>> ci/_build/latest?definitionId=46&branchName=master
>>   .. |avAArch64du| image:: https://dev.azure.com/tianocore/edk2-
>> ci/_apis/build/status/PlatformCI_ArmVirtPkg_Ubuntu_GCC5_CI?branchName=
>> master&jobName=Platform_CI&configuration=Platform_CI%20QEMU_AARCH6
>> 4_DEBUG
>>   .. |avAArch64ru| image:: https://dev.azure.com/tianocore/edk2-
>> ci/_apis/build/status/PlatformCI_ArmVirtPkg_Ubuntu_GCC5_CI?branchName=
>> master&jobName=Platform_CI&configuration=Platform_CI%20QEMU_AARCH6
>> 4_RELEASE
>>   .. |avAArch64nu| image:: https://dev.azure.com/tianocore/edk2-
>> ci/_apis/build/status/PlatformCI_ArmVirtPkg_Ubuntu_GCC5_CI?branchName=
>> master&jobName=Platform_CI&configuration=Platform_CI%20QEMU_AARCH6
>> 4_NOOPT
>> @@ -319,7 +319,7 @@ use.
>>   .. _TCBZ_2639: https://bugzilla.tianocore.org/show_bug.cgi?id=2639
>>
>>   .. _EmulatorPkg_Win_VS2019:  https://dev.azure.com/tianocore/edk2-
>> ci/_build/latest?definitionId=44&branchName=master
>> -.. _EmulatorPkg_Ubuntu_GCC5: https://dev.azure.com/tianocore/edk2-
>> ci/_build/latest?definitionId=43&branchName=master
>> +.. _EmulatorPkg_Ubuntu_GCC: https://dev.azure.com/tianocore/edk2-
>> ci/_build/latest?definitionId=43&branchName=master
>>
>>   .. |em32d| image:: https://dev.azure.com/tianocore/edk2-
>> ci/_apis/build/status/PlatformCI_EmulatorPkg_Windows_VS2019_CI?branchN
>> ame=master&jobName=Platform_CI&configuration=Platform_CI%20Emulator
>> Pkg_IA32_DEBUG
>>   .. |em32du| image:: https://dev.azure.com/tianocore/edk2-
>> ci/_apis/build/status/PlatformCI_EmulatorPkg_Ubuntu_GCC5_CI?branchNam
>> e=master&jobName=Platform_CI&configuration=Platform_CI%20EmulatorPkg
>> _IA32_DEBUG
>> @@ -355,7 +355,7 @@ use.
>>   .. _TCBZ_2661: https://bugzilla.tianocore.org/show_bug.cgi?id=2661
>>
>>   .. _OvmfPkg_Win_VS2019:  https://dev.azure.com/tianocore/edk2-
>> ci/_build/latest?definitionId=50&branchName=master
>> -.. _OvmfPkg_Ubuntu_GCC5: https://dev.azure.com/tianocore/edk2-
>> ci/_build/latest?definitionId=48&branchName=master
>> +.. _OvmfPkg_Ubuntu_GCC: https://dev.azure.com/tianocore/edk2-
>> ci/_build/latest?definitionId=48&branchName=master
>>
>>   .. |op32d| image:: https://dev.azure.com/tianocore/edk2-
>> ci/_apis/build/status/PlatformCI_OvmfPkg_Windows_VS2019_CI?branchName
>> =master&jobName=Platform_CI&configuration=Platform_CI%20OVMF_IA32_D
>> EBUG
>>   .. |op32du| image:: https://dev.azure.com/tianocore/edk2-
>> ci/_apis/build/status/PlatformCI_OvmfPkg_Ubuntu_GCC5_CI?branchName=m
>> aster&jobName=Platform_CI&configuration=Platform_CI%20OVMF_IA32_DEB
>> UG
>> diff --git a/UnitTestFrameworkPkg/ReadMe.md
>> b/UnitTestFrameworkPkg/ReadMe.md
>> index 7da6a320a7f1..bedf0f7add34 100644
>> --- a/UnitTestFrameworkPkg/ReadMe.md
>> +++ b/UnitTestFrameworkPkg/ReadMe.md
>> @@ -1377,15 +1377,15 @@ After that, the following commands will set up
>> the build and run the host-based
>>
>>   ```bash
>>   # Setup repo for building
>> -# stuart_setup -c ./.pytool/CISettings.py TOOL_CHAIN_TAG=<GCC5, VS2019,
>> etc.>
>> +# stuart_setup -c ./.pytool/CISettings.py TOOL_CHAIN_TAG=<GCC, VS2019,
>> etc.>
>>   stuart_setup -c ./.pytool/CISettings.py TOOL_CHAIN_TAG=VS2019
>>
>>   # Update all binary dependencies
>> -# stuart_update -c ./.pytool/CISettings.py TOOL_CHAIN_TAG=<GCC5, VS2019,
>> etc.>
>> +# stuart_update -c ./.pytool/CISettings.py TOOL_CHAIN_TAG=<GCC, VS2019,
>> etc.>
>>   stuart_update -c ./.pytool/CISettings.py TOOL_CHAIN_TAG=VS2019
>>
>>   # Build and run the tests
>> -# stuart_ci_build -c ./.pytool/CISettings.py TOOL_CHAIN_TAG=<GCC5, VS2019,
>> etc.> -t NOOPT [-p <Package Name>]
>> +# stuart_ci_build -c ./.pytool/CISettings.py TOOL_CHAIN_TAG=<GCC, VS2019,
>> etc.> -t NOOPT [-p <Package Name>]
>>   stuart_ci_build -c ./.pytool/CISettings.py TOOL_CHAIN_TAG=VS2019 -t NOOPT
>> -p MdePkg
>>   ```
>>
>> @@ -1530,7 +1530,7 @@ lcov linux tool, and parsed using the lcov_cobertura
>> python tool to parse it to
>>     ```bash
>>     sudo apt-get install -y lcov
>>     python -m pip install --upgrade -r ./pip-requirements.txt
>> -  stuart_ci_build -c .pytool/CISettings.py  -t NOOPT TOOL_CHAIN_TAG=GCC5 -
>> p MdeModulePkg
>> +  stuart_ci_build -c .pytool/CISettings.py  -t NOOPT TOOL_CHAIN_TAG=GCC -p
>> MdeModulePkg
>>     Open Build/coverage.xml
>>     ```
>>     - How to see code coverage data on IDE Visual Studio Code
>> --
>> 2.39.2
>>
>>
>>
>> 
>>

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2023-05-18 17:56 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-17 18:58 [edk2-stable202305 PATCH 0/1] Rename GCC5 to GCC in filenames, scripts and documentation Rebecca Cran
2023-05-17 18:58 ` [edk2-stable202305 PATCH 1/1] Rename GCC5 toolchain references in docs and scripts to GCC Rebecca Cran
2023-05-18  0:10   ` [edk2-devel] " Michael D Kinney
2023-05-18 17:56     ` Rebecca Cran

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox