0.9.11.19:

[sbcl.git] / src / runtime / bsd-os.h

diff --git a/src/runtime/bsd-os.h b/src/runtime/bsd-os.h
index 5dfff24..474f686 100644 (file)
--- a/src/runtime/bsd-os.h
+++ b/src/runtime/bsd-os.h
@@ -49,12 +49,16 @@ typedef struct sigaltstack stack_t;
 
 #include <sys/ucontext.h>
 typedef ucontext_t os_context_t;
-/* As the sbcl-devel message from Raymond Wiker 2000-12-01, FreeBSD
- * (unlike Linux and OpenBSD) doesn't let us tweak the CPU's single
- * step flag bit by messing with the flags stored in a signal context,
- * so we need to implement single stepping in a more roundabout way. */
-#define CANNOT_GET_TO_SINGLE_STEP_FLAG
-#define SIG_MEMORY_FAULT SIGBUS
+#define SIG_MEMORY_FAULT SIGSEGV
+/* Sometime in late 2005 FreeBSD was changed to signal SIGSEGV instead
+ * of SIGBUS for memory faults, as required by POSIX. In order to
+ * support both new and old FreeBSD at the same time, both signals are
+ * hooked to the GC write barrier machinery. If you're reading this
+ * message in the far future where FreeBSD 6 and earlier are just
+ * quaint memories, feel free to delete this hack (and any code that's
+ * #ifdef SIG_MEMORY_FAULT2'ed). -- JES, 2005-12-30
+ */
+#define SIG_MEMORY_FAULT2 SIGBUS
 
 #elif defined __OpenBSD__
 
@@ -75,8 +79,15 @@ typedef ucontext_t os_context_t;
      If Apple is going to break ucontext_t out of spite, I'm going
      to be cross with them ;) -- PRM */
 
+#if defined(LISP_FEATURE_X86)
+#include <sys/ucontext.h>
+#include <sys/_types.h>
+typedef struct ucontext os_context_t;
+#else
 #include <ucontext.h>
 typedef ucontext_t os_context_t;
+#endif
+
 #define SIG_MEMORY_FAULT SIGBUS
 
 #else