1.0.26.15: interrupt.c refactoring

[sbcl.git] / src / runtime / x86-linux-os.c

diff --git a/src/runtime/x86-linux-os.c b/src/runtime/x86-linux-os.c
index d68e964..ddbe154 100644 (file)
--- a/src/runtime/x86-linux-os.c
+++ b/src/runtime/x86-linux-os.c
@@ -107,8 +107,12 @@ int arch_os_thread_init(struct thread *thread) {
     pthread_mutex_unlock(&modify_ldt_lock);
 
     if(n<0) return 0;
+#ifdef LISP_FEATURE_GCC_TLS
+    current_thread = thread;
+#else
     pthread_setspecific(specials,thread);
 #endif
+#endif
 #ifdef LISP_FEATURE_C_STACK_IS_CONTROL_STACK
     /* Signal handlers are run on the control stack, so if it is exhausted
      * we had better use an alternate stack for whatever signal tells us
@@ -204,7 +208,8 @@ os_context_sigmask_addr(os_context_t *context)
 void
 os_restore_fp_control(os_context_t *context)
 {
-    asm ("fldcw %0" : : "m" (context->uc_mcontext.fpregs->cw));
+    if (context->uc_mcontext.fpregs)
+        asm ("fldcw %0" : : "m" (context->uc_mcontext.fpregs->cw));
 }
 
 void