X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fglobals.c;h=099acd26326711398a23b940e1172d7675317737;hb=743831e679b673a5680a0afd8402911516bf50e2;hp=9c1010e726102453809b901912fe608b315eb16f;hpb=d8e682fdfb7e8ba067e15aea0f3d1f8d37ca9eb1;p=sbcl.git

diff --git a/src/runtime/globals.c b/src/runtime/globals.c
index 9c1010e..099acd2 100644
--- a/src/runtime/globals.c
+++ b/src/runtime/globals.c
@@ -22,7 +22,9 @@
 #include "globals.h"
 #include "validate.h"
 
+#ifdef FOREIGN_FUNCTION_CALL_FLAG
 int foreign_function_call_active;
+#endif
 
 lispobj *current_control_stack_pointer;
 lispobj *current_control_frame_pointer;
@@ -32,7 +34,7 @@ lispobj *current_binding_stack_pointer;
 
 /* ALLOCATION_POINTER is x86 or RT.  Anyone want to do an RT port?   */
 
-#ifndef ALLOCATION_POINTER
+# if !defined(LISP_FEATURE_X86) && !defined(LISP_FEATURE_X86_64)
 /* The Object Formerly Known As current_dynamic_space_free_pointer */
 lispobj *dynamic_space_free_pointer;
 #endif
@@ -41,16 +43,12 @@ lispobj *dynamic_space_free_pointer;
 lispobj *current_auto_gc_trigger;
 #endif
 
-#ifdef LISP_FEATURE_SB_THREAD
-boolean stop_the_world=0;
-#endif
-
 /* For copying GCs, this points to the start of the dynamic space
  * currently in use (that will become the from_space when the next GC
  * is done).  For the GENCGC, it always points to DYNAMIC_SPACE_START. */
 lispobj *current_dynamic_space;
 
-#if defined(LISP_FEATURE_SB_THREAD)
+#if defined(LISP_FEATURE_SB_THREAD) && !defined(LISP_FEATURE_GCC_TLS)
 pthread_key_t specials=0;
 #endif
 
@@ -60,14 +58,16 @@ void globals_init(void)
      * validate() and coreparse(). */
     current_control_frame_pointer = (lispobj *)0;
 
-#ifndef LISP_FEATURE_GENCGC 
+#ifndef LISP_FEATURE_GENCGC
     /* no GC trigger yet */
     current_auto_gc_trigger = NULL;
 #endif
 
-    /* Set foreign function call active. */
+#ifdef FOREIGN_FUNCTION_CALL_FLAG
     foreign_function_call_active = 1;
-#if defined(LISP_FEATURE_SB_THREAD)
+#endif
+
+#if defined(LISP_FEATURE_SB_THREAD) && !defined(LISP_FEATURE_GCC_TLS)
     pthread_key_create(&specials,0);
-#endif    
+#endif
 }