BaseTools: Switch to downloading the AARCH64 compiler from Arm's site

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 and fix LinuxGcc5ToolChain.py with the
new GCC_AARCH64_PREFIX.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
Acked-by: Leif Lindholm <leif@nuviainc.com>
Acked-by: Liming Gao <gaoliming@byosoft.com.cn>
Acked-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Pierre Gondois <Pierre.Gondois@arm.com>
Acked-by: Bob Feng <bob.c.feng@intel.com>

diff --git a/BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml b/BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml
index e81223fd9ad18d4011c010f0b6998994eaa506f2..de7682b5521ff75158b5a8179e31a88712717f5b 100644 (file)
--- a/BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml
+++ b/BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml
@@ -1,5 +1,5 @@
 ## @file\r
-# Download GCC AARCH64 compiler from Linaro's release site\r
+# Download GCC AARCH64 compiler from Arm's release site\r
 # Set shell variable GCC5_AARCH64_INSTALL to this folder\r
 #\r
 # This is only downloaded when a build activates scope gcc_aarch64_linux\r
@@ -11,11 +11,11 @@
   "scope": "gcc_aarch64_linux",\r
   "type": "web",\r
   "name": "gcc_aarch64_linux",\r
-  "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",\r
-  "version": "7.4.1",\r
-  "sha256": "27f1dc2c491ed61ae8f0d4b0c11de59cd2f7dd9c94761ee7153006fcac1bf9ab",\r
+  "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",\r
+  "version": "10.3-2021.07",\r
+  "sha256": "1e33d53dea59c8de823bbdfe0798280bdcd138636c7060da9d77a97ded095a84",\r
   "compression_type": "tar",\r
-  "internal_path": "/gcc-linaro-7.4.1-2019.02-x86_64_aarch64-linux-gnu/",\r
+  "internal_path": "/gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu/",\r
   "flags": ["set_shell_var", ],\r
   "var_name": "GCC5_AARCH64_INSTALL"\r
 }\r

diff --git a/BaseTools/Plugin/LinuxGcc5ToolChain/LinuxGcc5ToolChain.py b/BaseTools/Plugin/LinuxGcc5ToolChain/LinuxGcc5ToolChain.py
index a695fc328565670b387d17243b86d3eb8852b6ee..f0685d80402918c35dfec436619e8a6c8b67c3b2 100644 (file)
--- a/BaseTools/Plugin/LinuxGcc5ToolChain/LinuxGcc5ToolChain.py
+++ b/BaseTools/Plugin/LinuxGcc5ToolChain/LinuxGcc5ToolChain.py
@@ -80,7 +80,7 @@ class LinuxGcc5ToolChain(IUefiBuildPlugin):
                 return 0\r
 \r
             # make GCC5_AARCH64_PREFIX to align with tools_def.txt\r
-            prefix = os.path.join(install_path, "bin", "aarch64-linux-gnu-")\r
+            prefix = os.path.join(install_path, "bin", "aarch64-none-linux-gnu-")\r
             shell_environment.GetEnvironment().set_shell_var("GCC5_AARCH64_PREFIX", prefix)\r
 \r
         # now confirm it exists\r