Commit 7776b0a1 authored by Shenghou Ma's avatar Shenghou Ma Committed by Russ Cox

[dev.power64] syscall: re-generate using cgo compiled by gc, fix test failures

LGTM=dave, rsc
R=rsc, iant, dave
CC=golang-codereviews
https://golang.org/cl/127320043
parent f464573c
...@@ -15,7 +15,7 @@ package syscall ...@@ -15,7 +15,7 @@ package syscall
//sysnb Getegid() (egid int) //sysnb Getegid() (egid int)
//sysnb Geteuid() (euid int) //sysnb Geteuid() (euid int)
//sysnb Getgid() (gid int) //sysnb Getgid() (gid int)
//sysnb Getrlimit(resource int, rlim *Rlimit) (err error) //sysnb Getrlimit(resource int, rlim *Rlimit) (err error) = SYS_UGETRLIMIT
//sysnb Getuid() (uid int) //sysnb Getuid() (uid int)
//sys Ioperm(from int, num int, on int) (err error) //sys Ioperm(from int, num int, on int) (err error)
//sys Iopl(level int) (err error) //sys Iopl(level int) (err error)
......
...@@ -77,8 +77,8 @@ struct sockaddr_any { ...@@ -77,8 +77,8 @@ struct sockaddr_any {
// copied from /usr/include/linux/un.h // copied from /usr/include/linux/un.h
struct my_sockaddr_un { struct my_sockaddr_un {
sa_family_t sun_family; sa_family_t sun_family;
#ifdef __ARM_EABI__ #if defined(__ARM_EABI__) || defined(__powerpc64__)
// on ARM char is by default unsigned // on ARM and PPC char is by default unsigned
signed char sun_path[108]; signed char sun_path[108];
#else #else
char sun_path[108]; char sun_path[108];
...@@ -87,6 +87,8 @@ struct my_sockaddr_un { ...@@ -87,6 +87,8 @@ struct my_sockaddr_un {
#ifdef __ARM_EABI__ #ifdef __ARM_EABI__
typedef struct user_regs PtraceRegs; typedef struct user_regs PtraceRegs;
#elif defined(__powerpc64__)
typedef struct pt_regs PtraceRegs;
#else #else
typedef struct user_regs_struct PtraceRegs; typedef struct user_regs_struct PtraceRegs;
#endif #endif
......
...@@ -353,7 +353,7 @@ const ( ...@@ -353,7 +353,7 @@ const (
F_GETFD = 0x1 F_GETFD = 0x1
F_GETFL = 0x3 F_GETFL = 0x3
F_GETLEASE = 0x401 F_GETLEASE = 0x401
F_GETLK = 0xc F_GETLK = 0x5
F_GETLK64 = 0xc F_GETLK64 = 0xc
F_GETOWN = 0x9 F_GETOWN = 0x9
F_GETOWN_EX = 0x10 F_GETOWN_EX = 0x10
...@@ -671,15 +671,6 @@ const ( ...@@ -671,15 +671,6 @@ const (
MAP_SHARED = 0x1 MAP_SHARED = 0x1
MAP_STACK = 0x20000 MAP_STACK = 0x20000
MAP_TYPE = 0xf MAP_TYPE = 0xf
MCAST_BLOCK_SOURCE = 0x2b
MCAST_EXCLUDE = 0x0
MCAST_INCLUDE = 0x1
MCAST_JOIN_GROUP = 0x2a
MCAST_JOIN_SOURCE_GROUP = 0x2e
MCAST_LEAVE_GROUP = 0x2d
MCAST_LEAVE_SOURCE_GROUP = 0x2f
MCAST_MSFILTER = 0x30
MCAST_UNBLOCK_SOURCE = 0x2c
MCL_CURRENT = 0x2000 MCL_CURRENT = 0x2000
MCL_FUTURE = 0x4000 MCL_FUTURE = 0x4000
MNT_DETACH = 0x2 MNT_DETACH = 0x2
......
...@@ -353,7 +353,7 @@ const ( ...@@ -353,7 +353,7 @@ const (
F_GETFD = 0x1 F_GETFD = 0x1
F_GETFL = 0x3 F_GETFL = 0x3
F_GETLEASE = 0x401 F_GETLEASE = 0x401
F_GETLK = 0xc F_GETLK = 0x5
F_GETLK64 = 0xc F_GETLK64 = 0xc
F_GETOWN = 0x9 F_GETOWN = 0x9
F_GETOWN_EX = 0x10 F_GETOWN_EX = 0x10
...@@ -675,15 +675,6 @@ const ( ...@@ -675,15 +675,6 @@ const (
MAP_SHARED = 0x1 MAP_SHARED = 0x1
MAP_STACK = 0x20000 MAP_STACK = 0x20000
MAP_TYPE = 0xf MAP_TYPE = 0xf
MCAST_BLOCK_SOURCE = 0x2b
MCAST_EXCLUDE = 0x0
MCAST_INCLUDE = 0x1
MCAST_JOIN_GROUP = 0x2a
MCAST_JOIN_SOURCE_GROUP = 0x2e
MCAST_LEAVE_GROUP = 0x2d
MCAST_LEAVE_SOURCE_GROUP = 0x2f
MCAST_MSFILTER = 0x30
MCAST_UNBLOCK_SOURCE = 0x2c
MCL_CURRENT = 0x2000 MCL_CURRENT = 0x2000
MCL_FUTURE = 0x4000 MCL_FUTURE = 0x4000
MNT_DETACH = 0x2 MNT_DETACH = 0x2
......
...@@ -1431,7 +1431,7 @@ func Getgid() (gid int) { ...@@ -1431,7 +1431,7 @@ func Getgid() (gid int) {
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getrlimit(resource int, rlim *Rlimit) (err error) { func Getrlimit(resource int, rlim *Rlimit) (err error) {
_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0) _, _, e1 := RawSyscall(SYS_UGETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
if e1 != 0 { if e1 != 0 {
err = e1 err = e1
} }
......
...@@ -1431,7 +1431,7 @@ func Getgid() (gid int) { ...@@ -1431,7 +1431,7 @@ func Getgid() (gid int) {
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getrlimit(resource int, rlim *Rlimit) (err error) { func Getrlimit(resource int, rlim *Rlimit) (err error) {
_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0) _, _, e1 := RawSyscall(SYS_UGETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
if e1 != 0 { if e1 != 0 {
err = e1 err = e1
} }
......
...@@ -73,20 +73,20 @@ type Utimbuf struct { ...@@ -73,20 +73,20 @@ type Utimbuf struct {
type Rusage struct { type Rusage struct {
Utime Timeval Utime Timeval
Stime Timeval Stime Timeval
Anon0 [8]byte Maxrss int64
Anon1 [8]byte Ixrss int64
Anon2 [8]byte Idrss int64
Anon3 [8]byte Isrss int64
Anon4 [8]byte Minflt int64
Anon5 [8]byte Majflt int64
Anon6 [8]byte Nswap int64
Anon7 [8]byte Inblock int64
Anon8 [8]byte Oublock int64
Anon9 [8]byte Msgsnd int64
Anon10 [8]byte Msgrcv int64
Anon11 [8]byte Nsignals int64
Anon12 [8]byte Nvcsw int64
Anon13 [8]byte Nivcsw int64
} }
type Rlimit struct { type Rlimit struct {
......
...@@ -73,20 +73,20 @@ type Utimbuf struct { ...@@ -73,20 +73,20 @@ type Utimbuf struct {
type Rusage struct { type Rusage struct {
Utime Timeval Utime Timeval
Stime Timeval Stime Timeval
Anon0 [8]byte Maxrss int64
Anon1 [8]byte Ixrss int64
Anon2 [8]byte Idrss int64
Anon3 [8]byte Isrss int64
Anon4 [8]byte Minflt int64
Anon5 [8]byte Majflt int64
Anon6 [8]byte Nswap int64
Anon7 [8]byte Inblock int64
Anon8 [8]byte Oublock int64
Anon9 [8]byte Msgsnd int64
Anon10 [8]byte Msgrcv int64
Anon11 [8]byte Nsignals int64
Anon12 [8]byte Nvcsw int64
Anon13 [8]byte Nivcsw int64
} }
type Rlimit struct { type Rlimit 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