From: Carl Shapiro <cshapiro@google.com>
Date: Wed, 14 Aug 2013 22:21:53 +0000 (-0700)
Subject: cmd/go, runtime/cgo: explicitly target ARMv5T
X-Git-Tag: go1.2rc2~565
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=3ec0427a074ccb31e2e4824f27aee9c8fe6de65d;p=gostls13.git

cmd/go, runtime/cgo: explicitly target ARMv5T

The baseline architecture had been left to the GCC configured
default which can be more accomodating than the rest of the Go
toolchain.  This prevented instructions used by the 5g compiler,
like BLX, from being used in GCC compiled assembler code.

R=golang-dev, dave, rsc, elias.naur, cshapiro
CC=golang-dev
https://golang.org/cl/12954043
---

diff --git a/src/cmd/go/build.go b/src/cmd/go/build.go
index c4b4f6ca55..9c3693abb3 100644
--- a/src/cmd/go/build.go
+++ b/src/cmd/go/build.go
@@ -1837,7 +1837,7 @@ func (b *builder) gccArchArgs() []string {
 	case "6":
 		return []string{"-m64"}
 	case "5":
-		return []string{"-marm"} // not thumb
+		return []string{"-marm", "-march=armv5t"} // not thumb
 	}
 	return nil
 }
diff --git a/src/pkg/runtime/cgo/gcc_arm.S b/src/pkg/runtime/cgo/gcc_arm.S
index be50408825..cfe899b1d2 100644
--- a/src/pkg/runtime/cgo/gcc_arm.S
+++ b/src/pkg/runtime/cgo/gcc_arm.S
@@ -25,12 +25,8 @@ EXT(crosscall_arm2):
 	mov r5, r1
 	mov r0, r2
 	mov r1, r3
-	// setmg(m, g)
-	mov lr, pc
-	mov pc, r5
-	// fn()
-	mov lr, pc
-	mov pc, r4
+	blx r5 // setmg(m, g) 
+	blx r4 // fn() 
 	pop {r4, r5, r6, r7, r8, r9, r10, r11, ip, pc}
 
 .globl EXT(__stack_chk_fail_local)