X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fx86-assem.S;h=5a89a4a2832572acabcaed7bc5aa950f2d0af3fa;hb=743831e679b673a5680a0afd8402911516bf50e2;hp=37fcafaf9faa648e959e2d98af0c442db66ad88b;hpb=952d16ab5880823c1864eb9105bb269e2e00760d;p=sbcl.git

diff --git a/src/runtime/x86-assem.S b/src/runtime/x86-assem.S
index 37fcafa..5a89a4a 100644
--- a/src/runtime/x86-assem.S
+++ b/src/runtime/x86-assem.S
@@ -79,7 +79,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 END()
 #define TRAP ud2
 #else
@@ -338,6 +338,7 @@ GNAME(fpu_restore):
 	TYPE(GNAME(undefined_tramp))
         .byte   0, 0, 0, SIMPLE_FUN_HEADER_WIDETAG
 GNAME(undefined_tramp):
+	pop	4(%ebp)         # Save return PC for backtrace.
 	TRAP
 	.byte	trap_Error
         .byte   2