build: fixes for native arm build

R=kaib
CC=golang-dev
https://golang.org/cl/2254044

diff --git a/src/Make.inc b/src/Make.inc
index 3544f26ca4018865b044c983a878766116b603a7..6af9145f9eff371584a53a6c87cb1f84fe3efa5c 100644 (file)
--- a/src/Make.inc
+++ b/src/Make.inc
@@ -42,7 +42,7 @@ ifeq ($(GOOS),darwin)
 GOARCH:=${shell if sysctl machdep.cpu.extfeatures | grep EM64T >/dev/null; then echo amd64; else uname -m | sed 's/i386/386/'; fi}
 else
 # Ask uname -m for the processor.
-GOARCH:=${shell uname -m | sed 's/^..86$$/386/; s/^.86$$/386/; s/x86_64/amd64/'}
+GOARCH:=${shell uname -m | sed 's/^..86$$/386/; s/^.86$$/386/; s/x86_64/amd64/; s/arm.*/arm/'}
 endif
 endif
 

diff --git a/test/run b/test/run
index f4765d7faef9202bc00a6f615a320f094c06ea3c..016094c90af7bcf91502cec79f002c2a05f7a155 100755 (executable)
--- a/test/run
+++ b/test/run
@@ -14,7 +14,7 @@ X386)
        ;;
 Xarm)
        export A=5
-       export E=${GORUN:-qemu-arm -cpu cortex-a8}
+       export E="$GORUN"
        ;;
 *)
        echo 1>&2 run: unsupported '$GOARCH'

diff --git a/test/run-arm b/test/run-arm
index a62df10ca4b953a5bb93e1e76713c53964078fb0..b3e3307ed95ba2822df8222e76a341ca849ed937 100755 (executable)
--- a/test/run-arm
+++ b/test/run-arm
@@ -13,7 +13,7 @@ X386)
        ;;
 Xarm)
        export A=5
-       export E="${GORUN:-qemu-arm -cpu cortex-a8}"
+       export E="$GORUN"
        ;;
 *)
        echo 1>&2 run: unsupported '$GOARCH'