[PATCH v2 0/2] BaseTools: Switch ARM/AARCH64 CI gcc from Linaro to Arm

[PATCH v2 0/2] BaseTools: Switch ARM/AARCH64 CI gcc from Linaro to Arm

[Rebecca Cran]

BaseTools/Bin/gcc_[arm,aarch64]_linux_ext_dep.yaml downloads GCC releases
from https://releases.linaro.org/components/toolchain/binaries/7.4-2019.02 . 

As indicated in the URL, those builds are from 2019 because Linaro no
longer do GCC releases, with that task having moved to Arm. 

The Arm GCC page is https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-a/downloads,
with the latest release being 10.3-2021.07.

gcc_aarch64_linux_ext_dep.yaml is used when setting up a CI
environment using the stuart tools.

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3594
PR: https://github.com/tianocore/edk2/pull/1909

Changes from v1 to v2:

Updated LinuxGcc5ToolChain.py to fix the toolchain prefix.


Rebecca Cran (2):
  BaseTools: Switch to downloading the ARM compiler from Arm's site
  BaseTools: Switch to downloading the AARCH64 compiler from Arm's site

 BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml              | 10 +++++-----
 BaseTools/Bin/gcc_arm_linux_ext_dep.yaml                  | 10 +++++-----
 BaseTools/Plugin/LinuxGcc5ToolChain/LinuxGcc5ToolChain.py |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

-- 
2.31.1

[PATCH v2 1/2] BaseTools: Switch to downloading the ARM compiler from Arm's site

[Rebecca Cran]

From: Rebecca Cran <rebecca@bsdio.com>

Linaro no longer do gcc releases - they're done by Arm now.
Update gcc_arm_linux_ext_dep.yaml to fetch the latest ARM gcc release
(10.3-2021.07) from their site.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
---
 BaseTools/Bin/gcc_arm_linux_ext_dep.yaml                  | 10 +++++-----
 BaseTools/Plugin/LinuxGcc5ToolChain/LinuxGcc5ToolChain.py |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/BaseTools/Bin/gcc_arm_linux_ext_dep.yaml b/BaseTools/Bin/gcc_arm_linux_ext_dep.yaml
index 09481ceae05f..9b3c4e394fa1 100644
--- a/BaseTools/Bin/gcc_arm_linux_ext_dep.yaml
+++ b/BaseTools/Bin/gcc_arm_linux_ext_dep.yaml
@@ -1,5 +1,5 @@
 ## @file
-# Download GCC ARM compiler from Linaro's release site
+# Download GCC ARM compiler from Arm's release site
 # Set shell variable GCC5_ARM_INSTALL to this folder
 #
 # This is only downloaded when a build activates scope gcc_arm_linux
@@ -11,11 +11,11 @@
   "scope": "gcc_arm_linux",
   "type": "web",
   "name": "gcc_arm_linux",
-  "source": "https://releases.linaro.org/components/toolchain/binaries/7.4-2019.02/arm-linux-gnueabihf/gcc-linaro-7.4.1-2019.02-x86_64_arm-linux-gnueabihf.tar.xz",
-  "version": "7.4.1",
-  "sha256": "3C951CF1941D0FA06D64CC0D5E88612B209D8123B273FA26C16D70BD7BC6B163",
+  "source": "https://developer.arm.com/-/media/Files/downloads/gnu-a/10.3-2021.07/binrel/gcc-arm-10.3-2021.07-x86_64-arm-none-linux-gnueabihf.tar.asc",
+  "version": "10.3-2021.07",
+  "sha256": "aa074fa8371a4f73fecbd16bd62c8b1945f23289e26414794f130d6ccdf8e39c",
   "compression_type": "tar",
-  "internal_path": "/gcc-linaro-7.4.1-2019.02-x86_64_arm-linux-gnueabihf/",
+  "internal_path": "/gcc-arm-10.3-2021.07-x86_64-arm-none-linux-gnueabihf/",
   "flags": ["set_shell_var", ],
   "var_name": "GCC5_ARM_INSTALL"
 }
diff --git a/BaseTools/Plugin/LinuxGcc5ToolChain/LinuxGcc5ToolChain.py b/BaseTools/Plugin/LinuxGcc5ToolChain/LinuxGcc5ToolChain.py
index 81075438d2e8..a695fc328565 100644
--- a/BaseTools/Plugin/LinuxGcc5ToolChain/LinuxGcc5ToolChain.py
+++ b/BaseTools/Plugin/LinuxGcc5ToolChain/LinuxGcc5ToolChain.py
@@ -57,7 +57,7 @@ class LinuxGcc5ToolChain(IUefiBuildPlugin):
                 return 0
 
             # make GCC5_ARM_PREFIX to align with tools_def.txt
-            prefix = os.path.join(install_path, "bin", "arm-linux-gnueabihf-")
+            prefix = os.path.join(install_path, "bin", "arm-none-linux-gnueabihf-")
             shell_environment.GetEnvironment().set_shell_var("GCC5_ARM_PREFIX", prefix)
 
         # now confirm it exists
-- 
2.31.1

[PATCH v2 2/2] BaseTools: Switch to downloading the AARCH64 compiler from Arm's site

[Rebecca Cran]

From: Rebecca Cran <rebecca@bsdio.com>

Linaro no longer do gcc releases - they're done by Arm now.

Update gcc_aarch64_linux_ext_dep.yaml to fetch the latest AARCH64 gcc
release (10.3-2021.07) from their site.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
---
 BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml              | 10 +++++-----
 BaseTools/Plugin/LinuxGcc5ToolChain/LinuxGcc5ToolChain.py |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml b/BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml
index e81223fd9ad1..de7682b5521f 100644
--- a/BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml
+++ b/BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml
@@ -1,5 +1,5 @@
 ## @file
-# Download GCC AARCH64 compiler from Linaro's release site
+# Download GCC AARCH64 compiler from Arm's release site
 # Set shell variable GCC5_AARCH64_INSTALL to this folder
 #
 # This is only downloaded when a build activates scope gcc_aarch64_linux
@@ -11,11 +11,11 @@
   "scope": "gcc_aarch64_linux",
   "type": "web",
   "name": "gcc_aarch64_linux",
-  "source": "http://releases.linaro.org/components/toolchain/binaries/7.4-2019.02/aarch64-linux-gnu/gcc-linaro-7.4.1-2019.02-x86_64_aarch64-linux-gnu.tar.xz",
-  "version": "7.4.1",
-  "sha256": "27f1dc2c491ed61ae8f0d4b0c11de59cd2f7dd9c94761ee7153006fcac1bf9ab",
+  "source": "https://developer.arm.com/-/media/Files/downloads/gnu-a/10.3-2021.07/binrel/gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu.tar.xz",
+  "version": "10.3-2021.07",
+  "sha256": "1e33d53dea59c8de823bbdfe0798280bdcd138636c7060da9d77a97ded095a84",
   "compression_type": "tar",
-  "internal_path": "/gcc-linaro-7.4.1-2019.02-x86_64_aarch64-linux-gnu/",
+  "internal_path": "/gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu/",
   "flags": ["set_shell_var", ],
   "var_name": "GCC5_AARCH64_INSTALL"
 }
diff --git a/BaseTools/Plugin/LinuxGcc5ToolChain/LinuxGcc5ToolChain.py b/BaseTools/Plugin/LinuxGcc5ToolChain/LinuxGcc5ToolChain.py
index a695fc328565..f0685d804029 100644
--- a/BaseTools/Plugin/LinuxGcc5ToolChain/LinuxGcc5ToolChain.py
+++ b/BaseTools/Plugin/LinuxGcc5ToolChain/LinuxGcc5ToolChain.py
@@ -80,7 +80,7 @@ class LinuxGcc5ToolChain(IUefiBuildPlugin):
                 return 0
 
             # make GCC5_AARCH64_PREFIX to align with tools_def.txt
-            prefix = os.path.join(install_path, "bin", "aarch64-linux-gnu-")
+            prefix = os.path.join(install_path, "bin", "aarch64-none-linux-gnu-")
             shell_environment.GetEnvironment().set_shell_var("GCC5_AARCH64_PREFIX", prefix)
 
         # now confirm it exists
-- 
2.31.1

Re: [edk2-devel] [PATCH v2 0/2] BaseTools: Switch ARM/AARCH64 CI gcc from Linaro to Arm

[PierreGondois]

[-- Attachment #1: Type: text/plain, Size: 126 bytes --]

Hi Rebecca,

I also reviewed/tested the patch:
Reviewed-by: Pierre Gondois <Pierre.Gondois@arm.com>

Regards,

Pierre

[-- Attachment #2: Type: text/html, Size: 158 bytes --]