diff options
| author | Yunlian Jiang <yunlian@google.com> | 2018-09-26 08:49:40 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-09-27 19:45:12 -0700 |
| commit | b54e42c61263fd299a3ca458c13936ad6b987506 (patch) | |
| tree | 9d739393cd49d481a15729810d0350e03e86e5aa /go | |
| parent | 8ba65ad049313928d4a2dba91598f269b26ba8bb (diff) | |
| download | toolchain-utils-b54e42c61263fd299a3ca458c13936ad6b987506.tar.gz | |
build_go: change ABI name for ARM32
This changes ABI name from armv7a-cros-linux-gnueabi to
armv7a-cros-linux-gnueabihf.
BUG=chromium:711369
TEST=build_go succeeds.
Change-Id: I6e7f1619e73fd70135c6e1e1cc787284d157f18f
Reviewed-on: https://chromium-review.googlesource.com/1246224
Commit-Ready: Yunlian Jiang <yunlian@chromium.org>
Tested-by: Yunlian Jiang <yunlian@chromium.org>
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
Diffstat (limited to 'go')
| -rwxr-xr-x | go/chromeos/build_go | 11 | ||||
| -rwxr-xr-x | go/chromeos/go_elm32 | 4 | ||||
| -rwxr-xr-x | go/chromeos/push_glibc | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/go/chromeos/build_go b/go/chromeos/build_go index 164ea3f7..0dec7dfd 100755 --- a/go/chromeos/build_go +++ b/go/chromeos/build_go @@ -6,7 +6,8 @@ set -e -o pipefail # Usage: build_go # # It assumes that the "x86_64-cros-linux-gnu" toolchain is already installed. -# It assumes that the "armv7a-cros-linux-gnueabi" toolchain is already installed. +# It assumes that the "armv7a-cros-linux-gnueabihf" toolchain is +# already installed. # It assumes that the "aarch64-cros-linux-gnu" toolchain is already installed. if [[ ! -e "make.bash" && -e "src/make.bash" ]] @@ -26,12 +27,12 @@ GOOS="linux" GOARCH="amd64" CGO_ENABLED="1" \ # Build the Go toolchain for arm targets. GOOS="linux" GOARCH="arm" CGO_ENABLED="1" \ - CC_FOR_TARGET="armv7a-cros-linux-gnueabi-clang" \ - CXX_FOR_TARGET="armv7a-cros-linux-gnueabi-clang++" \ + CC_FOR_TARGET="armv7a-cros-linux-gnueabihf-clang" \ + CXX_FOR_TARGET="armv7a-cros-linux-gnueabihf-clang++" \ ./make.bash --no-clean GOOS="linux" GOARCH="arm" CGO_ENABLED="1" \ - CC="armv7a-cros-linux-gnueabi-clang" \ - CXX="armv7a-cros-linux-gnueabi-clang++" \ + CC="armv7a-cros-linux-gnueabihf-clang" \ + CXX="armv7a-cros-linux-gnueabihf-clang++" \ ../bin/go install -v -buildmode=pie std # Build the Go toolchain for arm64 targets. diff --git a/go/chromeos/go_elm32 b/go/chromeos/go_elm32 index 2bcb3f3b..bf0b6592 100755 --- a/go/chromeos/go_elm32 +++ b/go/chromeos/go_elm32 @@ -6,6 +6,6 @@ # This is just an example for an arm board. GOOS="linux" GOARCH="arm" CGO_ENABLED="1" \ - CC="armv7a-cros-linux-gnueabi-clang" \ - CXX="armv7a-cros-linux-gnueabi-clang++" \ + CC="armv7a-cros-linux-gnueabihf-clang" \ + CXX="armv7a-cros-linux-gnueabihf-clang++" \ exec go_target "$@" diff --git a/go/chromeos/push_glibc b/go/chromeos/push_glibc index 7528284c..97f010b5 100755 --- a/go/chromeos/push_glibc +++ b/go/chromeos/push_glibc @@ -23,7 +23,7 @@ do aarch64) glibc="/usr/aarch64-cros-linux-gnu/lib64" loader="ld-linux-aarch64.so.1" - glibc32="/usr/armv7a-cros-linux-gnueabi/lib" + glibc32="/usr/armv7a-cros-linux-gnueabihf/lib" loader32="ld-linux-armhf.so.3" ;; *) |