Skip to content

S
sys
Commit e3fe6f5d authored by Aaron Jacobs's avatar Aaron Jacobs Committed by Ian Lance Taylor
Browse files
Options

x/sys/unix: regenerate darwin/amd64 outputs with the latest SDK 

I did this on OS X 10.10.5 (14F27) using the 10.10 SDK included in Xcode
6.4 (6E35b). This required removing a C include from mkerrors.sh, since
it doesn't exist on either of my two systems.

I spot checked the syscall number changes against this definitive list,
which is for approximately my kernel version:

    http://www.opensource.apple.com/source/xnu/xnu-2782.20.48/bsd/kern/syscalls.master

Everything I examined checked out, including the removed syscalls being
marked as "old" or being described in comments as no longer existing.

There is one exception to the output being cleanly autogenerated: I have
manually renamed SYS_SYSCTL back to SYS___SYSCTL, the name used
previously and still used by syscall_bsd.go. Because it would distract
from this CL, I will fix this in an upcoming CL.

Change-Id: I0168f608cab714aa5981b3e7d08d8fd84888d0d5
Reviewed-on: https://go-review.googlesource.com/14006Reviewed-by: 's avatarIan Lance Taylor <iant@golang.org>
parent 98fc1143
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 36 deletions
unix/mkall.sh
View file @ e3fe6f5d
...@@ -121,7 +121,7 @@ darwin_386) ...@@ -121,7 +121,7 @@ darwin_386)
;; ;;
darwin_amd64) darwin_amd64)
mkerrors="$mkerrors -m64" mkerrors="$mkerrors -m64"
mksysnum="./mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/sys/syscall.h" mksysnum="./mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/sys/syscall.h"
mktypes="GOARCH=$GOARCH go tool cgo -godefs" mktypes="GOARCH=$GOARCH go tool cgo -godefs"
;; ;;
darwin_arm) darwin_arm)
...@@ -267,5 +267,8 @@ esac ...@@ -267,5 +267,8 @@ esac
esac esac
if [ -n "$mksysctl" ]; then echo "$mksysctl |gofmt >$zsysctl"; fi if [ -n "$mksysctl" ]; then echo "$mksysctl |gofmt >$zsysctl"; fi
if [ -n "$mksysnum" ]; then echo "$mksysnum |gofmt >zsysnum_$GOOSARCH.go"; fi if [ -n "$mksysnum" ]; then echo "$mksysnum |gofmt >zsysnum_$GOOSARCH.go"; fi
if [ -n "$mktypes" ]; then echo "$mktypes types_$GOOS.go | gofmt >ztypes_$GOOSARCH.go"; fi if [ -n "$mktypes" ]; then
echo "echo // +build $GOARCH,$GOOS > ztypes_$GOOSARCH.go";
echo "$mktypes types_$GOOS.go | gofmt >>ztypes_$GOOSARCH.go";
fi
) | $run ) | $run
unix/mkerrors.sh
View file @ e3fe6f5d
...@@ -38,7 +38,6 @@ includes_Darwin=' ...@@ -38,7 +38,6 @@ includes_Darwin='
#include <net/route.h> #include <net/route.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <netinet/ip.h> #include <netinet/ip.h>
#include <netinet/ip_mroute.h>
#include <termios.h> #include <termios.h>
' '
......
unix/zerrors_darwin_amd64.go
View file @ e3fe6f5d
...@@ -376,6 +376,7 @@ const ( ...@@ -376,6 +376,7 @@ const (
F_FLUSH_DATA = 0x28 F_FLUSH_DATA = 0x28
F_FREEZE_FS = 0x35 F_FREEZE_FS = 0x35
F_FULLFSYNC = 0x33 F_FULLFSYNC = 0x33
F_GETCODEDIR = 0x48
F_GETFD = 0x1 F_GETFD = 0x1
F_GETFL = 0x3 F_GETFL = 0x3
F_GETLK = 0x7 F_GETLK = 0x7
...@@ -1019,7 +1020,6 @@ const ( ...@@ -1019,7 +1020,6 @@ const (
SHUT_WR = 0x1 SHUT_WR = 0x1
SIOCADDMULTI = 0x80206931 SIOCADDMULTI = 0x80206931
SIOCAIFADDR = 0x8040691a SIOCAIFADDR = 0x8040691a
SIOCALIFADDR = 0x8118691d
SIOCARPIPLL = 0xc0206928 SIOCARPIPLL = 0xc0206928
SIOCATMARK = 0x40047307 SIOCATMARK = 0x40047307
SIOCAUTOADDR = 0xc0206926 SIOCAUTOADDR = 0xc0206926
...@@ -1027,10 +1027,7 @@ const ( ...@@ -1027,10 +1027,7 @@ const (
SIOCDELMULTI = 0x80206932 SIOCDELMULTI = 0x80206932
SIOCDIFADDR = 0x80206919 SIOCDIFADDR = 0x80206919
SIOCDIFPHYADDR = 0x80206941 SIOCDIFPHYADDR = 0x80206941
SIOCDLIFADDR = 0x8118691f
SIOCGDRVSPEC = 0xc028697b SIOCGDRVSPEC = 0xc028697b
SIOCGETSGCNT = 0xc014721c
SIOCGETVIFCNT = 0xc014721b
SIOCGETVLAN = 0xc020697f SIOCGETVLAN = 0xc020697f
SIOCGHIWAT = 0x40047301 SIOCGHIWAT = 0x40047301
SIOCGIFADDR = 0xc0206921 SIOCGIFADDR = 0xc0206921
...@@ -1056,8 +1053,6 @@ const ( ...@@ -1056,8 +1053,6 @@ const (
SIOCGIFSTATUS = 0xc331693d SIOCGIFSTATUS = 0xc331693d
SIOCGIFVLAN = 0xc020697f SIOCGIFVLAN = 0xc020697f
SIOCGIFWAKEFLAGS = 0xc0206988 SIOCGIFWAKEFLAGS = 0xc0206988
SIOCGLIFADDR = 0xc118691e
SIOCGLIFPHYADDR = 0xc1186943
SIOCGLOWAT = 0x40047303 SIOCGLOWAT = 0x40047303
SIOCGPGRP = 0x40047309 SIOCGPGRP = 0x40047309
SIOCIFCREATE = 0xc0206978 SIOCIFCREATE = 0xc0206978
...@@ -1087,7 +1082,6 @@ const ( ...@@ -1087,7 +1082,6 @@ const (
SIOCSIFPHYADDR = 0x8040693e SIOCSIFPHYADDR = 0x8040693e
SIOCSIFPHYS = 0x80206936 SIOCSIFPHYS = 0x80206936
SIOCSIFVLAN = 0x8020697e SIOCSIFVLAN = 0x8020697e
SIOCSLIFPHYADDR = 0x81186942
SIOCSLOWAT = 0x80047302 SIOCSLOWAT = 0x80047302
SIOCSPGRP = 0x80047308 SIOCSPGRP = 0x80047308
SOCK_DGRAM = 0x2 SOCK_DGRAM = 0x2
...@@ -1114,6 +1108,7 @@ const ( ...@@ -1114,6 +1108,7 @@ const (
SO_NOTIFYCONFLICT = 0x1026 SO_NOTIFYCONFLICT = 0x1026
SO_NP_EXTENSIONS = 0x1083 SO_NP_EXTENSIONS = 0x1083
SO_NREAD = 0x1020 SO_NREAD = 0x1020
SO_NUMRCVPKT = 0x1112
SO_NWRITE = 0x1024 SO_NWRITE = 0x1024
SO_OOBINLINE = 0x100 SO_OOBINLINE = 0x100
SO_PEERLABEL = 0x1011 SO_PEERLABEL = 0x1011
...@@ -1166,6 +1161,7 @@ const ( ...@@ -1166,6 +1161,7 @@ const (
TCIOFLUSH = 0x3 TCIOFLUSH = 0x3
TCOFLUSH = 0x2 TCOFLUSH = 0x2
TCP_CONNECTIONTIMEOUT = 0x20 TCP_CONNECTIONTIMEOUT = 0x20
TCP_ENABLE_ECN = 0x104
TCP_KEEPALIVE = 0x10 TCP_KEEPALIVE = 0x10
TCP_KEEPCNT = 0x102 TCP_KEEPCNT = 0x102
TCP_KEEPINTVL = 0x101 TCP_KEEPINTVL = 0x101
...@@ -1173,13 +1169,14 @@ const ( ...@@ -1173,13 +1169,14 @@ const (
TCP_MAXOLEN = 0x28 TCP_MAXOLEN = 0x28
TCP_MAXSEG = 0x2 TCP_MAXSEG = 0x2
TCP_MAXWIN = 0xffff TCP_MAXWIN = 0xffff
TCP_MAX_SACK = 0x3 TCP_MAX_SACK = 0x4
TCP_MAX_WINSHIFT = 0xe TCP_MAX_WINSHIFT = 0xe
TCP_MINMSS = 0xd8 TCP_MINMSS = 0xd8
TCP_MSS = 0x200 TCP_MSS = 0x200
TCP_NODELAY = 0x1 TCP_NODELAY = 0x1
TCP_NOOPT = 0x8 TCP_NOOPT = 0x8
TCP_NOPUSH = 0x4 TCP_NOPUSH = 0x4
TCP_NOTSENT_LOWAT = 0x201
TCP_RXT_CONNDROPTIME = 0x80 TCP_RXT_CONNDROPTIME = 0x80
TCP_RXT_FINDROP = 0x100 TCP_RXT_FINDROP = 0x100
TCP_SENDMOREACKS = 0x103 TCP_SENDMOREACKS = 0x103
......
unix/zsysnum_darwin_amd64.go
View file @ e3fe6f5d
// mksysnum_darwin.pl /usr/include/sys/unix.h // mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/sys/syscall.h
// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT // MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
// +build amd64,darwin // +build amd64,darwin
...@@ -42,7 +42,6 @@ const ( ...@@ -42,7 +42,6 @@ const (
SYS_DUP = 41 SYS_DUP = 41
SYS_PIPE = 42 SYS_PIPE = 42
SYS_GETEGID = 43 SYS_GETEGID = 43
SYS_PROFIL = 44
SYS_SIGACTION = 46 SYS_SIGACTION = 46
SYS_GETGID = 47 SYS_GETGID = 47
SYS_SIGPROCMASK = 48 SYS_SIGPROCMASK = 48
...@@ -120,8 +119,9 @@ const ( ...@@ -120,8 +119,9 @@ const (
SYS_QUOTACTL = 165 SYS_QUOTACTL = 165
SYS_MOUNT = 167 SYS_MOUNT = 167
SYS_CSOPS = 169 SYS_CSOPS = 169
SYS_CSOPS_AUDITTOKEN = 170
SYS_WAITID = 173 SYS_WAITID = 173
SYS_ADD_PROFIL = 176 SYS_KDEBUG_TRACE64 = 179
SYS_KDEBUG_TRACE = 180 SYS_KDEBUG_TRACE = 180
SYS_SETGID = 181 SYS_SETGID = 181
SYS_SETEGID = 182 SYS_SETEGID = 182
...@@ -145,17 +145,7 @@ const ( ...@@ -145,17 +145,7 @@ const (
SYS_MLOCK = 203 SYS_MLOCK = 203
SYS_MUNLOCK = 204 SYS_MUNLOCK = 204
SYS_UNDELETE = 205 SYS_UNDELETE = 205
SYS_ATSOCKET = 206 SYS_OPEN_DPROTECTED_NP = 216
SYS_ATGETMSG = 207
SYS_ATPUTMSG = 208
SYS_ATPSNDREQ = 209
SYS_ATPSNDRSP = 210
SYS_ATPGETREQ = 211
SYS_ATPGETRSP = 212
SYS_MKCOMPLEX = 216
SYS_STATV = 217
SYS_LSTATV = 218
SYS_FSTATV = 219
SYS_GETATTRLIST = 220 SYS_GETATTRLIST = 220
SYS_SETATTRLIST = 221 SYS_SETATTRLIST = 221
SYS_GETDIRENTRIESATTR = 222 SYS_GETDIRENTRIESATTR = 222
...@@ -206,9 +196,7 @@ const ( ...@@ -206,9 +196,7 @@ const (
SYS_SEM_WAIT = 271 SYS_SEM_WAIT = 271
SYS_SEM_TRYWAIT = 272 SYS_SEM_TRYWAIT = 272
SYS_SEM_POST = 273 SYS_SEM_POST = 273
SYS_SEM_GETVALUE = 274 SYS_SYSCTLBYNAME = 274
SYS_SEM_INIT = 275
SYS_SEM_DESTROY = 276
SYS_OPEN_EXTENDED = 277 SYS_OPEN_EXTENDED = 277
SYS_UMASK_EXTENDED = 278 SYS_UMASK_EXTENDED = 278
SYS_STAT_EXTENDED = 279 SYS_STAT_EXTENDED = 279
...@@ -282,8 +270,6 @@ const ( ...@@ -282,8 +270,6 @@ const (
SYS_AUDITON = 351 SYS_AUDITON = 351
SYS_GETAUID = 353 SYS_GETAUID = 353
SYS_SETAUID = 354 SYS_SETAUID = 354
SYS_GETAUDIT = 355
SYS_SETAUDIT = 356
SYS_GETAUDIT_ADDR = 357 SYS_GETAUDIT_ADDR = 357
SYS_SETAUDIT_ADDR = 358 SYS_SETAUDIT_ADDR = 358
SYS_AUDITCTL = 359 SYS_AUDITCTL = 359
...@@ -300,6 +286,7 @@ const ( ...@@ -300,6 +286,7 @@ const (
SYS___OLD_SEMWAIT_SIGNAL = 370 SYS___OLD_SEMWAIT_SIGNAL = 370
SYS___OLD_SEMWAIT_SIGNAL_NOCANCEL = 371 SYS___OLD_SEMWAIT_SIGNAL_NOCANCEL = 371
SYS_THREAD_SELFID = 372 SYS_THREAD_SELFID = 372
SYS_LEDGER = 373
SYS___MAC_EXECVE = 380 SYS___MAC_EXECVE = 380
SYS___MAC_SYSCALL = 381 SYS___MAC_SYSCALL = 381
SYS___MAC_GET_FILE = 382 SYS___MAC_GET_FILE = 382
...@@ -358,5 +345,54 @@ const ( ...@@ -358,5 +345,54 @@ const (
SYS_PID_HIBERNATE = 435 SYS_PID_HIBERNATE = 435
SYS_PID_SHUTDOWN_SOCKETS = 436 SYS_PID_SHUTDOWN_SOCKETS = 436
SYS_SHARED_REGION_MAP_AND_SLIDE_NP = 438 SYS_SHARED_REGION_MAP_AND_SLIDE_NP = 438
SYS_MAXSYSCALL = 439 SYS_KAS_INFO = 439
SYS_MEMORYSTATUS_CONTROL = 440
SYS_GUARDED_OPEN_NP = 441
SYS_GUARDED_CLOSE_NP = 442
SYS_GUARDED_KQUEUE_NP = 443
SYS_CHANGE_FDGUARD_NP = 444
SYS_PROC_RLIMIT_CONTROL = 446
SYS_CONNECTX = 447
SYS_DISCONNECTX = 448
SYS_PEELOFF = 449
SYS_SOCKET_DELEGATE = 450
SYS_TELEMETRY = 451
SYS_PROC_UUID_POLICY = 452
SYS_MEMORYSTATUS_GET_LEVEL = 453
SYS_SYSTEM_OVERRIDE = 454
SYS_VFS_PURGE = 455
SYS_SFI_CTL = 456
SYS_SFI_PIDCTL = 457
SYS_COALITION = 458
SYS_COALITION_INFO = 459
SYS_NECP_MATCH_POLICY = 460
SYS_GETATTRLISTBULK = 461
SYS_OPENAT = 463
SYS_OPENAT_NOCANCEL = 464
SYS_RENAMEAT = 465
SYS_FACCESSAT = 466
SYS_FCHMODAT = 467
SYS_FCHOWNAT = 468
SYS_FSTATAT = 469
SYS_FSTATAT64 = 470
SYS_LINKAT = 471
SYS_UNLINKAT = 472
SYS_READLINKAT = 473
SYS_SYMLINKAT = 474
SYS_MKDIRAT = 475
SYS_GETATTRLISTAT = 476
SYS_PROC_TRACE_LOG = 477
SYS_BSDTHREAD_CTL = 478
SYS_OPENBYID_NP = 479
SYS_RECVMSG_X = 480
SYS_SENDMSG_X = 481
SYS_THREAD_SELFUSAGE = 482
SYS_CSRCTL = 483
SYS_GUARDED_OPEN_DPROTECTED_NP = 484
SYS_GUARDED_WRITE_NP = 485
SYS_GUARDED_PWRITE_NP = 486
SYS_GUARDED_WRITEV_NP = 487
SYS_RENAME_EXT = 488
SYS_MREMAP_ENCRYPTED = 489
SYS_MAXSYSCALL = 490
) )
unix/ztypes_darwin_amd64.go
View file @ e3fe6f5d
// +build amd64,darwin
// Created by cgo -godefs - DO NOT EDIT // Created by cgo -godefs - DO NOT EDIT
// cgo -godefs types_darwin.go // cgo -godefs types_darwin.go
// +build amd64,darwin
package unix package unix
const ( const (
...@@ -132,9 +131,9 @@ type Fbootstraptransfer_t struct { ...@@ -132,9 +131,9 @@ type Fbootstraptransfer_t struct {
} }
type Log2phys_t struct { type Log2phys_t struct {
Flags uint32 Flags uint32
Contigbytes int64 Pad_cgo_0 [8]byte
Devoffset int64 Pad_cgo_1 [8]byte
} }
type Fsid struct { type Fsid struct {
......
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