From 6109092d3de5ae35439ae6c31a3bdf262cf9fe17 Mon Sep 17 00:00:00 2001
From: Mike Stump <mrs@apple.com>
Date: Wed, 17 Jan 2007 20:12:51 +0000
Subject: * os_dep.c: Fix i686-apple-darwin9 builds.

From-SVN: r120874
---
 boehm-gc/os_dep.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'boehm-gc/os_dep.c')

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
-- 
cgit v1.1