From: Ivan Maidanski <ivmai@mail.ru>
Date: Thu, 18 Oct 2012 05:35:46 +0000 (+0400)
Subject: Remove nested always-false ifdef for HPUX and FREEBSD
X-Git-Tag: gc7_4_0~195
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2a420e272d9f036130fbf95a359fb4140ff11da3;p=gc

Remove nested always-false ifdef for HPUX and FREEBSD

* include/private/gcconfig.h (USE_HPUX_FIXED_STACKBOTTOM): Add missing
dot in comment.
* os_dep.c (old_bus_act, GC_set_and_save_fault_handler,
GC_reset_fault_handler): Remove false ifdef check for HPUX and FREEBSD
inside ifdef for SUNOS5SIGS, IRIX5, OSF1, HURD, or NETBSD.
---

diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h
index 5fde4ffd..d90ddadb 100644
--- a/include/private/gcconfig.h
+++ b/include/private/gcconfig.h
@@ -1638,7 +1638,7 @@
 #     define DATASTART ((ptr_t)(__data_start))
 #     ifdef USE_HPUX_FIXED_STACKBOTTOM
         /* The following appears to work for 7xx systems running HP/UX  */
-        /* 9.xx Furthermore, it might result in much faster             */
+        /* 9.xx.  Furthermore, it might result in much faster           */
         /* collections than HEURISTIC2, which may involve scanning      */
         /* segments that directly precede the stack.  It is not the     */
         /* default, since it may not work on older machine/OS           */
diff --git a/os_dep.c b/os_dep.c
index f042758a..87be7997 100644
--- a/os_dep.c
+++ b/os_dep.c
@@ -846,8 +846,8 @@ GC_INNER word GC_page_size = 0;
 #   if defined(SUNOS5SIGS) || defined(IRIX5) || defined(OSF1) \
        || defined(HURD) || defined(NETBSD)
         static struct sigaction old_segv_act;
-#       if defined(_sigargs) /* !Irix6.x */ || defined(HPUX) \
-           || defined(HURD) || defined(NETBSD) || defined(FREEBSD)
+#       if defined(_sigargs) /* !Irix6.x */ \
+           || defined(HURD) || defined(NETBSD)
             static struct sigaction old_bus_act;
 #       endif
 #   else
@@ -882,8 +882,7 @@ GC_INNER word GC_page_size = 0;
 #         else
             (void) sigaction(SIGSEGV, &act, &old_segv_act);
 #           if defined(IRIX5) && defined(_sigargs) /* Irix 5.x, not 6.x */ \
-               || defined(HPUX) || defined(HURD) || defined(NETBSD) \
-               || defined(FREEBSD)
+               || defined(HURD) || defined(NETBSD)
               /* Under Irix 5.x or HP/UX, we may get SIGBUS.    */
               /* Pthreads doesn't exist under Irix 5.x, so we   */
               /* don't have to worry in the threads case.       */
@@ -923,8 +922,7 @@ GC_INNER word GC_page_size = 0;
            || defined(OSF1) || defined(HURD) || defined(NETBSD)
           (void) sigaction(SIGSEGV, &old_segv_act, 0);
 #         if defined(IRIX5) && defined(_sigargs) /* Irix 5.x, not 6.x */ \
-             || defined(HPUX) || defined(HURD) || defined(NETBSD) \
-             || defined(FREEBSD)
+             || defined(HURD) || defined(NETBSD)
               (void) sigaction(SIGBUS, &old_bus_act, 0);
 #         endif
 #       else