X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fx86-64-assem.S;h=42d21da5e7d5cd33aa386deb92058f95a04b5c58;hb=5dbc64f47b6106b196a0286f1c3e2c66c17ee14d;hp=d0cc742db775381eb476012203f4ae394bdf804a;hpb=0f234877047c56ca945fe54e9e77a9cc2c8141cb;p=sbcl.git

diff --git a/src/runtime/x86-64-assem.S b/src/runtime/x86-64-assem.S
index d0cc742..42d21da 100644
--- a/src/runtime/x86-64-assem.S
+++ b/src/runtime/x86-64-assem.S
@@ -141,7 +141,11 @@ GNAME(call_into_lisp_first_time):
 	push	%rbp		# Save old frame pointer.
 	mov	%rsp,%rbp	# Establish new frame.
 	mov     %rsp,ALIEN_STACK + SYMBOL_VALUE_OFFSET
+#if defined(LISP_FEATURE_DARWIN)
 	movq    GSYM(GNAME(all_threads)),%rax
+#else
+        movq    GNAME(all_threads),%rax
+#endif
 	mov     THREAD_CONTROL_STACK_START_OFFSET(%rax) ,%rsp
 	/* don't think too hard about what happens if we get interrupted
 	* here */
@@ -178,10 +182,19 @@ Lstack:
 	push	%rsi	#
 	push	%rdx	#
 #ifdef LISP_FEATURE_SB_THREAD
+#ifdef LISP_FEATURE_GCC_TLS
+	movq	%fs:0, %rax
+	movq	GNAME(current_thread)@TPOFF(%rax), %r12
+#else
+#ifdef LISP_FEATURE_DARWIN
+	mov	GSYM(GNAME(specials)),%rdi
+#else
 	mov	specials,%rdi
-	call    pthread_getspecific
+#endif
+	call    GNAME(pthread_getspecific)
 	mov	%rax,%r12
 #endif
+#endif
 	pop	%rcx	# num args
 	pop	%rbx	# arg vector
 	pop	%rax	# function ptr/lexenv
@@ -263,7 +276,7 @@ GNAME(fpu_restore):
  * the undefined-function trampoline
  */
 	.text
-	.align	align_8byte,0x90
+	.align	align_16byte,0x90
 	.globl  GNAME(undefined_tramp)
 	TYPE(GNAME(undefined_tramp))
 GNAME(undefined_tramp):
@@ -277,7 +290,7 @@ GNAME(undefined_tramp):
 
 
 	.text
-	.align	align_8byte,0x90
+	.align	align_16byte,0x90
 	.globl  GNAME(alloc_tramp)
 	TYPE(GNAME(alloc_tramp))
 GNAME(alloc_tramp):
@@ -313,7 +326,7 @@ GNAME(alloc_tramp):
  * the closure trampoline
  */
 	.text
-	.align	align_8byte,0x90
+	.align	align_16byte,0x90
 	.globl  GNAME(closure_tramp)
 	TYPE(GNAME(closure_tramp))
 GNAME(closure_tramp):
@@ -328,7 +341,7 @@ GNAME(closure_tramp):
 	SIZE(GNAME(closure_tramp))
 
 	.text
-	.align	align_8byte,0x90
+	.align	align_16byte,0x90
 	.globl  GNAME(funcallable_instance_tramp)
 #if !defined(LISP_FEATURE_DARWIN)
         .type	GNAME(funcallable_instance_tramp),@function
@@ -346,7 +359,7 @@ GNAME(closure_tramp):
  */
 	.text
 	.globl 	GNAME(fun_end_breakpoint_guts)
-	.align	align_8byte
+	.align	align_16byte
 GNAME(fun_end_breakpoint_guts):
 	/* Multiple Value return */
 	jc	multiple_value_return
@@ -377,7 +390,7 @@ GNAME(fun_end_breakpoint_end):
 
 	.globl 	GNAME(do_pending_interrupt)
 	TYPE(GNAME(do_pending_interrupt))
-	.align	align_8byte,0x90
+	.align	align_16byte,0x90
 GNAME(do_pending_interrupt):
 	TRAP
 	.byte 	trap_PendingInterrupt
@@ -386,7 +399,7 @@ GNAME(do_pending_interrupt):
 
 	.globl	GNAME(post_signal_tramp)
 	TYPE(GNAME(post_signal_tramp))
-	.align	align_8byte,0x90
+	.align	align_16byte,0x90
 GNAME(post_signal_tramp):
 	/* this is notionally the second half of a function whose first half
  	 * doesn't exist.  This is where call_into_lisp returns when called 
@@ -412,7 +425,7 @@ GNAME(post_signal_tramp):
 	SIZE(GNAME(post_signal_tramp))
 
 	.text
-	.align	align_8byte,0x90
+	.align	align_16byte,0x90
 	.globl  GNAME(fast_bzero)
 	TYPE(GNAME(fast_bzero))