diff options
| author | Mike Stump <mrs@apple.com> | 2007-01-17 20:12:51 +0000 |
|---|---|---|
| committer | Mike Stump <mrs@gcc.gnu.org> | 2007-01-17 20:12:51 +0000 |
| commit | 6109092d3de5ae35439ae6c31a3bdf262cf9fe17 (patch) | |
| tree | d954dc6331c61ac5adc53c8d041c659ce5d9709c | |
| parent | 4eb3e79538c873aa3de132ad96e67d1ea09430e6 (diff) | |
| download | gcc-6109092d3de5ae35439ae6c31a3bdf262cf9fe17.zip gcc-6109092d3de5ae35439ae6c31a3bdf262cf9fe17.tar.gz gcc-6109092d3de5ae35439ae6c31a3bdf262cf9fe17.tar.bz2 | |
* os_dep.c: Fix i686-apple-darwin9 builds.
From-SVN: r120874
| -rw-r--r-- | boehm-gc/ChangeLog | 4 | ||||
| -rw-r--r-- | boehm-gc/os_dep.c | 11 |
2 files changed, 14 insertions, 1 deletions
diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog index e8a9aa1..17a59b6 100644 --- a/boehm-gc/ChangeLog +++ b/boehm-gc/ChangeLog @@ -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. diff --git a/boehm-gc/os_dep.c b/boehm-gc/os_dep.c index 540dcba..3081105 100644 --- a/boehm-gc/os_dep.c +++ b/boehm-gc/os_dep.c @@ -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 |