cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump Go to 1.15beta1.

Browse Source 
- Add a permissions fix from sthen@
- Remove patches as they are not needed now

Tested on amd64, arm64, armv7 and i386 (ty sthen!).

armv7 has an intermittent issue with tests.

OK sthen, jsing
This commit is contained in:
abieber 2020-07-17 18:19:17 +00:00
parent 65bd229722
commit dee78dc62d
9 changed files with 1059 additions and 1324 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lang/go/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.87 2020/03/20 11:23:08 jsing Exp $
# $OpenBSD: Makefile,v 1.88 2020/07/17 18:19:17 abieber Exp $
ONLY_FOR_ARCHS = ${GO_ARCHS}
@ -7,7 +7,7 @@ BIN_BOOTSTRAP_VERSION = 1.13.9
COMMENT = Go programming language
VERSION = 1.13.9
VERSION = 1.15beta1
DISTNAME = go${VERSION}.src
PKGNAME = go-${VERSION}
PKGSPEC = ${FULLPKGNAME:S/go-/go-=/}

4
lang/go/distinfo
View File

@ -1,6 +1,6 @@
SHA256 (go-openbsd-arm-bootstrap-1.13.9.tar.gz) = j+uAyYE4OsdncBvt6YDTXhjGc9gQq0XCjmSUdOesiq8=
SHA256 (go-openbsd-arm64-bootstrap-1.13.9.tar.gz) = 84YoDEuNNmXbGCSzP8g5X1zqPdoOPB8yW71vsUL+5jw=
SHA256 (go1.13.9.src.tar.gz) = NLsZ2AbgvErY9QiuJLreXp/t+lPQm+Y7SIqTFNLU8x0=
SHA256 (go1.15beta1.src.tar.gz) = eM2oTUIXrg/bj4eEhHS+KGRL3BqhZXkFX4UpmaR5OsA=
SIZE (go-openbsd-arm-bootstrap-1.13.9.tar.gz) = 120208513
SIZE (go-openbsd-arm64-bootstrap-1.13.9.tar.gz) = 118521763
SIZE (go1.13.9.src.tar.gz) = 21700289
SIZE (go1.15beta1.src.tar.gz) = 22940913

5
lang/go/go.port.mk
View File

@ -1,4 +1,4 @@
# $OpenBSD: go.port.mk,v 1.33 2020/06/25 13:57:45 abieber Exp $
# $OpenBSD: go.port.mk,v 1.34 2020/07/17 18:19:17 abieber Exp $
ONLY_FOR_ARCHS ?= ${GO_ARCHS}
@ -60,6 +60,7 @@ MODGO_TEST_CMD += -ldflags="${MODGO_LDFLAGS}"
EXTRACT_SUFX ?= .zip
PKGNAME ?= ${DISTNAME:S/-v/-/}
ALL_TARGET ?= ${MODGO_MODNAME}
MODGO_FLAGS += -modcacherw
DISTFILES = ${DISTNAME}${EXTRACT_SUFX}{${MODGO_VERSION}${EXTRACT_SUFX}}
EXTRACT_ONLY = ${DISTNAME}${EXTRACT_SUFX}
MASTER_SITES ?= ${MASTER_SITE_ATHENS}${MODGO_MODNAME}/@v/
@ -72,8 +73,6 @@ DISTFILES += ${MODGO_DIST_SUBDIR}/${_modpath}/@v/${_modver}.mod{${_modpath}/@v/$
. endfor
MAKE_ENV += GOPROXY=file://${DISTDIR}/${MODGO_DIST_SUBDIR}
MAKE_ENV += GO111MODULE=on GOPATH="${MODGO_GOPATH}"
# Workaround for https://github.com/golang/go/issues/27455
FIX_CLEANUP_PERMISSIONS = Yes
.else
# ports are not allowed to fetch from the network at build time; point
# GOPROXY at an unreachable host so that failures are also visible to

23
lang/go/patches/patch-src_os_signal_signal_cgo_test_go
View File

@ -1,23 +0,0 @@
$OpenBSD: patch-src_os_signal_signal_cgo_test_go,v 1.2 2019/03/16 13:37:29 jsing Exp $
Index: src/os/signal/signal_cgo_test.go
--- src/os/signal/signal_cgo_test.go.orig
+++ src/os/signal/signal_cgo_test.go
@@ -20,6 +20,7 @@ import (
"os"
"os/exec"
"os/signal/internal/pty"
+ "runtime"
"strconv"
"strings"
"sync"
@@ -29,6 +30,9 @@ import (
)
func TestTerminalSignal(t *testing.T) {
+ if runtime.GOOS == "openbsd" && runtime.GOARCH == "386" {
+ t.Skip("Skipping - fails on openbsd/386")
+ }
const enteringRead = "test program entering read"
if os.Getenv("GO_TEST_TERMINAL_SIGNALS") != "" {
var b [1]byte

253
lang/go/patches/patch-src_runtime_sys_openbsd_arm64_s
View File

@ -1,253 +0,0 @@
$OpenBSD: patch-src_runtime_sys_openbsd_arm64_s,v 1.1 2020/02/04 17:22:42 jsing Exp $
Index: src/runtime/sys_openbsd_arm64.s
--- src/runtime/sys_openbsd_arm64.s.orig
+++ src/runtime/sys_openbsd_arm64.s
@@ -13,11 +13,15 @@
#define CLOCK_REALTIME $0
#define CLOCK_MONOTONIC $3
+#define NOOP WORD $0xd503201f
+
// Exit the entire program (like C exit)
TEXT runtime·exit(SB),NOSPLIT|NOFRAME,$0
MOVW code+0(FP), R0 // arg 1 - status
MOVD $1, R8 // sys_exit
SVC
+ NOOP
+ NOOP
BCC 3(PC)
MOVD $0, R0 // crash on syscall failure
MOVD R0, (R0)
@@ -28,6 +32,8 @@ TEXT runtime·exitThread(SB),NOSPLIT,$0
MOVD wait+0(FP), R0 // arg 1 - notdead
MOVD $302, R8 // sys___threxit
SVC
+ NOOP
+ NOOP
MOVD $0, R0 // crash on syscall failure
MOVD R0, (R0)
JMP 0(PC)
@@ -38,6 +44,8 @@ TEXT runtime·open(SB),NOSPLIT|NOFRAME,$0
MOVW perm+12(FP), R2 // arg 3 - perm
MOVD $5, R8 // sys_open
SVC
+ NOOP
+ NOOP
BCC 2(PC)
MOVW $-1, R0
MOVW R0, ret+16(FP)
@@ -47,6 +55,8 @@ TEXT runtime·closefd(SB),NOSPLIT|NOFRAME,$0
MOVW fd+0(FP), R0 // arg 1 - fd
MOVD $6, R8 // sys_close
SVC
+ NOOP
+ NOOP
BCC 2(PC)
MOVW $-1, R0
MOVW R0, ret+8(FP)
@@ -58,6 +68,8 @@ TEXT runtime·read(SB),NOSPLIT|NOFRAME,$0
MOVW n+16(FP), R2 // arg 3 - nbyte
MOVD $3, R8 // sys_read
SVC
+ NOOP
+ NOOP
BCC 2(PC)
MOVW $-1, R0
MOVW R0, ret+24(FP)
@@ -69,6 +81,8 @@ TEXT runtime·write(SB),NOSPLIT|NOFRAME,$0
MOVW n+16(FP), R2 // arg 3 - nbyte
MOVD $4, R8 // sys_write
SVC
+ NOOP
+ NOOP
BCC 2(PC)
MOVW $-1, R0
MOVW R0, ret+24(FP)
@@ -90,25 +104,35 @@ TEXT runtime·usleep(SB),NOSPLIT,$24-4
MOVD $0, R1 // arg 2 - rmtp
MOVD $91, R8 // sys_nanosleep
SVC
+ NOOP
+ NOOP
RET
TEXT runtime·raise(SB),NOSPLIT,$0
MOVD $299, R8 // sys_getthrid
SVC
+ NOOP
+ NOOP
// arg 1 - tid, already in R0
MOVW sig+0(FP), R1 // arg 2 - signum
MOVW $0, R2 // arg 3 - tcb
MOVD $119, R8 // sys_thrkill
SVC
+ NOOP
+ NOOP
RET
TEXT runtime·raiseproc(SB),NOSPLIT,$0
MOVD $20, R8 // sys_getpid
SVC
+ NOOP
+ NOOP
// arg 1 - pid, already in R0
MOVW sig+0(FP), R1 // arg 2 - signum
MOVD $122, R8 // sys_kill
SVC
+ NOOP
+ NOOP
RET
TEXT runtime·mmap(SB),NOSPLIT,$0
@@ -121,6 +145,8 @@ TEXT runtime·mmap(SB),NOSPLIT,$0
MOVW off+28(FP), R6 // arg 7 - offset
MOVD $197, R8 // sys_mmap
SVC
+ NOOP
+ NOOP
MOVD $0, R1
BCC 3(PC)
MOVD R0, R1 // if error, move to R1
@@ -134,6 +160,8 @@ TEXT runtime·munmap(SB),NOSPLIT,$0
MOVD n+8(FP), R1 // arg 2 - len
MOVD $73, R8 // sys_munmap
SVC
+ NOOP
+ NOOP
BCC 3(PC)
MOVD $0, R0 // crash on syscall failure
MOVD R0, (R0)
@@ -145,6 +173,8 @@ TEXT runtime·madvise(SB),NOSPLIT,$0
MOVW flags+16(FP), R2 // arg 2 - flags
MOVD $75, R8 // sys_madvise
SVC
+ NOOP
+ NOOP
BCC 2(PC)
MOVW $-1, R0
MOVW R0, ret+24(FP)
@@ -156,6 +186,8 @@ TEXT runtime·setitimer(SB),NOSPLIT,$0
MOVD old+16(FP), R2 // arg 3 - old value
MOVD $69, R8 // sys_setitimer
SVC
+ NOOP
+ NOOP
RET
// func walltime() (sec int64, nsec int32)
@@ -164,6 +196,8 @@ TEXT runtime·walltime(SB), NOSPLIT, $32
MOVD $8(RSP), R1 // arg 2 - tp
MOVD $87, R8 // sys_clock_gettime
SVC
+ NOOP
+ NOOP
MOVD 8(RSP), R0 // sec
MOVD 16(RSP), R1 // nsec
@@ -179,6 +213,8 @@ TEXT runtime·nanotime(SB),NOSPLIT,$32
MOVD $8(RSP), R1 // arg 2 - tp
MOVD $87, R8 // sys_clock_gettime
SVC
+ NOOP
+ NOOP
MOVW 8(RSP), R3 // sec
MOVW 16(RSP), R5 // nsec
@@ -195,6 +231,8 @@ TEXT runtime·sigaction(SB),NOSPLIT,$0
MOVD old+16(FP), R2 // arg 3 - old sigaction
MOVD $46, R8 // sys_sigaction
SVC
+ NOOP
+ NOOP
BCC 3(PC)
MOVD $3, R0 // crash on syscall failure
MOVD R0, (R0)
@@ -205,6 +243,8 @@ TEXT runtime·obsdsigprocmask(SB),NOSPLIT,$0
MOVW new+4(FP), R1 // arg 2 - new
MOVD $48, R8 // sys_sigprocmask
SVC
+ NOOP
+ NOOP
BCC 3(PC)
MOVD $3, R8 // crash on syscall failure
MOVD R8, (R8)
@@ -289,6 +329,8 @@ TEXT runtime·tfork(SB),NOSPLIT,$0
MOVD psize+8(FP), R1 // arg 2 - psize
MOVD $8, R8 // sys___tfork
SVC
+ NOOP
+ NOOP
// Return if syscall failed.
BCC 4(PC)
@@ -319,6 +361,8 @@ TEXT runtime·sigaltstack(SB),NOSPLIT,$0
MOVD old+8(FP), R1 // arg 2 - old sigaltstack
MOVD $288, R8 // sys_sigaltstack
SVC
+ NOOP
+ NOOP
BCC 3(PC)
MOVD $0, R8 // crash on syscall failure
MOVD R8, (R8)
@@ -327,6 +371,8 @@ TEXT runtime·sigaltstack(SB),NOSPLIT,$0
TEXT runtime·osyield(SB),NOSPLIT,$0
MOVD $298, R8 // sys_sched_yield
SVC
+ NOOP
+ NOOP
RET
TEXT runtime·thrsleep(SB),NOSPLIT,$0
@@ -337,6 +383,8 @@ TEXT runtime·thrsleep(SB),NOSPLIT,$0
MOVD abort+32(FP), R4 // arg 5 - abort
MOVD $94, R8 // sys___thrsleep
SVC
+ NOOP
+ NOOP
MOVW R0, ret+40(FP)
RET
@@ -345,6 +393,8 @@ TEXT runtime·thrwakeup(SB),NOSPLIT,$0
MOVW n+8(FP), R1 // arg 2 - n
MOVD $301, R8 // sys___thrwakeup
SVC
+ NOOP
+ NOOP
MOVW R0, ret+16(FP)
RET
@@ -357,6 +407,8 @@ TEXT runtime·sysctl(SB),NOSPLIT,$0
MOVD ndst+40(FP), R5 // arg 6 - newlen
MOVD $202, R8 // sys___sysctl
SVC
+ NOOP
+ NOOP
BCC 2(PC)
NEG R0, R0
MOVW R0, ret+48(FP)
@@ -366,6 +418,8 @@ TEXT runtime·sysctl(SB),NOSPLIT,$0
TEXT runtime·kqueue(SB),NOSPLIT,$0
MOVD $269, R8 // sys_kqueue
SVC
+ NOOP
+ NOOP
BCC 2(PC)
NEG R0, R0
MOVW R0, ret+0(FP)
@@ -381,6 +435,8 @@ TEXT runtime·kevent(SB),NOSPLIT,$0
MOVD ts+40(FP), R5 // arg 6 - timeout
MOVD $72, R8 // sys_kevent
SVC
+ NOOP
+ NOOP
BCC 2(PC)
NEG R0, R0
MOVW R0, ret+48(FP)
@@ -393,4 +449,6 @@ TEXT runtime·closeonexec(SB),NOSPLIT,$0
MOVD $1, R2 // arg 3 - arg (FD_CLOEXEC)
MOVD $92, R8 // sys_fcntl
SVC
+ NOOP
+ NOOP
RET

263
lang/go/patches/patch-src_runtime_sys_openbsd_arm_s
View File

@ -1,263 +0,0 @@
$OpenBSD: patch-src_runtime_sys_openbsd_arm_s,v 1.3 2020/03/20 08:02:29 jsing Exp $
Index: src/runtime/sys_openbsd_arm.s
--- src/runtime/sys_openbsd_arm.s.orig
+++ src/runtime/sys_openbsd_arm.s
@@ -13,11 +13,15 @@
#define CLOCK_REALTIME $0
#define CLOCK_MONOTONIC $3
+#define NOOP MOVW R0, R0
+
// Exit the entire program (like C exit)
TEXT runtime·exit(SB),NOSPLIT|NOFRAME,$0
MOVW code+0(FP), R0 // arg 1 - status
MOVW $1, R12 // sys_exit
SWI $0
+ NOOP
+ NOOP
MOVW.CS $0, R8 // crash on syscall failure
MOVW.CS R8, (R8)
RET
@@ -27,6 +31,8 @@ TEXT runtime·exitThread(SB),NOSPLIT,$0-4
MOVW wait+0(FP), R0 // arg 1 - notdead
MOVW $302, R12 // sys___threxit
SWI $0
+ NOOP
+ NOOP
MOVW.CS $1, R8 // crash on syscall failure
MOVW.CS R8, (R8)
JMP 0(PC)
@@ -37,6 +43,8 @@ TEXT runtime·open(SB),NOSPLIT|NOFRAME,$0
MOVW perm+8(FP), R2 // arg 3 - perm
MOVW $5, R12 // sys_open
SWI $0
+ NOOP
+ NOOP
MOVW.CS $-1, R0
MOVW R0, ret+12(FP)
RET
@@ -45,6 +53,8 @@ TEXT runtime·closefd(SB),NOSPLIT|NOFRAME,$0
MOVW fd+0(FP), R0 // arg 1 - fd
MOVW $6, R12 // sys_close
SWI $0
+ NOOP
+ NOOP
MOVW.CS $-1, R0
MOVW R0, ret+4(FP)
RET
@@ -55,6 +65,8 @@ TEXT runtime·read(SB),NOSPLIT|NOFRAME,$0
MOVW n+8(FP), R2 // arg 3 - nbyte
MOVW $3, R12 // sys_read
SWI $0
+ NOOP
+ NOOP
MOVW.CS $-1, R0
MOVW R0, ret+12(FP)
RET
@@ -65,6 +77,8 @@ TEXT runtime·write(SB),NOSPLIT|NOFRAME,$0
MOVW n+8(FP), R2 // arg 3 - nbyte
MOVW $4, R12 // sys_write
SWI $0
+ NOOP
+ NOOP
MOVW.CS $-1, R0
MOVW R0, ret+12(FP)
RET
@@ -83,25 +97,35 @@ TEXT runtime·usleep(SB),NOSPLIT,$16
MOVW $0, R1 // arg 2 - rmtp
MOVW $91, R12 // sys_nanosleep
SWI $0
+ NOOP
+ NOOP
RET
TEXT runtime·raise(SB),NOSPLIT,$12
MOVW $299, R12 // sys_getthrid
SWI $0
+ NOOP
+ NOOP
// arg 1 - tid, already in R0
MOVW sig+0(FP), R1 // arg 2 - signum
MOVW $0, R2 // arg 3 - tcb
MOVW $119, R12 // sys_thrkill
SWI $0
+ NOOP
+ NOOP
RET
TEXT runtime·raiseproc(SB),NOSPLIT,$12
MOVW $20, R12
SWI $0 // sys_getpid
+ NOOP
+ NOOP
// arg 1 - pid, already in R0
MOVW sig+0(FP), R1 // arg 2 - signum
MOVW $122, R12 // sys_kill
SWI $0
+ NOOP
+ NOOP
RET
TEXT runtime·mmap(SB),NOSPLIT,$16
@@ -120,6 +144,8 @@ TEXT runtime·mmap(SB),NOSPLIT,$16
ADD $4, R13
MOVW $197, R12 // sys_mmap
SWI $0
+ NOOP
+ NOOP
SUB $4, R13
MOVW $0, R1
MOVW.CS R0, R1 // if error, move to R1
@@ -133,6 +159,8 @@ TEXT runtime·munmap(SB),NOSPLIT,$0
MOVW n+4(FP), R1 // arg 2 - len
MOVW $73, R12 // sys_munmap
SWI $0
+ NOOP
+ NOOP
MOVW.CS $0, R8 // crash on syscall failure
MOVW.CS R8, (R8)
RET
@@ -143,6 +171,8 @@ TEXT runtime·madvise(SB),NOSPLIT,$0
MOVW flags+8(FP), R2 // arg 2 - flags
MOVW $75, R12 // sys_madvise
SWI $0
+ NOOP
+ NOOP
MOVW.CS $-1, R0
MOVW R0, ret+12(FP)
RET
@@ -153,6 +183,8 @@ TEXT runtime·setitimer(SB),NOSPLIT,$0
MOVW old+8(FP), R2 // arg 3 - old value
MOVW $69, R12 // sys_setitimer
SWI $0
+ NOOP
+ NOOP
RET
// func walltime() (sec int64, nsec int32)
@@ -161,6 +193,8 @@ TEXT runtime·walltime(SB), NOSPLIT, $32
MOVW $8(R13), R1 // arg 2 - tp
MOVW $87, R12 // sys_clock_gettime
SWI $0
+ NOOP
+ NOOP
MOVW 8(R13), R0 // sec - l32
MOVW 12(R13), R1 // sec - h32
@@ -179,6 +213,8 @@ TEXT runtime·nanotime(SB),NOSPLIT,$32
MOVW $8(R13), R1 // arg 2 - tp
MOVW $87, R12 // sys_clock_gettime
SWI $0
+ NOOP
+ NOOP
MOVW 8(R13), R0 // sec - l32
MOVW 12(R13), R4 // sec - h32
@@ -200,6 +236,8 @@ TEXT runtime·sigaction(SB),NOSPLIT,$0
MOVW old+8(FP), R2 // arg 3 - old sigaction
MOVW $46, R12 // sys_sigaction
SWI $0
+ NOOP
+ NOOP
MOVW.CS $3, R8 // crash on syscall failure
MOVW.CS R8, (R8)
RET
@@ -209,6 +247,8 @@ TEXT runtime·obsdsigprocmask(SB),NOSPLIT,$0
MOVW new+4(FP), R1 // arg 2 - new
MOVW $48, R12 // sys_sigprocmask
SWI $0
+ NOOP
+ NOOP
MOVW.CS $3, R8 // crash on syscall failure
MOVW.CS R8, (R8)
MOVW R0, ret+8(FP)
@@ -251,6 +291,8 @@ TEXT runtime·tfork(SB),NOSPLIT,$0
MOVW psize+4(FP), R1 // arg 2 - psize
MOVW $8, R12 // sys___tfork
SWI $0
+ NOOP
+ NOOP
// Return if syscall failed.
B.CC 4(PC)
@@ -284,6 +326,8 @@ TEXT runtime·sigaltstack(SB),NOSPLIT,$0
MOVW old+4(FP), R1 // arg 2 - old sigaltstack
MOVW $288, R12 // sys_sigaltstack
SWI $0
+ NOOP
+ NOOP
MOVW.CS $0, R8 // crash on syscall failure
MOVW.CS R8, (R8)
RET
@@ -291,6 +335,8 @@ TEXT runtime·sigaltstack(SB),NOSPLIT,$0
TEXT runtime·osyield(SB),NOSPLIT,$0
MOVW $298, R12 // sys_sched_yield
SWI $0
+ NOOP
+ NOOP
RET
TEXT runtime·thrsleep(SB),NOSPLIT,$4
@@ -303,6 +349,8 @@ TEXT runtime·thrsleep(SB),NOSPLIT,$4
ADD $4, R13
MOVW $94, R12 // sys___thrsleep
SWI $0
+ NOOP
+ NOOP
SUB $4, R13
MOVW R0, ret+20(FP)
RET
@@ -312,6 +360,8 @@ TEXT runtime·thrwakeup(SB),NOSPLIT,$0
MOVW n+4(FP), R1 // arg 2 - n
MOVW $301, R12 // sys___thrwakeup
SWI $0
+ NOOP
+ NOOP
MOVW R0, ret+8(FP)
RET
@@ -327,6 +377,8 @@ TEXT runtime·sysctl(SB),NOSPLIT,$8
ADD $4, R13
MOVW $202, R12 // sys___sysctl
SWI $0
+ NOOP
+ NOOP
SUB $4, R13
MOVW.CC $0, R0
RSB.CS $0, R0
@@ -337,6 +389,8 @@ TEXT runtime·sysctl(SB),NOSPLIT,$8
TEXT runtime·kqueue(SB),NOSPLIT,$0
MOVW $269, R12 // sys_kqueue
SWI $0
+ NOOP
+ NOOP
RSB.CS $0, R0
MOVW R0, ret+0(FP)
RET
@@ -354,6 +408,8 @@ TEXT runtime·kevent(SB),NOSPLIT,$8
ADD $4, R13
MOVW $72, R12 // sys_kevent
SWI $0
+ NOOP
+ NOOP
RSB.CS $0, R0
SUB $4, R13
MOVW R0, ret+24(FP)
@@ -366,6 +422,8 @@ TEXT runtime·closeonexec(SB),NOSPLIT,$0
MOVW $1, R2 // arg 3 - arg (FD_CLOEXEC)
MOVW $92, R12 // sys_fcntl
SWI $0
+ NOOP
+ NOOP
RET
TEXT ·publicationBarrier(SB),NOSPLIT|NOFRAME,$0-0
@@ -375,5 +433,7 @@ TEXT runtime·read_tls_fallback(SB),NOSPLIT|NOFRAME,$0
MOVM.WP [R1, R2, R3, R12], (R13)
MOVW $330, R12 // sys___get_tcb
SWI $0
+ NOOP
+ NOOP
MOVM.IAW (R13), [R1, R2, R3, R12]
RET

59
lang/go/patches/patch-src_syscall_asm_openbsd_arm64_s
View File

@ -1,59 +0,0 @@
$OpenBSD: patch-src_syscall_asm_openbsd_arm64_s,v 1.1 2020/02/04 17:22:42 jsing Exp $
Index: src/syscall/asm_openbsd_arm64.s
--- src/syscall/asm_openbsd_arm64.s.orig
+++ src/syscall/asm_openbsd_arm64.s
@@ -4,6 +4,8 @@
#include "textflag.h"
+#define NOOP WORD $0xd503201f
+
// func Syscall(trap int64, a1, a2, a3 int64) (r1, r2, err int64);
TEXT ·Syscall(SB),NOSPLIT,$0-56
BL runtime·entersyscall(SB)
@@ -15,6 +17,8 @@ TEXT ·Syscall(SB),NOSPLIT,$0-56
MOVD $0, R5
MOVD trap+0(FP), R8 // syscall number
SVC
+ NOOP
+ NOOP
BCC ok
MOVD $-1, R4
MOVD R4, r1+32(FP) // r1
@@ -39,6 +43,8 @@ TEXT ·Syscall6(SB),NOSPLIT,$0-80
MOVD a6+48(FP), R5
MOVD trap+0(FP), R8 // syscall number
SVC
+ NOOP
+ NOOP
BCC ok
MOVD $-1, R4
MOVD R4, r1+56(FP) // r1
@@ -67,6 +73,8 @@ TEXT ·Syscall9(SB),NOSPLIT,$0-104
MOVD R8, 8(RSP)
MOVD num+0(FP), R8 // syscall number
SVC
+ NOOP
+ NOOP
BCC ok
MOVD $-1, R4
MOVD R4, r1+80(FP) // r1
@@ -90,6 +98,8 @@ TEXT ·RawSyscall(SB),NOSPLIT,$0-56
MOVD $0, R5
MOVD trap+0(FP), R8 // syscall number
SVC
+ NOOP
+ NOOP
BCC ok
MOVD $-1, R4
MOVD R4, r1+32(FP) // r1
@@ -111,6 +121,8 @@ TEXT ·RawSyscall6(SB),NOSPLIT,$0-80
MOVD a6+48(FP), R5
MOVD trap+0(FP), R8 // syscall number
SVC
+ NOOP
+ NOOP
BCC ok
MOVD $-1, R4
MOVD R4, r1+56(FP) // r1

59
lang/go/patches/patch-src_syscall_asm_openbsd_arm_s
View File

@ -1,59 +0,0 @@
$OpenBSD: patch-src_syscall_asm_openbsd_arm_s,v 1.1 2020/03/20 08:02:29 jsing Exp $
Index: src/syscall/asm_openbsd_arm.s
--- src/syscall/asm_openbsd_arm.s.orig
+++ src/syscall/asm_openbsd_arm.s
@@ -15,6 +15,8 @@
// func RawSyscall(trap int32, a1, a2, a3 int32) (r1, r2, err int32);
// func RawSyscall6(trap int32, a1, a2, a3, a4, a5, a6 int32) (r1, r2, err int32);
+#define NOOP MOVW R0, R0
+
TEXT ·Syscall(SB),NOSPLIT,$0-28
BL runtime·entersyscall(SB)
MOVW trap+0(FP), R12 // syscall number
@@ -22,6 +24,8 @@ TEXT ·Syscall(SB),NOSPLIT,$0-28
MOVW a2+8(FP), R1 // arg 2
MOVW a3+12(FP), R2 // arg 3
SWI $0
+ NOOP
+ NOOP
MOVW $0, R2
BCS error
MOVW R0, r1+16(FP) // ret 1
@@ -47,6 +51,8 @@ TEXT ·Syscall6(SB),NOSPLIT,$0-40
MOVW R13, R4
MOVW $a5+20(FP), R13 // arg 5 to arg 6 are passed on stack
SWI $0
+ NOOP
+ NOOP
MOVW R4, R13
MOVW $0, R2
BCS error6
@@ -73,6 +79,8 @@ TEXT ·Syscall9(SB),NOSPLIT,$0-52
MOVW R13, R4
MOVW $a5+20(FP), R13 // arg 5 to arg 9 are passed on stack
SWI $0
+ NOOP
+ NOOP
MOVW R4, R13
MOVW $0, R2
BCS error9
@@ -95,6 +103,8 @@ TEXT ·RawSyscall(SB),NOSPLIT,$0-28
MOVW a2+8(FP), R1 // arg 2
MOVW a3+12(FP), R2 // arg 3
SWI $0
+ NOOP
+ NOOP
MOVW $0, R2
BCS errorr
MOVW R0, r1+16(FP) // ret 1
@@ -117,6 +127,8 @@ TEXT ·RawSyscall6(SB),NOSPLIT,$0-40
MOVW R13, R4
MOVW $a5+20(FP), R13 // arg 5 to arg 6 are passed on stack
SWI $0
+ NOOP
+ NOOP
MOVW R4, R13
MOVW $0, R2
BCS errorr6

1713
lang/go/pkg/PLIST
View File

File diff suppressed because it is too large Load Diff