From nobody Tue Apr 23 06:23:55 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+104987+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+104987+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1684349941; cv=none; d=zohomail.com; s=zohoarc; b=I4ob9pefdUnFbxg2XAOtz29PchFPx2KuAgEubEK4h6sti5jHkjUN6uUJ2OMMytiC6HaQXQssLpxwBlpg4XHj/erpFgJwrNe9K2O4jcXEqZFtlGSpot+TaA4Z5HEpmNLnSUKz/nD6QCrcQ0Q/XA3sW72QlCmjdeXbxexmzKxrjjM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684349941; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=EmbSqXF9NnTrsRnDZP8K18adQsgHJb86haYu+aZYMdg=; b=fBKpF4l9nv8SSAIDnl/3i8WW8nTEIKcCH73RPziVt4lQKAZNiJ4oeMEM4q/lXdhHuFmhoKpuT+HrqXoBGEDZ9XHTH0OCvkzlBXnzOfigAYEo0dUqheZ+fockU7ZHpy0fx7wICicKN5XDlMPCyrJ+szmXMU/vHyo4fF3l4cTyhD8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+104987+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1684349941957452.2925798957408; Wed, 17 May 2023 11:59:01 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id W3ZdYY1788612xwcKxXQvy6c; Wed, 17 May 2023 11:59:01 -0700 X-Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by mx.groups.io with SMTP id smtpd.web11.59089.1684349940701150863 for ; Wed, 17 May 2023 11:59:01 -0700 X-Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 0F3295C01C9; Wed, 17 May 2023 14:59:00 -0400 (EDT) X-Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Wed, 17 May 2023 14:59:00 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeeiuddgudefvdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enogfuuhhsphgvtghtffhomhgrihhnucdlgeelmdenucfjughrpefhvfevufffkffojghf ggfgsedtkeertdertddtnecuhfhrohhmpeftvggsvggttggrucevrhgrnhcuoehrvggsvg gttggrsegsshguihhordgtohhmqeenucggtffrrghtthgvrhhnpeehgfdtgedthfdutdff veejhfegtdefueeltdfgtdekhedtledvudduhfdtgfeuveenucffohhmrghinhephhhomh gvrdhlohgtrghlpdhgihhthhhusgdrtghomhdpghhithhhuhgsrdhiohdpshhhihgvlhgu shdrihhopdgriihurhgvrdgtohhmpdhtihgrnhhotghorhgvrdhorhhgnecuvehluhhsth gvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheprhgvsggvtggtrgessghs ughiohdrtghomh X-ME-Proxy: Feedback-ID: i5b994698:Fastmail X-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 17 May 2023 14:58:57 -0400 (EDT) From: "Rebecca Cran" To: devel@edk2.groups.io, 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 Subject: [edk2-devel] [edk2-stable202305 PATCH 1/1] Rename GCC5 toolchain references in docs and scripts to GCC Date: Wed, 17 May 2023 12:58:47 -0600 Message-Id: <20230517185847.3391881-2-rebecca@bsdio.com> In-Reply-To: <20230517185847.3391881-1-rebecca@bsdio.com> References: <20230517185847.3391881-1-rebecca@bsdio.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,rebecca@bsdio.com X-Gm-Message-State: q1Ltpbm8UjEZTF7InBxFuCw5x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1684349941; bh=2+aHqolTc5tdbbvy2QymdKYlvBiheFJ3S1lff2rWv6o=; h=Cc:Date:From:Reply-To:Subject:To; b=fNbcy+r+NFlor0vlEzfV1Bbvfk4ZlW2S7iSObdTUCYa/SLcGKyZnKRMrL9SZXweX+5S pVhOqHmUhcMZskZvQ3Zy4rNvahNIZt4BkQ7FZTAxm3i4swXX4XJeWuKoXWOU1HXNiQcyf RGUb6pB95sP6T9gqZZ/E5JnV0wjcFBhzslg= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1684349943207100005 Content-Type: text/plain; charset="utf-8" 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 --- .azurepipelines/{Ubuntu-GCC5.yml =3D> 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 =3D> 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 =3D> Ubuntu-GCC.ym= l} | 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 =3D> 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.y= ml 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 right= s reserved.
@@ -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/.azur= epipelines/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=3D${PATH}" displayName: Set PATH - condition: eq('${{ parameters.tool_chain_tag }}', 'GCC5') + condition: eq('${{ parameters.tool_chain_tag }}', 'GCC') =20 - checkout: self clean: true diff --git a/.azurepipelines/templates/pr-gate-build-job.yml b/.azurepipeli= nes/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=3D${PATH}" displayName: Set PATH - condition: eq('${{ parameters.tool_chain_tag }}', 'GCC5') + condition: eq('${{ parameters.tool_chain_tag }}', 'GCC') =20 - checkout: self clean: true diff --git a/ArmPlatformPkg/Scripts/Makefile b/ArmPlatformPkg/Scripts/Makef= ile index baa618456413..686b68614f03 100644 --- a/ArmPlatformPkg/Scripts/Makefile +++ b/ArmPlatformPkg/Scripts/Makefile @@ -5,7 +5,7 @@ # #*/ =20 -EDK2_TOOLCHAIN ?=3D GCC5 +EDK2_TOOLCHAIN ?=3D GCC EDK2_ARCH ?=3D ARM EDK2_BUILD ?=3D DEBUG =20 diff --git a/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml b/ArmVir= tPkg/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-step= s.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 =20 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 a= nd are described below. =20 | Configuration name | Architecture | DSC File |Additio= nal 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/HostBasedUnitTestRunn= er.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 +=3D 1 =20 if thebuilder.env.GetValue("CODE_COVERAGE") !=3D "FALSE": - if thebuilder.env.GetValue("TOOL_CHAIN_TAG") =3D=3D "GCC5": + if thebuilder.env.GetValue("TOOL_CHAIN_TAG") =3D=3D "GCC": ret =3D self.gen_code_coverage_gcc(thebuilder) if ret !=3D 0: failure_count +=3D 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: =20 >build -a AARCH64 -p Platform\ARM\JunoPkg\ArmJuno.dsc - -t GCC5 **-D DYNAMIC_TABLES_FRAMEWORK** + -t GCC **-D DYNAMIC_TABLES_FRAMEWORK** =20 or =20 >build -a AARCH64 -p Platform\ARM\VExpressPkg\ArmVExpress-FVP-AArch64.dsc - -t GCC5 **-D DYNAMIC_TABLES_FRAMEWORK** + -t GCC **-D DYNAMIC_TABLES_FRAMEWORK** =20 # Prerequisites =20 @@ -248,7 +248,7 @@ The instructions to setup the CI environment are in *'e= dk2\\.pytool\\Readme.md'* ``` stuart_setup -c .pytool/CISettings.py TOOL_CHAIN_TAG=3D -a =20 - e.g. stuart_setup -c .pytool/CISettings.py TOOL_CHAIN_TAG=3DGCC5 + e.g. stuart_setup -c .pytool/CISettings.py TOOL_CHAIN_TAG=3DGCC ``` =20 5. Initialize & Update Dependencies - only as needed when ext_deps change @@ -256,7 +256,7 @@ The instructions to setup the CI environment are in *'e= dk2\\.pytool\\Readme.md'* ``` stuart_update -c .pytool/CISettings.py TOOL_CHAIN_TAG=3D -a =20 - e.g. stuart_update -c .pytool/CISettings.py TOOL_CHAIN_TAG=3DGCC5 + e.g. stuart_update -c .pytool/CISettings.py TOOL_CHAIN_TAG=3DGCC ``` =20 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 *'e= dk2\\.pytool\\Readme.md'* ``` stuart_build-c .pytool/CISettings.py TOOL_CHAIN_TAG=3D -a =20 - e.g. stuart_ci_build -c .pytool/CISettings.py TOOL_CHAIN_TAG=3DGCC= 5 -p DynamicTablesPkg -a AARCH64 --verbose + e.g. stuart_ci_build -c .pytool/CISettings.py TOOL_CHAIN_TAG=3DGCC= -p DynamicTablesPkg -a AARCH64 --verbose ``` =20 - 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/Emula= torPkg/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-step= s.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/Read= Me.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 =20 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 b= uilds are supported and are described below. =20 | Configuration name | Architectures | DSC File |Additio= nal 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/E= mulatorPkg =20 * 32bit emulator in Linux: =20 - `build -p EmulatorPkg\EmulatorPkg.dsc -t GCC5 -a IA32` + `build -p EmulatorPkg\EmulatorPkg.dsc -t GCC -a IA32` =20 * 64bit emulator in Linux: =20 - `build -p EmulatorPkg\EmulatorPkg.dsc -t GCC5 -a X64` + `build -p EmulatorPkg\EmulatorPkg.dsc -t GCC -a X64` =20 **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/E= mulatorPkg =20 * 32bit emulator in Linux: =20 - `cd Build/EmulatorIA32/DEBUG_GCC5/IA32/ && ./Host` + `cd Build/EmulatorIA32/DEBUG_GCC/IA32/ && ./Host` =20 * 64bit emulator in Linux: =20 - `cd Build/EmulatorX64/DEBUG_GCC5/X64/ && ./Host` + `cd Build/EmulatorX64/DEBUG_GCC/X64/ && ./Host` =20 **On posix-like environment with the bash shell you can use EmulatorPkg/bu= ild.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=3D LAST_ARG=3D RUN_EMULATOR=3Dno CLEAN_TYPE=3Dnone -TARGET_TOOLS=3DGCC48 +TARGET_TOOLS=3DGCC NETWORK_SUPPORT=3D BUILD_NEW_SHELL=3D BUILD_FAT=3D @@ -87,18 +87,12 @@ case `uname` in =20 gcc_version=3D$(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=3DGCC48 - ;; - 4.9.*|6.[0-2].*) - TARGET_TOOLS=3DGCC49 - ;; *) - TARGET_TOOLS=3DGCC5 + TARGET_TOOLS=3DGCC ;; 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=3D1 \ --memory size=3D1G \ - --kernel Build/CloudHvX64/DEBUG_GCC5/FV/CLOUDHV.fd \ + --kernel Build/CloudHvX64/DEBUG_GCC/FV/CLOUDHV.fd \ --disk path=3D/path/to/disk.raw =20 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` =20 - Build the TDVF (Config-B) target: `cd /path/to/edk2` `set PACKAGES_PATH=3D/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` =20 Usage ----- diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml b/OvmfPkg/P= latformCI/.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-step= s.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 =20 This solution for building and running OvmfPkg has only been validated wit= h 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 b= uilds are supported and are described below. =20 | Configuration name | Architectures | DSC File |Addi= tional 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=3D$(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=3DGCC48 - ;; - 4.9.*|6.[0-2].*) - TARGET_TOOLS=3DGCC49 - ;; *) - TARGET_TOOLS=3DGCC5 + TARGET_TOOLS=3DGCC ;; 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 AAr= ch64 architectures. > later in this document and dump the PRMT table in the OS to check if you= r PRM module is represented as expected. =20 - AArch64 - ``build -p PrmPkg/PrmPkg.dsc -a AARCH64 -t GCC5`` + ``build -p PrmPkg/PrmPkg.dsc -a AARCH64 -t GCC`` =20 - > ***Note***: Only builds with the GCC5 toolchain have been tested. - > ***Note***: For builds with the GCC5 toolchain, the PrmModuleExportDe= scriptor and any other handler entry points symbols, to be listed in the PR= MT, must be explicitly preserved by enumerating these in the AARCH64 linker= flags. The --require-defined linker flag must be used for each symbol to b= e preserved. + > ***Note***: Only builds with the GCC toolchain have been tested. + > ***Note***: For builds with the GCC toolchain, the PrmModuleExportDes= criptor and any other handler entry points symbols, to be listed in the PRM= T, 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. =20 ### PRM Platform GUID =20 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 Cover= age =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D Windows_VS2019_ |WindowsCiBuild| |WindowsCiTest| |WindowsCi= Coverage| -Ubuntu_GCC5_ |UbuntuCiBuild| |UbuntuCiTest| |UbuntuCiC= overage| +Ubuntu_GCC_ |UbuntuCiBuild| |UbuntuCiTest| |UbuntuCiCo= verage| =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D =20 `More CI Build information <.pytool/Readme.md>`__ @@ -36,27 +36,27 @@ OvmfPkg_Win_VS2019_ | IA32 |op32d|= |op32r| |op3 | | IA32 X64 FULL |op3264fd| |op3264fr| = |op3264fn| =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 -Ubuntu 18.04 GCC5 +Ubuntu 18.04 GCC ````````````````` =20 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Toolchain CONFIG DEBUG RELEASE = NOOPT =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -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| =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 -|TCBZ_2668|_ - EmulatorPkg Ubuntu GCC5 Segfaults during execution. +|TCBZ_2668|_ - EmulatorPkg Ubuntu GCC Segfaults during execution. =20 -|TCBZ_2639|_ - EmulatorPkg Ubuntu GCC5 Segfaults during execution. +|TCBZ_2639|_ - EmulatorPkg Ubuntu GCC Segfaults during execution. =20 `More ArmVirtPkg CI Build Information `__ =20 @@ -294,14 +294,14 @@ use. .. |WindowsCiTest| image:: https://img.shields.io/azure-devops/tests/tiano= core/edk2-ci/32.svg .. |WindowsCiCoverage| image:: https://img.shields.io/badge/coverage-comin= g_soon-blue =20 -.. _Ubuntu_GCC5: https://dev.azure.com/tianocore/edk2-ci/_build/latest?def= initionId=3D31&branchName=3Dmaster +.. _Ubuntu_GCC: https://dev.azure.com/tianocore/edk2-ci/_build/latest?defi= nitionId=3D31&branchName=3Dmaster .. |UbuntuCiBuild| image:: https://dev.azure.com/tianocore/edk2-ci/_apis/b= uild/status/Ubuntu%20GCC5%20CI?branchName=3Dmaster .. |UbuntuCiTest| image:: https://img.shields.io/azure-devops/tests/tianoc= ore/edk2-ci/31.svg .. |UbuntuCiCoverage| image:: https://img.shields.io/badge/coverage-coming= _soon-blue =20 .. ArmVirtPkg =20 -.. _ArmVirtPkg_Ubuntu_GCC5: https://dev.azure.com/tianocore/edk2-ci/_build= /latest?definitionId=3D46&branchName=3Dmaster +.. _ArmVirtPkg_Ubuntu_GCC: https://dev.azure.com/tianocore/edk2-ci/_build/= latest?definitionId=3D46&branchName=3Dmaster .. |avAArch64du| image:: https://dev.azure.com/tianocore/edk2-ci/_apis/bui= ld/status/PlatformCI_ArmVirtPkg_Ubuntu_GCC5_CI?branchName=3Dmaster&jobName= =3DPlatform_CI&configuration=3DPlatform_CI%20QEMU_AARCH64_DEBUG .. |avAArch64ru| image:: https://dev.azure.com/tianocore/edk2-ci/_apis/bui= ld/status/PlatformCI_ArmVirtPkg_Ubuntu_GCC5_CI?branchName=3Dmaster&jobName= =3DPlatform_CI&configuration=3DPlatform_CI%20QEMU_AARCH64_RELEASE .. |avAArch64nu| image:: https://dev.azure.com/tianocore/edk2-ci/_apis/bui= ld/status/PlatformCI_ArmVirtPkg_Ubuntu_GCC5_CI?branchName=3Dmaster&jobName= =3DPlatform_CI&configuration=3DPlatform_CI%20QEMU_AARCH64_NOOPT @@ -319,7 +319,7 @@ use. .. _TCBZ_2639: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2639 =20 .. _EmulatorPkg_Win_VS2019: https://dev.azure.com/tianocore/edk2-ci/_buil= d/latest?definitionId=3D44&branchName=3Dmaster -.. _EmulatorPkg_Ubuntu_GCC5: https://dev.azure.com/tianocore/edk2-ci/_buil= d/latest?definitionId=3D43&branchName=3Dmaster +.. _EmulatorPkg_Ubuntu_GCC: https://dev.azure.com/tianocore/edk2-ci/_build= /latest?definitionId=3D43&branchName=3Dmaster =20 .. |em32d| image:: https://dev.azure.com/tianocore/edk2-ci/_apis/build/sta= tus/PlatformCI_EmulatorPkg_Windows_VS2019_CI?branchName=3Dmaster&jobName=3D= Platform_CI&configuration=3DPlatform_CI%20EmulatorPkg_IA32_DEBUG .. |em32du| image:: https://dev.azure.com/tianocore/edk2-ci/_apis/build/st= atus/PlatformCI_EmulatorPkg_Ubuntu_GCC5_CI?branchName=3Dmaster&jobName=3DPl= atform_CI&configuration=3DPlatform_CI%20EmulatorPkg_IA32_DEBUG @@ -355,7 +355,7 @@ use. .. _TCBZ_2661: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2661 =20 .. _OvmfPkg_Win_VS2019: https://dev.azure.com/tianocore/edk2-ci/_build/la= test?definitionId=3D50&branchName=3Dmaster -.. _OvmfPkg_Ubuntu_GCC5: https://dev.azure.com/tianocore/edk2-ci/_build/la= test?definitionId=3D48&branchName=3Dmaster +.. _OvmfPkg_Ubuntu_GCC: https://dev.azure.com/tianocore/edk2-ci/_build/lat= est?definitionId=3D48&branchName=3Dmaster =20 .. |op32d| image:: https://dev.azure.com/tianocore/edk2-ci/_apis/build/sta= tus/PlatformCI_OvmfPkg_Windows_VS2019_CI?branchName=3Dmaster&jobName=3DPlat= form_CI&configuration=3DPlatform_CI%20OVMF_IA32_DEBUG .. |op32du| image:: https://dev.azure.com/tianocore/edk2-ci/_apis/build/st= atus/PlatformCI_OvmfPkg_Ubuntu_GCC5_CI?branchName=3Dmaster&jobName=3DPlatfo= rm_CI&configuration=3DPlatform_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 =20 ```bash # Setup repo for building -# stuart_setup -c ./.pytool/CISettings.py TOOL_CHAIN_TAG=3D +# stuart_setup -c ./.pytool/CISettings.py TOOL_CHAIN_TAG=3D stuart_setup -c ./.pytool/CISettings.py TOOL_CHAIN_TAG=3DVS2019 =20 # Update all binary dependencies -# stuart_update -c ./.pytool/CISettings.py TOOL_CHAIN_TAG=3D +# stuart_update -c ./.pytool/CISettings.py TOOL_CHAIN_TAG=3D stuart_update -c ./.pytool/CISettings.py TOOL_CHAIN_TAG=3DVS2019 =20 # Build and run the tests -# stuart_ci_build -c ./.pytool/CISettings.py TOOL_CHAIN_TAG=3D -t NOOPT [-p ] +# stuart_ci_build -c ./.pytool/CISettings.py TOOL_CHAIN_TAG=3D -t NOOPT [-p ] stuart_ci_build -c ./.pytool/CISettings.py TOOL_CHAIN_TAG=3DVS2019 -t NOOP= T -p MdePkg ``` =20 @@ -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=3DGCC5= -p MdeModulePkg + stuart_ci_build -c .pytool/CISettings.py -t NOOPT TOOL_CHAIN_TAG=3DGCC = -p MdeModulePkg Open Build/coverage.xml ``` - How to see code coverage data on IDE Visual Studio Code --=20 2.39.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#104987): https://edk2.groups.io/g/devel/message/104987 Mute This Topic: https://groups.io/mt/98954999/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-