Skip to content

Commit b47fdc9

Browse files
paulzholtklauser
authored andcommitted
unix: change the mksysnum master to point to stable/11 on freebsd
Add a COMPAT10 directive to mksysnum.go to keep generating SYS_PIPE. Updates golang/go#27619 Change-Id: Ifb54a812baf79c9426ce864bb0ef0e66b19d7f3b Reviewed-on: https://go-review.googlesource.com/c/sys/+/182318 Run-TryBot: Tobias Klauser <[email protected]> TryBot-Result: Gobot Gobot <[email protected]> Reviewed-by: Tobias Klauser <[email protected]>
1 parent d442b75 commit b47fdc9

File tree

6 files changed

+252
-272
lines changed

6 files changed

+252
-272
lines changed

unix/mkall.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,25 +105,25 @@ dragonfly_amd64)
105105
freebsd_386)
106106
mkerrors="$mkerrors -m32"
107107
mksyscall="go run mksyscall.go -l32"
108-
mksysnum="go run mksysnum.go 'https://svn.freebsd.org/base/stable/10/sys/kern/syscalls.master'"
108+
mksysnum="go run mksysnum.go 'https://svn.freebsd.org/base/stable/11/sys/kern/syscalls.master'"
109109
mktypes="GOARCH=$GOARCH go tool cgo -godefs"
110110
;;
111111
freebsd_amd64)
112112
mkerrors="$mkerrors -m64"
113-
mksysnum="go run mksysnum.go 'https://svn.freebsd.org/base/stable/10/sys/kern/syscalls.master'"
113+
mksysnum="go run mksysnum.go 'https://svn.freebsd.org/base/stable/11/sys/kern/syscalls.master'"
114114
mktypes="GOARCH=$GOARCH go tool cgo -godefs"
115115
;;
116116
freebsd_arm)
117117
mkerrors="$mkerrors"
118118
mksyscall="go run mksyscall.go -l32 -arm"
119-
mksysnum="go run mksysnum.go 'https://svn.freebsd.org/base/stable/10/sys/kern/syscalls.master'"
119+
mksysnum="go run mksysnum.go 'https://svn.freebsd.org/base/stable/11/sys/kern/syscalls.master'"
120120
# Let the type of C char be signed for making the bare syscall
121121
# API consistent across platforms.
122122
mktypes="GOARCH=$GOARCH go tool cgo -godefs -- -fsigned-char"
123123
;;
124124
freebsd_arm64)
125125
mkerrors="$mkerrors -m64"
126-
mksysnum="go run mksysnum.go 'https://svn.freebsd.org/base/stable/10/sys/kern/syscalls.master'"
126+
mksysnum="go run mksysnum.go 'https://svn.freebsd.org/base/stable/11/sys/kern/syscalls.master'"
127127
mktypes="GOARCH=$GOARCH go tool cgo -godefs"
128128
;;
129129
netbsd_386)

unix/mksysnum.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ func main() {
139139
text += format(name, num, proto)
140140
}
141141
case "freebsd":
142-
if t.Match(`^([0-9]+)\s+\S+\s+(?:NO)?STD\s+({ \S+\s+(\w+).*)$`) {
142+
if t.Match(`^([0-9]+)\s+\S+\s+(?:(?:NO)?STD|COMPAT10)\s+({ \S+\s+(\w+).*)$`) {
143143
num, proto := t.sub[1], t.sub[2]
144144
name := fmt.Sprintf("SYS_%s", t.sub[3])
145145
text += format(name, num, proto)

unix/zsysnum_freebsd_386.go

Lines changed: 8 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unix/zsysnum_freebsd_amd64.go

Lines changed: 8 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)