From: Dave Cheney Date: Mon, 27 Oct 2014 22:56:33 +0000 (+1100) Subject: [dev.power64] runtime: fix power64le build X-Git-Tag: go1.5beta1~2684^2~25^2~6 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=1b130a08d8cb1c40f6edd5a1785272d5db8d6c16;p=gostls13.git [dev.power64] runtime: fix power64le build Brings defs_linux_power64le.h up to date with the big endian version. LGTM=rsc R=rsc, austin CC=golang-codereviews https://golang.org/cl/161470043 --- diff --git a/src/runtime/defs_linux_power64le.h b/src/runtime/defs_linux_power64le.h index 64f145672c..93742fa346 100644 --- a/src/runtime/defs_linux_power64le.h +++ b/src/runtime/defs_linux_power64le.h @@ -88,11 +88,10 @@ enum { typedef struct Sigset Sigset; typedef struct Timespec Timespec; typedef struct Timeval Timeval; -typedef struct Sigaction Sigaction; +typedef struct SigactionT SigactionT; typedef struct Siginfo Siginfo; typedef struct Itimerval Itimerval; typedef struct EpollEvent EpollEvent; -typedef uint64 Usigset; #pragma pack on @@ -109,11 +108,11 @@ struct Timeval { int64 tv_sec; int64 tv_usec; }; -struct Sigaction { +struct SigactionT { void *sa_handler; uint64 sa_flags; void *sa_restorer; - Usigset sa_mask; + uint64 sa_mask; }; struct Siginfo { int32 si_signo; @@ -129,7 +128,7 @@ struct Itimerval { struct EpollEvent { uint32 events; byte Pad_cgo_0[4]; - uint64 data; + byte data[8]; // unaligned uintptr }; @@ -144,7 +143,6 @@ enum { SA_RESTORER = 0, }; -//typedef struct Usigset Usigset; typedef struct Ptregs Ptregs; typedef struct Vreg Vreg; typedef struct SigaltstackT SigaltstackT; @@ -153,11 +151,6 @@ typedef struct Ucontext Ucontext; #pragma pack on -//struct Usigset { -// uint64 sig[1]; -//}; -//typedef Sigset Usigset; - struct Ptregs { uint64 gpr[32]; uint64 nip; @@ -202,8 +195,8 @@ struct Ucontext { uint64 uc_flags; Ucontext *uc_link; SigaltstackT uc_stack; - Usigset uc_sigmask; - Usigset __unused[15]; + uint64 uc_sigmask; + uint64 __unused[15]; Sigcontext uc_mcontext; };