Test __OpenBSD__ along with __NetBSD__.

3 files changed, 13 insertions, 11 deletions

diff --git a/src/m/ns32000.h b/src/m/ns32000.h
index 9fe59767089..345d4174a76 100644
--- a/src/m/ns32000.h
+++ b/src/m/ns32000.h
@@ -88,7 +88,7 @@ Boston, MA 02111-1307, USA.  */
    in the file alloca.s should be used.  */
 
 /* #define C_ALLOCA */
-#ifdef __NetBSD__
+#if defined (__NetBSD__) || defined (__OpenBSD__)
 #define HAVE_ALLOCA
 #endif
 
@@ -103,7 +103,7 @@ Boston, MA 02111-1307, USA.  */
 
 #define STACK_DIRECTION -1
 
-#ifndef __NetBSD__
+#if !defined (__NetBSD__) && !defined (__OpenBSD__)
 #define EXEC_MAGIC 0410
 
 #define PURESIZE 140000
diff --git a/src/m/sparc.h b/src/m/sparc.h
index 9b3ccf362a5..012826f0919 100644
--- a/src/m/sparc.h
+++ b/src/m/sparc.h
@@ -103,8 +103,7 @@ NOTE-END  */
 #define PURESIZE 130000
 #endif
 
-#ifndef __NetBSD__
-#ifndef __linux__
+#if !defined (__NetBSD__) && !defined (__linux__) && !defined (__OpenBSD__)
 /* This really belongs in s/sun.h.  */
 
 /* Say that the text segment of a.out includes the header;
@@ -117,5 +116,4 @@ NOTE-END  */
 
 #define A_TEXT_SEEK(HDR) (N_TXTOFF (hdr) + sizeof (hdr))
 
-#endif /* __linux__ */
-#endif /* __NetBSD__ */
+#endif /* not __NetBSD__ and not __linux__ and not __OpenBSD__ */
diff --git a/src/unexalpha.c b/src/unexalpha.c
index 450c81539fb..987828664eb 100644
--- a/src/unexalpha.c
+++ b/src/unexalpha.c
@@ -27,7 +27,7 @@ Boston, MA 02111-1307, USA.  */
 #include <sys/mman.h>
 #include <stdio.h>
 #include <varargs.h>
-#ifndef __NetBSD__
+#if !defined (__NetBSD__) && !defined (__OpenBSD__)
 #include <filehdr.h>
 #include <aouthdr.h>
 #include <scnhdr.h>
@@ -36,7 +36,7 @@ Boston, MA 02111-1307, USA.  */
 # include <reloc.h>
 # include <elf_abi.h>
 #endif
-#else /* __NetBSD__ */
+#else /* __NetBSD__ or __OpenBSD__ */
 /*
  * NetBSD/Alpha does not have 'normal' user-land ECOFF support because
  * there's no desire to support ECOFF as the executable format in the
@@ -51,7 +51,11 @@ Boston, MA 02111-1307, USA.  */
 #define HDRR            struct ecoff_symhdr
 #define pHDRR           HDRR *
 #define cbHDRR          sizeof(HDRR)
+#ifdef __OpenBSD__
+#define ALPHAMAGIC      ECOFF_MAGIC_NATIVE_ALPHA
+#else
 #define ALPHAMAGIC      ECOFF_MAGIC_NETBSD_ALPHA
+#endif
 #define ZMAGIC          ECOFF_ZMAGIC
 
 /* Misc. constants that NetBSD doesn't define at all. */
@@ -71,7 +75,7 @@ Boston, MA 02111-1307, USA.  */
 #define _RDATA          ".rdata"
 #define _SDATA          ".sdata"
 #define _SBSS           ".sbss"
-#endif /* __NetBSD__ */
+#endif /* __NetBSD__ || __OpenBSD__ */
 
 static void fatal_unexec ();
 static void mark_x ();
@@ -422,7 +426,7 @@ update_dynamic_symbols (old, new_name, new, aout)
      int new;                   /* File descriptor for new executable */
      struct aouthdr aout;       /* a.out info from the file header */
 {
-#if !defined (__linux__) && !defined (__NetBSD__)
+#if !defined (__linux__) && !defined (__NetBSD__) && !defined (__OpenBSD__)
 
   typedef struct dynrel_info {
     char * addr;
@@ -492,7 +496,7 @@ update_dynamic_symbols (old, new_name, new, aout)
 
   }
 
-#endif /* not __linux__ and not __NetBSD__ */
+#endif /* not __linux__ and not __NetBSD__ and not __OpenBSD__ */
 }