From: Alastair Bridgewater <nyef@virtdev-1.lisphacker.com>
Date: Fri, 21 Oct 2011 16:06:01 +0000 (-0400)
Subject: Fix build on x86-64/darwin.
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=7cee2468541aafc13ace8a943205572dd0cb7958;p=sbcl.git

Fix build on x86-64/darwin.

  * It turns out that darwin preprocesses assembly files slightly
differently from every other platform.  Possibly something related
to the rather VMSish -fdollars-in-identifiers option to gcc.

  * Use parens to break the preprocessor "macro" we're trying to
use away from the dollar-sign literal-constant marker it's getting
merged with.

  * Reported by nikodemus in #sbcl.
---

diff --git a/src/runtime/x86-64-assem.S b/src/runtime/x86-64-assem.S
index e2bc331..52321bf 100644
--- a/src/runtime/x86-64-assem.S
+++ b/src/runtime/x86-64-assem.S
@@ -194,7 +194,7 @@ Lstack:
 	xor	%rdx,%rdx	# clear any descriptor registers 
 	xor	%rdi,%rdi	# that we can't be sure we'll 
 	xor	%rsi,%rsi	# initialise properly.  XX do r8-r15 too?
-	shl	$N_FIXNUM_TAG_BITS,%rcx	# (fixnumize num-args)
+	shl	$(N_FIXNUM_TAG_BITS),%rcx	# (fixnumize num-args)
 	cmp	$0,%rcx
 	je	Ldone
 	mov	0(%rbx),%rdx	# arg0