* os_dep.c: Fix i686-apple-darwin9 builds.

From-SVN: r120874
This commit is contained in:
Mike Stump 2007-01-17 20:12:51 +00:00 committed by Mike Stump
parent 4eb3e79538
commit 6109092d3d
2 changed files with 14 additions and 1 deletions

View File

@ -1,3 +1,7 @@
2007-01-17 Mike Stump <mrs@apple.com>
* os_dep.c: Fix i686-apple-darwin9 builds.
2007-01-16 Jack Howarth <howarth@bromo.med.uc.edu>
* aclocal.m4: Regenerate to use multi.m4.

View File

@ -3405,6 +3405,15 @@ extern kern_return_t exception_raise_state_identity(
#define MAX_EXCEPTION_PORTS 16
#if defined (HAS_PPC_THREAD_STATE___R0) || \
defined (HAS_PPC_THREAD_STATE64___R0) || \
defined (HAS_X86_THREAD_STATE32___EAX) || \
defined (HAS_X86_THREAD_STATE64___RAX)
# define THREAD_FLD(x) __ ## x
#else
# define THREAD_FLD(x) x
#endif
static struct {
mach_msg_type_number_t count;
exception_mask_t masks[MAX_EXCEPTION_PORTS];
@ -3846,7 +3855,7 @@ catch_exception_raise(
#if defined(POWERPC)
addr = (char*) exc_state.dar;
#elif defined (I386) || defined (X86_64)
addr = (char*) exc_state.faultvaddr;
addr = (char*) exc_state. THREAD_FLD(faultvaddr);
#else
# error FIXME for non POWERPC/I386
#endif