2019-12-22 22:49:11 +00:00
|
|
|
From e3857998449fabedad2d5c7077a97ff7efa509ed Mon Sep 17 00:00:00 2001
|
2017-06-09 12:23:17 +00:00
|
|
|
From: Kevin Mihelich <kevin@archlinuxarm.org>
|
2017-07-04 18:33:40 +00:00
|
|
|
Date: Tue, 4 Jul 2017 11:54:39 -0600
|
2019-07-01 14:16:10 +00:00
|
|
|
Subject: [PATCH 1/2] ARM toolchain fixes
|
2017-06-09 12:23:17 +00:00
|
|
|
|
|
|
|
---
|
2017-07-04 18:33:40 +00:00
|
|
|
chromium/build/toolchain/linux/BUILD.gn | 24 ++++++++++--------------
|
|
|
|
1 file changed, 10 insertions(+), 14 deletions(-)
|
2017-06-09 12:23:17 +00:00
|
|
|
|
|
|
|
diff --git a/chromium/build/toolchain/linux/BUILD.gn b/chromium/build/toolchain/linux/BUILD.gn
|
2019-12-22 22:49:11 +00:00
|
|
|
index fa8b17e9db3..7398b7556ec 100644
|
2017-06-09 12:23:17 +00:00
|
|
|
--- a/chromium/build/toolchain/linux/BUILD.gn
|
|
|
|
+++ b/chromium/build/toolchain/linux/BUILD.gn
|
2019-12-22 22:49:11 +00:00
|
|
|
@@ -30,15 +30,13 @@ clang_toolchain("clang_arm64") {
|
2017-07-04 18:33:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
gcc_toolchain("arm64") {
|
|
|
|
- toolprefix = "aarch64-linux-gnu-"
|
|
|
|
-
|
|
|
|
- cc = "${toolprefix}gcc"
|
|
|
|
- cxx = "${toolprefix}g++"
|
|
|
|
+ cc = "gcc"
|
|
|
|
+ cxx = "g++"
|
|
|
|
|
|
|
|
- ar = "${toolprefix}ar"
|
|
|
|
+ ar = "ar"
|
|
|
|
ld = cxx
|
|
|
|
- readelf = "${toolprefix}readelf"
|
|
|
|
- nm = "${toolprefix}nm"
|
|
|
|
+ readelf = "readelf"
|
|
|
|
+ nm = "nm"
|
|
|
|
|
|
|
|
toolchain_args = {
|
|
|
|
current_cpu = "arm64"
|
2019-12-22 22:49:11 +00:00
|
|
|
@@ -48,15 +46,13 @@ gcc_toolchain("arm64") {
|
2017-06-09 12:23:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
gcc_toolchain("arm") {
|
|
|
|
- toolprefix = "arm-linux-gnueabihf-"
|
2017-07-04 18:33:40 +00:00
|
|
|
-
|
|
|
|
- cc = "${toolprefix}gcc"
|
|
|
|
- cxx = "${toolprefix}g++"
|
|
|
|
+ cc = "gcc"
|
|
|
|
+ cxx = "g++"
|
2017-06-09 12:23:17 +00:00
|
|
|
|
2017-07-04 18:33:40 +00:00
|
|
|
- ar = "${toolprefix}ar"
|
|
|
|
+ ar = "ar"
|
|
|
|
ld = cxx
|
|
|
|
- readelf = "${toolprefix}readelf"
|
|
|
|
- nm = "${toolprefix}nm"
|
|
|
|
+ readelf = "readelf"
|
|
|
|
+ nm = "nm"
|
2017-06-09 12:23:17 +00:00
|
|
|
|
|
|
|
toolchain_args = {
|
2017-07-04 18:33:40 +00:00
|
|
|
current_cpu = "arm"
|
2017-06-09 12:23:17 +00:00
|
|
|
--
|
2019-12-22 22:49:11 +00:00
|
|
|
2.24.0
|
2017-06-09 12:23:17 +00:00
|
|
|
|