X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fbsd-os.h;h=f1669d6ccaed9b0bb5146eeb785bcc0c437c8196;hb=42ab0c5b87f834c69842713c60587a76f953411f;hp=b8a503f8ae7a2b72f5fc6f98ebbf5e997dab8ec7;hpb=402958f92506b9d3de852601b8c1ccb99b5ee558;p=sbcl.git

diff --git a/src/runtime/bsd-os.h b/src/runtime/bsd-os.h
index b8a503f..f1669d6 100644
--- a/src/runtime/bsd-os.h
+++ b/src/runtime/bsd-os.h
@@ -31,7 +31,6 @@ typedef vm_size_t os_vm_size_t;
 #endif
 typedef off_t os_vm_offset_t;
 typedef int os_vm_prot_t;
-typedef int os_context_register_t;
 
 #if defined __OpenBSD__
 /* name defined for compatibility between OpenBSD 3.1 sigaltstack(2) and
@@ -54,7 +53,6 @@ typedef ucontext_t os_context_t;
  * 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 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
@@ -63,7 +61,11 @@ typedef ucontext_t os_context_t;
  * 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
+/* Hooking both SIGBUS and SIGSEGV causes troubles on some situation,
+ * so use a variable.
+ */
+extern int sig_memory_fault;
+#define SIG_MEMORY_FAULT (sig_memory_fault)
 
 #define SIG_INTERRUPT_THREAD (SIGINFO)
 #define SIG_STOP_FOR_GC (SIGUSR1)