Skip to content

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

x/sys/unix: regenerate darwin/386 outputs 

I did this on OS X 10.10.5 (14F27) using the OS X 10.10 SDK included in
Xcode 6.4 (6E35b) for syscall numbers. I believe this SDK is intended
for 64-bit Macs, but the syscall numbers aren't likely to vary. See also
the discussion in this thread:

    https://groups.google.com/d/topic/golang-dev/738LXeykFsM/discussion

This commit contains the same SYS_SYSCTL -> SYS___SYSCTL workaround
found in commit 9ef4b6c1; see its description for more info.

Change-Id: I952ae56032033b49f8910281c68dcc72abb2d106
Reviewed-on: https://go-review.googlesource.com/14151Reviewed-by: 's avatarIan Lance Taylor <iant@golang.org>
parent ec18ccff
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 25 deletions
unix/mkall.sh
View file @ 9c60d1c5
...@@ -116,7 +116,7 @@ _* | *_ | _) ...@@ -116,7 +116,7 @@ _* | *_ | _)
darwin_386) darwin_386)
mkerrors="$mkerrors -m32" mkerrors="$mkerrors -m32"
mksyscall="./mksyscall.pl -l32" mksyscall="./mksyscall.pl -l32"
mksysnum="./mksysnum_darwin.pl /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_amd64) darwin_amd64)
......
unix/syscall_darwin_386.go
View file @ 9c60d1c5
...@@ -73,3 +73,7 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e ...@@ -73,3 +73,7 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
} }
func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno) func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
// SYS___SYSCTL is used by syscall_bsd.go for all BSDs, but in modern versions
// of darwin/386 the syscall is called sysctl instead of __sysctl.
const SYS___SYSCTL = SYS_SYSCTL
unix/zerrors_darwin_386.go
View file @ 9c60d1c5
This diff is collapsed.
unix/zsysnum_darwin_386.go
View file @ 9c60d1c5
// 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 386,darwin // +build 386,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
...@@ -141,21 +141,11 @@ const ( ...@@ -141,21 +141,11 @@ const (
SYS_LSEEK = 199 SYS_LSEEK = 199
SYS_TRUNCATE = 200 SYS_TRUNCATE = 200
SYS_FTRUNCATE = 201 SYS_FTRUNCATE = 201
SYS___SYSCTL = 202 SYS_SYSCTL = 202
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_386.go
View file @ 9c60d1c5
// +build 386,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 386,darwin
package unix package unix
const ( const (
...@@ -30,7 +29,7 @@ type Timeval struct { ...@@ -30,7 +29,7 @@ type Timeval struct {
Usec int32 Usec int32
} }
type Timeval32 [0]byte type Timeval32 struct{}
type Rusage struct { type Rusage struct {
Utime Timeval Utime Timeval
......
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