X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fx86-64-assem.S;h=c29acebe3567bb0a4aed8671a3f2d16436c3292b;hb=f17e3d27d7ff599f9443d011d17017a2a858c81a;hp=ac420108843e9d42c27b2502f69fdf129c64236e;hpb=9184392783512f76eb971b7e316c875e2a1eb94c;p=sbcl.git

diff --git a/src/runtime/x86-64-assem.S b/src/runtime/x86-64-assem.S
index ac42010..c29aceb 100644
--- a/src/runtime/x86-64-assem.S
+++ b/src/runtime/x86-64-assem.S
@@ -67,7 +67,7 @@
  * for this instruction in the SIGILL handler and if we see it, we
  * advance the EIP by two bytes to skip over ud2 instruction and
  * call sigtrap_handler. */
-#if defined(LISP_FEATURE_DARWIN)
+#if defined(LISP_FEATURE_UD2_BREAKPOINTS)
 #define TRAP ud2
 #else
 #define TRAP int3
@@ -266,6 +266,7 @@ GNAME(fpu_restore):
 	.globl  GNAME(undefined_tramp)
 	TYPE(GNAME(undefined_tramp))
 GNAME(undefined_tramp):
+	pop	8(%rbp)         # Save return PC for backtrace.
 	TRAP
 	.byte	trap_Error
         .byte   2