Index: /branches/x8664-call/ccl/compiler/X86/x86-lap.lisp
===================================================================
--- /branches/x8664-call/ccl/compiler/X86/x86-lap.lisp	(revision 6321)
+++ /branches/x8664-call/ccl/compiler/X86/x86-lap.lisp	(revision 6322)
@@ -1373,7 +1373,9 @@
          (*x86-lap-lfun-bits* bits)
          (end-code-tag (gensym))
+         (entry-code-tag (gensym))
          (instruction (x86::make-x86-instruction))
          (frag-list (make-frag-list)))
     (make-x86-lap-label end-code-tag)
+    (make-x86-lap-label entry-code-tag)
     (x86-lap-directive frag-list :long `(ash (+ (- (:^ ,end-code-tag ) 8)
                                               *x86-lap-entry-offset*) -3))
@@ -1381,4 +1383,6 @@
     (x86-lap-directive frag-list :byte 0) ;regsave ea
     (x86-lap-directive frag-list :byte 0) ;regsave mask
+    (emit-x86-lap-label frag-list entry-code-tag)
+    (x86-lap-form `(lea (@ (:^ ,entry-code-tag) (% rip)) (% fn)) frag-list instruction)
     (dolist (f forms)
       (x86-lap-form f frag-list instruction))