summaryrefslogtreecommitdiffstats
path: root/BaseTools
diff options
context:
space:
mode:
authorRebecca Cran <rebecca@bsdio.com>2021-08-30 13:14:50 +0800
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2021-09-29 11:41:36 +0000
commit1ce6ceb75bc7b8c3f60c99e79a8373731d3509a4 (patch)
tree6e1fd6ed62071f365d56d6ef25b27c53ad960d65 /BaseTools
parent2ea0a0a414182b5955461a6d68da43a832274a1c (diff)
downloadedk2-1ce6ceb75bc7b8c3f60c99e79a8373731d3509a4.tar.gz
edk2-1ce6ceb75bc7b8c3f60c99e79a8373731d3509a4.tar.bz2
edk2-1ce6ceb75bc7b8c3f60c99e79a8373731d3509a4.zip
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>
Diffstat (limited to 'BaseTools')
-rw-r--r--BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml10
-rw-r--r--BaseTools/Plugin/LinuxGcc5ToolChain/LinuxGcc5ToolChain.py2
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 e81223fd9a..de7682b552 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 a695fc3285..f0685d8040 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