From: Alastair Bridgewater <lisphacker@users.sourceforge.net>
Date: Wed, 11 Aug 2010 14:59:01 +0000 (+0000)
Subject: 1.0.41.44: runtime: Fix build on non-threaded x86oids.
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=25b40c1d98a0eab47e220fb98189cf277e70848f;p=sbcl.git

1.0.41.44: runtime: Fix build on non-threaded x86oids.

  * In 1.0.41.21, I accidentally broke non-threaded x86oid builds.

  * Reported by Josh Elsasser and Bruce O'Neel with patches
provided, and Harald Hanche-Olsen without a patch.

  * This fix based on the patch by Josh Elsasser.
---

diff --git a/src/runtime/globals.c b/src/runtime/globals.c
index 5c0cd1d..63d53ed 100644
--- a/src/runtime/globals.c
+++ b/src/runtime/globals.c
@@ -26,7 +26,7 @@
 int foreign_function_call_active;
 #endif
 
-#if !defined(LISP_FEATURE_SB_THREAD) && !defined(LISP_FEATURE_C_STACK_IS_CONTROL_STACK)
+#if !defined(LISP_FEATURE_SB_THREAD)
 lispobj *current_control_stack_pointer;
 #endif
 #if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64) || !defined(LISP_FEATURE_SB_THREAD)
diff --git a/src/runtime/globals.h b/src/runtime/globals.h
index e807eee..2c02ebe 100644
--- a/src/runtime/globals.h
+++ b/src/runtime/globals.h
@@ -47,7 +47,7 @@ extern char **ENVIRON;
 extern pthread_key_t specials;
 #endif
 
-#if !defined(LISP_FEATURE_SB_THREAD) && !defined(LISP_FEATURE_C_STACK_IS_CONTROL_STACK)
+#if !defined(LISP_FEATURE_SB_THREAD)
 extern lispobj *current_control_stack_pointer;
 #endif
 #if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64) || !defined(LISP_FEATURE_SB_THREAD)
diff --git a/src/runtime/thread.h b/src/runtime/thread.h
index e1765d7..3de5415 100644
--- a/src/runtime/thread.h
+++ b/src/runtime/thread.h
@@ -188,6 +188,8 @@ StaticSymbolFunction(lispobj sym)
     SymbolValue(BINDING_STACK_POINTER, thread)
 #define set_binding_stack_pointer(thread,value) \
     SetSymbolValue(BINDING_STACK_POINTER, (lispobj)(value), thread)
+#define access_control_stack_pointer(thread)    \
+    (current_control_stack_pointer)
 #else
 #define get_binding_stack_pointer(thread)       \
     (current_binding_stack_pointer)
diff --git a/version.lisp-expr b/version.lisp-expr
index efc894f..0e2c43a 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"1.0.41.43"
+"1.0.41.44"