From a5cb76243af54a6729f5668317fb87baa242b9cc Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Wed, 2 Sep 2015 11:23:15 +1200 Subject: cmd/internal/obj, cmd/link, runtime: lots of TLS cleanup It's particularly nice to get rid of the android special cases in the linker. Change-Id: I516363af7ce8a6b2f196fe49cb8887ac787a6dad Reviewed-on: https://go-review.googlesource.com/14197 Run-TryBot: Michael Hudson-Doyle TryBot-Result: Gobot Gobot Reviewed-by: Ian Lance Taylor --- src/runtime/asm_arm64.s | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/runtime/asm_arm64.s') diff --git a/src/runtime/asm_arm64.s b/src/runtime/asm_arm64.s index 797c95eaba..2f2d8ca43d 100644 --- a/src/runtime/asm_arm64.s +++ b/src/runtime/asm_arm64.s @@ -36,9 +36,9 @@ TEXT runtime·rt0_go(SB),NOSPLIT,$0 MRS_TPIDR_R0 // load TLS base pointer MOVD R0, R3 // arg 3: TLS base pointer #ifdef TLSG_IS_VARIABLE - MOVD $runtime·tls_g(SB), R2 // arg 2: tlsg + MOVD $runtime·tls_g(SB), R2 // arg 2: &tls_g #else - MOVD $0x10, R2 // arg 2: tlsg TODO(minux): hardcoded for linux + MOVD 0, R2 // arg 2: not used when using platform's TLS #endif MOVD $setg_gcc<>(SB), R1 // arg 1: setg MOVD g, R0 // arg 0: G -- cgit v1.3-5-g9baa