merge Kevin's work so far on places

svn: r11226

diff --git a/Makefile.in b/Makefile.in
index dfdb185214a3116f6989ccf42665e5acde9fbe28..072fbef4a057fed90d879c8c8408b62c24b7c217 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -31,7 +31,7 @@ mainsrcdir = @srcdir@/../..
 # compiler options; mainly used to allow importing options
 OPTIONS=@OPTIONS@ @CGCOPTIONS@
 
-BASEFLAGS= -I$(srcdir)/include -DNO_SIGNALS @CFLAGS@ @COMPFLAGS@ @PREFLAGS@
+BASEFLAGS= -I$(srcdir)/include -DNO_SIGNALS @CFLAGS@ @COMPFLAGS@ @PREFLAGS@ @PLACE_CGC_FLAGS@
 CFLAGS= $(BASEFLAGS) @PROFFLAGS@ $(OPTIONS) -DNO_EXECUTE_PERMISSION -DSILENT -DNO_GETENV -DLARGE_CONFIG -DATOMIC_UNCOLLECTABLE -DINITIAL_MARK_STACK_SIZE=8192
 
 # To build the parallel collector on Linux, add to the above:

diff --git a/darwin_stop_world.c b/darwin_stop_world.c
index 665e8965493fa74906b265369049c3fb795b6093..b2814abb27bc567d4f320f9818ad094049b19f89 100644 (file)
--- a/darwin_stop_world.c
+++ b/darwin_stop_world.c
@@ -102,15 +102,15 @@ void GC_push_all_stacks() {
        if(r != KERN_SUCCESS) ABORT("thread_get_state failed");
        
 #if defined(I386)
-       lo = state.esp;
-
-       GC_push_one(state.eax); 
-       GC_push_one(state.ebx); 
-       GC_push_one(state.ecx); 
-       GC_push_one(state.edx); 
-       GC_push_one(state.edi); 
-       GC_push_one(state.esi); 
-       GC_push_one(state.ebp); 
+       lo = state.__esp;
+
+       GC_push_one(state.__eax); 
+       GC_push_one(state.__ebx); 
+       GC_push_one(state.__ecx); 
+       GC_push_one(state.__edx); 
+       GC_push_one(state.__edi); 
+       GC_push_one(state.__esi); 
+       GC_push_one(state.__ebp); 
 #elif defined(POWERPC)
        lo = (void*)(state.r1 - PPC_RED_ZONE_SIZE);