Commit 0b9e4723 authored by Ian Lance Taylor's avatar Ian Lance Taylor

runtime: rename Sigaltstack to SigaltstackT

Avoids a conflict between the type and function sigaltstack.

LGTM=crawshaw
R=rsc, crawshaw
CC=golang-codereviews
https://golang.org/cl/138920043
parent 21967f2c
......@@ -31,7 +31,7 @@ type Fpxreg1 C.struct__fpxreg
type Xmmreg1 C.struct__xmmreg
type Fpstate1 C.struct__fpstate
type Fpreg1 C.struct__fpreg
type Sigaltstack C.struct_sigaltstack
type SigaltstackT C.struct_sigaltstack
type Mcontext C.mcontext_t
type Ucontext C.ucontext_t
type Sigcontext C.struct_sigcontext
......@@ -139,7 +139,7 @@ type Timespec C.struct_timespec
type Timeval C.struct_timeval
type Sigaction C.struct_kernel_sigaction
type Siginfo C.siginfo_t
type Sigaltstack C.struct_sigaltstack
type SigaltstackT C.struct_sigaltstack
type Sigcontext C.struct_sigcontext
type Ucontext C.struct_ucontext
type Itimerval C.struct_itimerval
......
......@@ -115,7 +115,7 @@ const (
)
type Timespec C.struct_timespec
type Sigaltstack C.struct_sigaltstack
type SigaltstackT C.struct_sigaltstack
type Sigcontext C.struct_sigcontext
type Ucontext C.struct_ucontext
type Timeval C.struct_timeval
......
......@@ -110,7 +110,7 @@ const (
type Rtprio C.struct_rtprio
type Lwpparams C.struct_lwp_params
type Sigaltstack C.struct_sigaltstack
type SigaltstackT C.struct_sigaltstack
type Sigset C.struct___sigset
type StackT C.stack_t
......
......@@ -85,7 +85,7 @@ enum {
typedef struct Rtprio Rtprio;
typedef struct Lwpparams Lwpparams;
typedef struct Sigaltstack Sigaltstack;
typedef struct SigaltstackT SigaltstackT;
typedef struct Sigset Sigset;
typedef struct StackT StackT;
typedef struct Siginfo Siginfo;
......@@ -109,7 +109,7 @@ struct Lwpparams {
int32 *tid1;
int32 *tid2;
};
struct Sigaltstack {
struct SigaltstackT {
int8 *ss_sp;
uint32 ss_size;
int32 ss_flags;
......
......@@ -85,7 +85,7 @@ enum {
typedef struct Rtprio Rtprio;
typedef struct Lwpparams Lwpparams;
typedef struct Sigaltstack Sigaltstack;
typedef struct SigaltstackT SigaltstackT;
typedef struct Sigset Sigset;
typedef struct StackT StackT;
typedef struct Siginfo Siginfo;
......@@ -109,7 +109,7 @@ struct Lwpparams {
int32 *tid1;
int32 *tid2;
};
struct Sigaltstack {
struct SigaltstackT {
int8 *ss_sp;
uint64 ss_size;
int32 ss_flags;
......
......@@ -117,7 +117,7 @@ const (
type Rtprio C.struct_rtprio
type ThrParam C.struct_thr_param
type Sigaltstack C.struct_sigaltstack
type SigaltstackT C.struct_sigaltstack
type Sigset C.struct___sigset
type StackT C.stack_t
......
......@@ -89,7 +89,7 @@ enum {
typedef struct Rtprio Rtprio;
typedef struct ThrParam ThrParam;
typedef struct Sigaltstack Sigaltstack;
typedef struct SigaltstackT SigaltstackT;
typedef struct Sigset Sigset;
typedef struct StackT StackT;
typedef struct Siginfo Siginfo;
......@@ -119,7 +119,7 @@ struct ThrParam {
Rtprio *rtp;
void *spare[3];
};
struct Sigaltstack {
struct SigaltstackT {
int8 *ss_sp;
uint32 ss_size;
int32 ss_flags;
......
......@@ -89,7 +89,7 @@ enum {
typedef struct Rtprio Rtprio;
typedef struct ThrParam ThrParam;
typedef struct Sigaltstack Sigaltstack;
typedef struct SigaltstackT SigaltstackT;
typedef struct Sigset Sigset;
typedef struct StackT StackT;
typedef struct Siginfo Siginfo;
......@@ -120,7 +120,7 @@ struct ThrParam {
Rtprio *rtp;
void *spare[3];
};
struct Sigaltstack {
struct SigaltstackT {
int8 *ss_sp;
uint64 ss_size;
int32 ss_flags;
......
......@@ -89,7 +89,7 @@ enum {
typedef struct Rtprio Rtprio;
typedef struct ThrParam ThrParam;
typedef struct Sigaltstack Sigaltstack;
typedef struct SigaltstackT SigaltstackT;
typedef struct Sigset Sigset;
typedef struct StackT StackT;
typedef struct Siginfo Siginfo;
......@@ -119,7 +119,7 @@ struct ThrParam {
Rtprio *rtp;
void *spare[3];
};
struct Sigaltstack {
struct SigaltstackT {
uint8 *ss_sp;
uint32 ss_size;
int32 ss_flags;
......
......@@ -97,7 +97,7 @@ typedef struct Timespec Timespec;
typedef struct Timeval Timeval;
typedef struct SigactionT SigactionT;
typedef struct Siginfo Siginfo;
typedef struct Sigaltstack Sigaltstack;
typedef struct SigaltstackT SigaltstackT;
typedef struct Sigcontext Sigcontext;
typedef struct Ucontext Ucontext;
typedef struct Itimerval Itimerval;
......@@ -156,7 +156,7 @@ struct Siginfo {
int32 si_code;
byte _sifields[116];
};
struct Sigaltstack {
struct SigaltstackT {
byte *ss_sp;
int32 ss_flags;
uint32 ss_size;
......@@ -194,7 +194,7 @@ struct Sigcontext {
struct Ucontext {
uint32 uc_flags;
Ucontext *uc_link;
Sigaltstack uc_stack;
SigaltstackT uc_stack;
Sigcontext uc_mcontext;
uint32 uc_sigmask;
};
......
......@@ -144,7 +144,7 @@ typedef struct Fpxreg1 Fpxreg1;
typedef struct Xmmreg1 Xmmreg1;
typedef struct Fpstate1 Fpstate1;
typedef struct Fpreg1 Fpreg1;
typedef struct Sigaltstack Sigaltstack;
typedef struct SigaltstackT SigaltstackT;
typedef struct Mcontext Mcontext;
typedef struct Ucontext Ucontext;
typedef struct Sigcontext Sigcontext;
......@@ -200,7 +200,7 @@ struct Fpreg1 {
uint16 significand[4];
uint16 exponent;
};
struct Sigaltstack {
struct SigaltstackT {
byte *ss_sp;
int32 ss_flags;
byte Pad_cgo_0[4];
......@@ -214,7 +214,7 @@ struct Mcontext {
struct Ucontext {
uint64 uc_flags;
Ucontext *uc_link;
Sigaltstack uc_stack;
SigaltstackT uc_stack;
Mcontext uc_mcontext;
Usigset uc_sigmask;
Fpstate __fpregs_mem;
......
......@@ -88,8 +88,8 @@ struct Timespec {
int32 tv_nsec;
};
typedef struct Sigaltstack Sigaltstack;
struct Sigaltstack {
typedef struct SigaltstackT SigaltstackT;
struct SigaltstackT {
void *ss_sp;
int32 ss_flags;
uint32 ss_size;
......@@ -124,7 +124,7 @@ typedef struct Ucontext Ucontext;
struct Ucontext {
uint32 uc_flags;
Ucontext *uc_link;
Sigaltstack uc_stack;
SigaltstackT uc_stack;
Sigcontext uc_mcontext;
uint32 uc_sigmask;
int32 __unused[31];
......
......@@ -109,7 +109,7 @@ const (
EVFILT_WRITE = C.EVFILT_WRITE
)
type Sigaltstack C.struct_sigaltstack
type SigaltstackT C.struct_sigaltstack
type Sigset C.sigset_t
type Siginfo C.struct__ksiginfo
......
......@@ -82,7 +82,7 @@ enum {
EVFILT_WRITE = 0x1,
};
typedef struct Sigaltstack Sigaltstack;
typedef struct SigaltstackT SigaltstackT;
typedef struct Sigset Sigset;
typedef struct Siginfo Siginfo;
typedef struct StackT StackT;
......@@ -95,7 +95,7 @@ typedef struct KeventT KeventT;
#pragma pack on
struct Sigaltstack {
struct SigaltstackT {
byte *ss_sp;
uint32 ss_size;
int32 ss_flags;
......
......@@ -82,7 +82,7 @@ enum {
EVFILT_WRITE = 0x1,
};
typedef struct Sigaltstack Sigaltstack;
typedef struct SigaltstackT SigaltstackT;
typedef struct Sigset Sigset;
typedef struct Siginfo Siginfo;
typedef struct StackT StackT;
......@@ -95,7 +95,7 @@ typedef struct KeventT KeventT;
#pragma pack on
struct Sigaltstack {
struct SigaltstackT {
byte *ss_sp;
uint64 ss_size;
int32 ss_flags;
......
......@@ -82,7 +82,7 @@ enum {
EVFILT_WRITE = 0x1,
};
typedef struct Sigaltstack Sigaltstack;
typedef struct SigaltstackT SigaltstackT;
typedef struct Sigset Sigset;
typedef struct Siginfo Siginfo;
typedef struct StackT StackT;
......@@ -95,7 +95,7 @@ typedef struct KeventT KeventT;
#pragma pack on
struct Sigaltstack {
struct SigaltstackT {
byte *ss_sp;
uint32 ss_size;
int32 ss_flags;
......
......@@ -106,7 +106,7 @@ const (
type Tfork C.struct___tfork
type Sigaltstack C.struct_sigaltstack
type SigaltstackT C.struct_sigaltstack
type Sigcontext C.struct_sigcontext
type Siginfo C.siginfo_t
type Sigset C.sigset_t
......
......@@ -82,7 +82,7 @@ enum {
};
typedef struct Tfork Tfork;
typedef struct Sigaltstack Sigaltstack;
typedef struct SigaltstackT SigaltstackT;
typedef struct Sigcontext Sigcontext;
typedef struct Siginfo Siginfo;
typedef struct StackT StackT;
......@@ -99,7 +99,7 @@ struct Tfork {
byte *tf_stack;
};
struct Sigaltstack {
struct SigaltstackT {
byte *ss_sp;
uint32 ss_size;
int32 ss_flags;
......
......@@ -82,7 +82,7 @@ enum {
};
typedef struct Tfork Tfork;
typedef struct Sigaltstack Sigaltstack;
typedef struct SigaltstackT SigaltstackT;
typedef struct Sigcontext Sigcontext;
typedef struct Siginfo Siginfo;
typedef struct StackT StackT;
......@@ -99,7 +99,7 @@ struct Tfork {
byte *tf_stack;
};
struct Sigaltstack {
struct SigaltstackT {
byte *ss_sp;
uint64 ss_size;
int32 ss_flags;
......
......@@ -133,7 +133,7 @@ const (
type SemT C.sem_t
type Sigaltstack C.struct_sigaltstack
type SigaltstackT C.struct_sigaltstack
type Sigset C.sigset_t
type StackT C.stack_t
......
......@@ -101,7 +101,7 @@ enum {
};
typedef struct SemT SemT;
typedef struct Sigaltstack Sigaltstack;
typedef struct SigaltstackT SigaltstackT;
typedef struct Sigset Sigset;
typedef struct StackT StackT;
typedef struct Siginfo Siginfo;
......@@ -126,7 +126,7 @@ struct SemT {
uint64 sem_pad2[2];
};
struct Sigaltstack {
struct SigaltstackT {
byte *ss_sp;
uint64 ss_size;
int32 ss_flags;
......
......@@ -8,7 +8,7 @@ typedef byte* kevent_udata;
int32 runtime·lwp_create(Lwpparams*);
void runtime·sigpanic(void);
void runtime·sigaltstack(Sigaltstack*, Sigaltstack*);
void runtime·sigaltstack(SigaltstackT*, SigaltstackT*);
struct sigaction;
void runtime·sigaction(int32, struct sigaction*, struct sigaction*);
void runtime·sigprocmask(Sigset *, Sigset *);
......
......@@ -8,7 +8,7 @@ typedef byte* kevent_udata;
int32 runtime·thr_new(ThrParam*, int32);
void runtime·sigpanic(void);
void runtime·sigaltstack(Sigaltstack*, Sigaltstack*);
void runtime·sigaltstack(SigaltstackT*, SigaltstackT*);
struct sigaction;
void runtime·sigaction(int32, struct sigaction*, struct sigaction*);
void runtime·sigprocmask(Sigset *, Sigset *);
......
......@@ -332,7 +332,7 @@ runtime·getsig(int32 i)
void
runtime·signalstack(byte *p, int32 n)
{
Sigaltstack st;
SigaltstackT st;
st.ss_sp = p;
st.ss_size = n;
......
......@@ -11,7 +11,7 @@ int32 runtime·clone(int32, void*, M*, G*, void(*)(void));
struct SigactionT;
int32 runtime·rt_sigaction(uintptr, struct SigactionT*, void*, uintptr);
void runtime·sigaltstack(Sigaltstack*, Sigaltstack*);
void runtime·sigaltstack(SigaltstackT*, SigaltstackT*);
void runtime·sigpanic(void);
void runtime·setitimer(int32, Itimerval*, Itimerval*);
......
......@@ -16,7 +16,7 @@ void runtime·sigpanic(void);
void runtime·setitimer(int32, Itimerval*, Itimerval*);
void runtime·sigaction(int32, struct sigaction*, struct sigaction*);
void runtime·sigaltstack(Sigaltstack*, Sigaltstack*);
void runtime·sigaltstack(SigaltstackT*, SigaltstackT*);
void runtime·sigprocmask(int32, Sigset*, Sigset*);
void runtime·unblocksignals(void);
int32 runtime·sysctl(uint32*, uint32, byte*, uintptr*, byte*, uintptr);
......
......@@ -16,7 +16,7 @@ void runtime·sigpanic(void);
void runtime·setitimer(int32, Itimerval*, Itimerval*);
void runtime·sigaction(int32, struct sigaction*, struct sigaction*);
void runtime·sigaltstack(Sigaltstack*, Sigaltstack*);
void runtime·sigaltstack(SigaltstackT*, SigaltstackT*);
Sigset runtime·sigprocmask(int32, Sigset);
void runtime·unblocksignals(void);
int32 runtime·sysctl(uint32*, uint32, byte*, uintptr*, byte*, uintptr);
......
......@@ -536,7 +536,7 @@ runtime·sigaction(int32 sig, struct SigactionT* act, struct SigactionT* oact)
}
/* int32 */ void
runtime·sigaltstack(Sigaltstack* ss, Sigaltstack* oss)
runtime·sigaltstack(SigaltstackT* ss, SigaltstackT* oss)
{
runtime·sysvicall2(libc·sigaltstack, (uintptr)ss, (uintptr)oss);
}
......
......@@ -16,7 +16,7 @@ void runtime·sigpanic(void);
void runtime·setitimer(int32, Itimerval*, Itimerval*);
void runtime·sigaction(int32, struct SigactionT*, struct SigactionT*);
void runtime·sigaltstack(Sigaltstack*, Sigaltstack*);
void runtime·sigaltstack(SigaltstackT*, SigaltstackT*);
void runtime·sigprocmask(int32, Sigset*, Sigset*);
void runtime·unblocksignals(void);
int32 runtime·sysctl(uint32*, uint32, byte*, uintptr*, byte*, uintptr);
......
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