From a6cb053026e468ddb06a03455df0cdfbe615ad18 Mon Sep 17 00:00:00 2001 From: Shenghou Ma Date: Thu, 8 Jan 2015 21:49:28 -0500 Subject: [PATCH] syscall: fix nacl builds Please see golang.org/cl/2588 for reasons behind the name change. We also need NO_LOCAL_POINTERS for assembly function with non-zero local frame size. Change-Id: Iac60aa7e76f4c2ece3726e28878fd539bfebf7a4 Reviewed-on: https://go-review.googlesource.com/2589 Reviewed-by: Ian Lance Taylor --- src/syscall/asm_nacl_386.s | 3 ++- src/syscall/asm_nacl_amd64p32.s | 2 +- src/syscall/asm_nacl_arm.s | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/syscall/asm_nacl_386.s b/src/syscall/asm_nacl_386.s index cb6fb44166..9d1e541c7c 100644 --- a/src/syscall/asm_nacl_386.s +++ b/src/syscall/asm_nacl_386.s @@ -16,7 +16,8 @@ #define NACL_SYSJMP(code) \ MOVL $(0x10000 + ((code)<<5)), AX; JMP AX -TEXT syscall·Syscall(SB),NOSPLIT,$12-28 +TEXT ·Syscall(SB),NOSPLIT,$12-28 + NO_LOCAL_POINTERS CALL runtime·entersyscall(SB) MOVL trap+0(FP), AX MOVL a1+4(FP), BX diff --git a/src/syscall/asm_nacl_amd64p32.s b/src/syscall/asm_nacl_amd64p32.s index 72391c431a..b8c097b539 100644 --- a/src/syscall/asm_nacl_amd64p32.s +++ b/src/syscall/asm_nacl_amd64p32.s @@ -16,7 +16,7 @@ #define NACL_SYSJMP(code) \ MOVL $(0x10000 + ((code)<<5)), AX; JMP AX -TEXT syscall·Syscall(SB),NOSPLIT,$0-28 +TEXT ·Syscall(SB),NOSPLIT,$0-28 CALL runtime·entersyscall(SB) MOVL trap+0(FP), AX MOVL a1+4(FP), DI diff --git a/src/syscall/asm_nacl_arm.s b/src/syscall/asm_nacl_arm.s index 78e10bf7a2..3e7df1aadf 100644 --- a/src/syscall/asm_nacl_arm.s +++ b/src/syscall/asm_nacl_arm.s @@ -16,7 +16,7 @@ #define NACL_SYSJMP(code) \ MOVW $(0x10000 + ((code)<<5)), R8; B (R8) -TEXT syscall·Syscall(SB),NOSPLIT,$0-28 +TEXT ·Syscall(SB),NOSPLIT,$0-28 BL runtime·entersyscall(SB) MOVW trap+0(FP), R8 MOVW a1+4(FP), R0 -- 2.50.0