o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: OS X 64-bit build

Browse source 
R=rsc
http://codereview.appspot.com/4838047
This commit is contained in:
Russ Cox 2011-08-02 14:28:04 -04:00
parent babe3439cc
commit fc567f476a
11 changed files with 63 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/libthread/threadimpl.h
View file

@ -24,7 +24,7 @@ extern int swapcontext(ucontext_t*, ucontext_t*);
extern void makecontext(ucontext_t*, void(*)(), int, ...);
#endif
#if defined(__APPLE__)
#if defined(__APPLE__) && !defined(__x86_64__)
/*
* OS X before 10.5 (Leopard) does not provide
* swapcontext nor makecontext, so we have to use our own.
@ -40,8 +40,10 @@ extern void makecontext(ucontext_t*, void(*)(), int, ...);
# define makecontext libthread_makecontext
# if defined(__i386__)
# include "386-ucontext.h"
# else
# elif defined(__power__)
# include "power-ucontext.h"
# else
# error "unknown architecture"
# endif
#endif
@ -99,6 +101,15 @@ enum
struct Context
{
ucontext_t uc;
#ifdef __APPLE__
/*
* On Snow Leopard, etc., the context routines exist,
* so we use them, but apparently they write past the
* end of the ucontext_t. Sigh. We put some extra
* scratch space here for them.
*/
uchar buf[512];
#endif
};
struct Execjob
@ -116,12 +127,12 @@ struct _Thread
_Thread *allnext;
_Thread *allprev;
Context context;
void (*startfn)(void*);
void *startarg;
uint id;
uchar *stk;
uint stksize;
int exiting;
void (*startfn)(void*);
void *startarg;
Proc *proc;
char name[256];
char state[256];