qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-19 21:04:43 -07:00
Code Releases Activity

undo CL 135230043 / 60812bad3769

Browse Source 
broke api check everywhere

««« original CL description
runtime: fix openbsd build

LGTM=iant
R=iant, minux
CC=golang-codereviews, jsing
https://golang.org/cl/135230043

»»»

TBR=mdempsky
CC=golang-codereviews
https://golang.org/cl/137010043
This commit is contained in:
Russ Cox 2014-08-30 00:16:07 -04:00 committed by Ian Lance Taylor
parent 39a021bc0e
commit 1a976f1576
5 changed files with 10 additions and 10 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 TforkT C.struct___tfork
type Tfork 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 KeventT C.struct_kevent
type Kevent C.struct_kevent

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

@ -81,7 +81,7 @@ enum {
EVFILT_WRITE = -0x2,
};
typedef struct TforkT TforkT;
typedef struct Tfork Tfork;
typedef struct SigaltstackT SigaltstackT;
typedef struct Sigcontext Sigcontext;
typedef struct Siginfo Siginfo;
@ -93,7 +93,7 @@ typedef struct KeventT KeventT;
#pragma pack on
struct TforkT {
struct Tfork {
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 TforkT TforkT;
typedef struct Tfork Tfork;
typedef struct SigaltstackT SigaltstackT;
typedef struct Sigcontext Sigcontext;
typedef struct Siginfo Siginfo;
@ -93,7 +93,7 @@ typedef struct KeventT KeventT;
#pragma pack on
struct TforkT {
struct Tfork {
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(TforkT *param, uintptr psize, M *mp, G *gp, void (*fn)(void));
extern int32 runtime·tfork(void *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)
{
TforkT param;
Tfork 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(&param, sizeof(param), mp, mp->g0, runtime·mstart);
ret = runtime·tfork((byte*)&param, sizeof(param), mp, mp->g0, runtime·mstart);
runtime·sigprocmask(SIG_SETMASK, oset);
if(ret < 0) {

2
src/pkg/runtime/os_openbsd.go
View File

@ -15,7 +15,7 @@ func raise(sig int32)
func kqueue() int32
func kevent(fd int32, ev1 unsafe.Pointer, nev1 int32, ev2 unsafe.Pointer, nev2 int32, ts unsafe.Pointer) int32
func closeonexec(fd int32)
func tfork(param *tforkt, psize uintptr, mm, gg, fn unsafe.Pointer) int32
func tfork(param unsafe.Pointer, psize uintptr, mm, gg, fn unsafe.Pointer) int32
func thrsleep(ident unsafe.Pointer, clock_id int32, tsp, lock, abort unsafe.Pointer) int32
func thrwakeup(ident unsafe.Pointer, n int32) int32