From cd5fa21f07bd24680581e7681b59f4bef932290d Mon Sep 17 00:00:00 2001
From: Richard Brooksby <rb@ravenbrook.com>
Date: Mon, 30 Jul 2012 14:39:40 +0100
Subject: [PATCH] Fixing signal handling for freebsd 7.  freebsd now signals
 sigsegv with code segv_accerr for memory protection faults.  updated
 config.h.

Copied from Perforce
 Change: 178775
 ServerID: perforce.ravenbrook.com
---
 mps/code/config.h | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/mps/code/config.h b/mps/code/config.h
index 025e775ea88..f31ca7b2595 100644
--- a/mps/code/config.h
+++ b/mps/code/config.h
@@ -259,18 +259,16 @@
    define what signal number to use, and what si_code value to check.
 */
 
-#if defined(MPS_OS_O1) || defined(MPS_OS_SO)
+#if defined(MPS_OS_O1) || defined(MPS_OS_SO) || defined(MPS_OS_FR)
 #define PROT_SIGNAL (SIGSEGV)
-#elif defined(MPS_OS_FR) || defined(MPS_OS_XC)
+#elif defined(MPS_OS_XC)
 #define PROT_SIGNAL (SIGBUS)
 #endif
 
 #if defined(MPS_OS_XC)
 #define PROT_SIGINFO_GOOD(info) (1)
-#elif defined(MPS_OS_O1)
+#elif defined(MPS_OS_O1) || defined(MPS_OS_FR)
 #define PROT_SIGINFO_GOOD(info) ((info)->si_code == SEGV_ACCERR)
-#elif defined(MPS_OS_FR)
-#define PROT_SIGINFO_GOOD(info) ((info)->si_code == BUS_PAGE_FAULT)
 #endif