diff options
| author | Russ Cox <rsc@golang.org> | 2014-09-24 19:04:06 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2014-09-24 19:04:06 -0400 |
| commit | 3c94b1d305967d260b31ec3fdda51b705db752cd (patch) | |
| tree | c18deddc45cc1d2732f6e56b940591ab42f26d38 /src/sync/atomic | |
| parent | 665a4166650d088c067130eb41f8f95efb9c12ed (diff) | |
| download | go-3c94b1d305967d260b31ec3fdda51b705db752cd.tar.xz | |
runtime: more NOPTR
Fixes linux builds (_vdso); may fix others.
I can at least cross-compile cmd/go for every
implemented system now.
TBR=iant
CC=golang-codereviews
https://golang.org/cl/142630043
Diffstat (limited to 'src/sync/atomic')
| -rw-r--r-- | src/sync/atomic/asm_arm.s | 2 | ||||
| -rw-r--r-- | src/sync/atomic/asm_linux_arm.s | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/sync/atomic/asm_arm.s b/src/sync/atomic/asm_arm.s index 47639a80ea..8a85273da2 100644 --- a/src/sync/atomic/asm_arm.s +++ b/src/sync/atomic/asm_arm.s @@ -194,4 +194,4 @@ TEXT slowCheck64<>(SB),NOSPLIT,$0-0 MOVW R0, ok64<>(SB) RET -GLOBL ok64<>(SB), $4 +GLOBL ok64<>(SB), NOPTR, $4 diff --git a/src/sync/atomic/asm_linux_arm.s b/src/sync/atomic/asm_linux_arm.s index 63f1f9e38e..944758441a 100644 --- a/src/sync/atomic/asm_linux_arm.s +++ b/src/sync/atomic/asm_linux_arm.s @@ -124,7 +124,7 @@ TEXT kernelCAS64<>(SB),NOSPLIT,$0-21 TEXT ·generalCAS64(SB),NOSPLIT,$0-21 B runtime·cas64(SB) -GLOBL armCAS64(SB), $4 +GLOBL armCAS64(SB), NOPTR, $4 TEXT setupAndCallCAS64<>(SB),NOSPLIT,$-4-21 MOVW $0xffff0ffc, R0 // __kuser_helper_version |
