Commit 3c94b1d3 authored by Russ Cox's avatar Russ Cox

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
parent 665a4166
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include "textflag.h" #include "textflag.h"
extern byte runtime·end[]; extern byte runtime·end[];
#pragma dataflag NOPTR
static byte *bloc = { runtime·end }; static byte *bloc = { runtime·end };
static Mutex memlock; static Mutex memlock;
......
...@@ -21,5 +21,5 @@ TEXT _fallback_vdso(SB),NOSPLIT,$0 ...@@ -21,5 +21,5 @@ TEXT _fallback_vdso(SB),NOSPLIT,$0
RET RET
DATA runtime·_vdso(SB)/4, $_fallback_vdso(SB) DATA runtime·_vdso(SB)/4, $_fallback_vdso(SB)
GLOBL runtime·_vdso(SB), $4 GLOBL runtime·_vdso(SB), NOPTR, $4
...@@ -77,7 +77,7 @@ DATA bad_abi_msg+0x18(SB)/8, $" run on " ...@@ -77,7 +77,7 @@ DATA bad_abi_msg+0x18(SB)/8, $" run on "
DATA bad_abi_msg+0x20(SB)/8, $"EABI ker" DATA bad_abi_msg+0x20(SB)/8, $"EABI ker"
DATA bad_abi_msg+0x28(SB)/4, $"nels" DATA bad_abi_msg+0x28(SB)/4, $"nels"
DATA bad_abi_msg+0x2c(SB)/1, $0xa DATA bad_abi_msg+0x2c(SB)/1, $0xa
GLOBL bad_abi_msg(SB), $45 GLOBL bad_abi_msg(SB), RODATA, $45
TEXT oabi_syscall<>(SB),NOSPLIT,$-4 TEXT oabi_syscall<>(SB),NOSPLIT,$-4
ADD $1, PC, R4 ADD $1, PC, R4
......
...@@ -17,7 +17,7 @@ TEXT _rt0_386_plan9(SB),NOSPLIT,$12 ...@@ -17,7 +17,7 @@ TEXT _rt0_386_plan9(SB),NOSPLIT,$12
CALL runtime·rt0_go(SB) CALL runtime·rt0_go(SB)
DATA runtime·isplan9(SB)/4, $1 DATA runtime·isplan9(SB)/4, $1
GLOBL runtime·isplan9(SB), $4 GLOBL runtime·isplan9(SB), NOPTR, $4
GLOBL _tos(SB), $4 GLOBL _tos(SB), NOPTR, $4
GLOBL _privates(SB), $4 GLOBL _privates(SB), NOPTR, $4
GLOBL _nprivates(SB), $4 GLOBL _nprivates(SB), NOPTR, $4
...@@ -15,7 +15,7 @@ TEXT _rt0_amd64_plan9(SB),NOSPLIT,$24 ...@@ -15,7 +15,7 @@ TEXT _rt0_amd64_plan9(SB),NOSPLIT,$24
JMP AX JMP AX
DATA runtime·isplan9(SB)/4, $1 DATA runtime·isplan9(SB)/4, $1
GLOBL runtime·isplan9(SB), $4 GLOBL runtime·isplan9(SB), NOPTR, $4
GLOBL _tos(SB), $8 GLOBL _tos(SB), NOPTR, $8
GLOBL _privates(SB), $8 GLOBL _privates(SB), NOPTR, $8
GLOBL _nprivates(SB), $4 GLOBL _nprivates(SB), NOPTR, $4
...@@ -15,4 +15,4 @@ TEXT main(SB),NOSPLIT,$-8 ...@@ -15,4 +15,4 @@ TEXT main(SB),NOSPLIT,$-8
JMP AX JMP AX
DATA runtime·issolaris(SB)/4, $1 DATA runtime·issolaris(SB)/4, $1
GLOBL runtime·issolaris(SB), $4 GLOBL runtime·issolaris(SB), NOPTR, $4
...@@ -378,4 +378,4 @@ TEXT runtime·closeonexec(SB),NOSPLIT,$32 ...@@ -378,4 +378,4 @@ TEXT runtime·closeonexec(SB),NOSPLIT,$32
NEGL AX NEGL AX
RET RET
GLOBL runtime·tlsoffset(SB),$4 GLOBL runtime·tlsoffset(SB),NOPTR,$4
...@@ -388,4 +388,4 @@ TEXT runtime·closeonexec(SB),NOSPLIT,$32 ...@@ -388,4 +388,4 @@ TEXT runtime·closeonexec(SB),NOSPLIT,$32
NEGL AX NEGL AX
RET RET
GLOBL runtime·tlsoffset(SB),$4 GLOBL runtime·tlsoffset(SB),NOPTR,$4
...@@ -350,7 +350,7 @@ TEXT runtime·sysctl(SB),NOSPLIT,$28 ...@@ -350,7 +350,7 @@ TEXT runtime·sysctl(SB),NOSPLIT,$28
MOVL $0, AX MOVL $0, AX
RET RET
GLOBL runtime·tlsoffset(SB),$4 GLOBL runtime·tlsoffset(SB),NOPTR,$4
// int32 runtime·kqueue(void) // int32 runtime·kqueue(void)
TEXT runtime·kqueue(SB),NOSPLIT,$0 TEXT runtime·kqueue(SB),NOSPLIT,$0
......
...@@ -395,4 +395,4 @@ TEXT runtime·closeonexec(SB),NOSPLIT,$32 ...@@ -395,4 +395,4 @@ TEXT runtime·closeonexec(SB),NOSPLIT,$32
NEGL AX NEGL AX
RET RET
GLOBL runtime·tlsoffset(SB),$4 GLOBL runtime·tlsoffset(SB),NOPTR,$4
...@@ -212,7 +212,7 @@ TEXT runtime·externalthreadhandler(SB),NOSPLIT,$0 ...@@ -212,7 +212,7 @@ TEXT runtime·externalthreadhandler(SB),NOSPLIT,$0
POPL BP POPL BP
RET RET
GLOBL runtime·cbctxts(SB), $4 GLOBL runtime·cbctxts(SB), NOPTR, $4
TEXT runtime·callbackasm1+0(SB),NOSPLIT,$0 TEXT runtime·callbackasm1+0(SB),NOSPLIT,$0
MOVL 0(SP), AX // will use to find our callback context MOVL 0(SP), AX // will use to find our callback context
......
...@@ -249,7 +249,7 @@ TEXT runtime·externalthreadhandler(SB),NOSPLIT,$0 ...@@ -249,7 +249,7 @@ TEXT runtime·externalthreadhandler(SB),NOSPLIT,$0
POPQ BP POPQ BP
RET RET
GLOBL runtime·cbctxts(SB), $8 GLOBL runtime·cbctxts(SB), NOPTR, $8
TEXT runtime·callbackasm1(SB),NOSPLIT,$0 TEXT runtime·callbackasm1(SB),NOSPLIT,$0
// Construct args vector for cgocallback(). // Construct args vector for cgocallback().
......
...@@ -194,4 +194,4 @@ TEXT slowCheck64<>(SB),NOSPLIT,$0-0 ...@@ -194,4 +194,4 @@ TEXT slowCheck64<>(SB),NOSPLIT,$0-0
MOVW R0, ok64<>(SB) MOVW R0, ok64<>(SB)
RET RET
GLOBL ok64<>(SB), $4 GLOBL ok64<>(SB), NOPTR, $4
...@@ -124,7 +124,7 @@ TEXT kernelCAS64<>(SB),NOSPLIT,$0-21 ...@@ -124,7 +124,7 @@ TEXT kernelCAS64<>(SB),NOSPLIT,$0-21
TEXT ·generalCAS64(SB),NOSPLIT,$0-21 TEXT ·generalCAS64(SB),NOSPLIT,$0-21
B runtime·cas64(SB) B runtime·cas64(SB)
GLOBL armCAS64(SB), $4 GLOBL armCAS64(SB), NOPTR, $4
TEXT setupAndCallCAS64<>(SB),NOSPLIT,$-4-21 TEXT setupAndCallCAS64<>(SB),NOSPLIT,$-4-21
MOVW $0xffff0ffc, R0 // __kuser_helper_version MOVW $0xffff0ffc, R0 // __kuser_helper_version
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment