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

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 and fix LinuxGcc5ToolChain.py with the
new GCC_ARM_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_arm_linux_ext_dep.yaml b/BaseTools/Bin/gcc_arm_linux_ext_dep.yaml
index 09481ceae05f56915bd758b847121cb0f122258a..9b3c4e394fa1f1f4ab53a153c9176a381cd3f47c 100644 (file)
--- a/BaseTools/Bin/gcc_arm_linux_ext_dep.yaml
+++ b/BaseTools/Bin/gcc_arm_linux_ext_dep.yaml
@@ -1,5 +1,5 @@
 ## @file\r
-# Download GCC ARM compiler from Linaro's release site\r
+# Download GCC ARM compiler from Arm's release site\r
 # Set shell variable GCC5_ARM_INSTALL to this folder\r
 #\r
 # This is only downloaded when a build activates scope gcc_arm_linux\r
@@ -11,11 +11,11 @@
   "scope": "gcc_arm_linux",\r
   "type": "web",\r
   "name": "gcc_arm_linux",\r
-  "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",\r
-  "version": "7.4.1",\r
-  "sha256": "3C951CF1941D0FA06D64CC0D5E88612B209D8123B273FA26C16D70BD7BC6B163",\r
+  "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",\r
+  "version": "10.3-2021.07",\r
+  "sha256": "aa074fa8371a4f73fecbd16bd62c8b1945f23289e26414794f130d6ccdf8e39c",\r
   "compression_type": "tar",\r
-  "internal_path": "/gcc-linaro-7.4.1-2019.02-x86_64_arm-linux-gnueabihf/",\r
+  "internal_path": "/gcc-arm-10.3-2021.07-x86_64-arm-none-linux-gnueabihf/",\r
   "flags": ["set_shell_var", ],\r
   "var_name": "GCC5_ARM_INSTALL"\r
 }\r

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