qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-23 10:50:09 -07:00
Code Releases Activity

runtime: retry fix openbsd build

Browse Source 
Tested on linux/amd64 too this time.

LGTM=bradfitz
R=golang-codereviews, bradfitz
CC=dave, golang-codereviews, iant, rsc
https://golang.org/cl/140050043
This commit is contained in:
Matthew Dempsky 2014-08-29 23:13:17 -07:00 committed by Brad Fitzpatrick
parent 29f9f3ec80
commit b70bc22cd0
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pkg/runtime/defs_openbsd.go
View File

@ -104,7 +104,7 @@ const (
EVFILT_WRITE = C.EVFILT_WRITE
)
type Tfork C.struct___tfork
type TforkT C.struct___tfork
type SigaltstackT C.struct_sigaltstack
type Sigcontext C.struct_sigcontext
@ -118,4 +118,4 @@ type Timespec C.struct_timespec
type Timeval C.struct_timeval
type Itimerval C.struct_itimerval
type Kevent C.struct_kevent
type KeventT C.struct_kevent

4
src/pkg/runtime/defs_openbsd_386.h
View File

@ -81,7 +81,7 @@ enum {
EVFILT_WRITE = -0x2,
};
typedef struct Tfork Tfork;
typedef struct TforkT TforkT;
typedef struct SigaltstackT SigaltstackT;
typedef struct Sigcontext Sigcontext;
typedef struct Siginfo Siginfo;
@ -93,7 +93,7 @@ typedef struct KeventT KeventT;
#pragma pack on
struct Tfork {
struct TforkT {
byte *tf_tcb;
int32 *tf_tid;
byte *tf_stack;

4
src/pkg/runtime/defs_openbsd_amd64.h
View File

@ -81,7 +81,7 @@ enum {
EVFILT_WRITE = -0x2,
};
typedef struct Tfork Tfork;
typedef struct TforkT TforkT;
typedef struct SigaltstackT SigaltstackT;
typedef struct Sigcontext Sigcontext;
typedef struct Siginfo Siginfo;
@ -93,7 +93,7 @@ typedef struct KeventT KeventT;
#pragma pack on
struct Tfork {
struct TforkT {
byte *tf_tcb;
int32 *tf_tid;
byte *tf_stack;

6
src/pkg/runtime/os_openbsd.c
View File

@ -26,7 +26,7 @@ extern SigTab runtime·sigtab[];
static Sigset sigset_none;
static Sigset sigset_all = ~(Sigset)0;
extern int32 runtime·tfork(void *param, uintptr psize, M *mp, G *gp, void (*fn)(void));
extern int32 runtime·tfork(TforkT *param, uintptr psize, M *mp, G *gp, void (*fn)(void));
extern int32 runtime·thrsleep(void *ident, int32 clock_id, void *tsp, void *lock, const int32 *abort);
extern int32 runtime·thrwakeup(void *ident, int32 n);
@ -130,7 +130,7 @@ runtime·semawakeup(M *mp)
void
runtime·newosproc(M *mp, void *stk)
{
Tfork param;
TforkT param;
Sigset oset;
int32 ret;
@ -147,7 +147,7 @@ runtime·newosproc(M *mp, void *stk)
param.tf_stack = stk;
oset = runtime·sigprocmask(SIG_SETMASK, sigset_all);
ret = runtime·tfork((byte*)&param, sizeof(param), mp, mp->g0, runtime·mstart);
ret = runtime·tfork(&param, sizeof(param), mp, mp->g0, runtime·mstart);
runtime·sigprocmask(SIG_SETMASK, oset);
if(ret < 0) {