Commit 61e63089 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

Test __OpenBSD__ along with __NetBSD__.

parent bd698e98
...@@ -88,7 +88,7 @@ Boston, MA 02111-1307, USA. */ ...@@ -88,7 +88,7 @@ Boston, MA 02111-1307, USA. */
in the file alloca.s should be used. */ in the file alloca.s should be used. */
/* #define C_ALLOCA */ /* #define C_ALLOCA */
#ifdef __NetBSD__ #if defined (__NetBSD__) || defined (__OpenBSD__)
#define HAVE_ALLOCA #define HAVE_ALLOCA
#endif #endif
...@@ -103,7 +103,7 @@ Boston, MA 02111-1307, USA. */ ...@@ -103,7 +103,7 @@ Boston, MA 02111-1307, USA. */
#define STACK_DIRECTION -1 #define STACK_DIRECTION -1
#ifndef __NetBSD__ #if !defined (__NetBSD__) && !defined (__OpenBSD__)
#define EXEC_MAGIC 0410 #define EXEC_MAGIC 0410
#define PURESIZE 140000 #define PURESIZE 140000
......
...@@ -103,8 +103,7 @@ NOTE-END */ ...@@ -103,8 +103,7 @@ NOTE-END */
#define PURESIZE 130000 #define PURESIZE 130000
#endif #endif
#ifndef __NetBSD__ #if !defined (__NetBSD__) && !defined (__linux__) && !defined (__OpenBSD__)
#ifndef __linux__
/* This really belongs in s/sun.h. */ /* This really belongs in s/sun.h. */
/* Say that the text segment of a.out includes the header; /* Say that the text segment of a.out includes the header;
...@@ -117,5 +116,4 @@ NOTE-END */ ...@@ -117,5 +116,4 @@ NOTE-END */
#define A_TEXT_SEEK(HDR) (N_TXTOFF (hdr) + sizeof (hdr)) #define A_TEXT_SEEK(HDR) (N_TXTOFF (hdr) + sizeof (hdr))
#endif /* __linux__ */ #endif /* not __NetBSD__ and not __linux__ and not __OpenBSD__ */
#endif /* __NetBSD__ */
...@@ -27,7 +27,7 @@ Boston, MA 02111-1307, USA. */ ...@@ -27,7 +27,7 @@ Boston, MA 02111-1307, USA. */
#include <sys/mman.h> #include <sys/mman.h>
#include <stdio.h> #include <stdio.h>
#include <varargs.h> #include <varargs.h>
#ifndef __NetBSD__ #if !defined (__NetBSD__) && !defined (__OpenBSD__)
#include <filehdr.h> #include <filehdr.h>
#include <aouthdr.h> #include <aouthdr.h>
#include <scnhdr.h> #include <scnhdr.h>
...@@ -36,7 +36,7 @@ Boston, MA 02111-1307, USA. */ ...@@ -36,7 +36,7 @@ Boston, MA 02111-1307, USA. */
# include <reloc.h> # include <reloc.h>
# include <elf_abi.h> # include <elf_abi.h>
#endif #endif
#else /* __NetBSD__ */ #else /* __NetBSD__ or __OpenBSD__ */
/* /*
* NetBSD/Alpha does not have 'normal' user-land ECOFF support because * NetBSD/Alpha does not have 'normal' user-land ECOFF support because
* there's no desire to support ECOFF as the executable format in the * there's no desire to support ECOFF as the executable format in the
...@@ -51,7 +51,11 @@ Boston, MA 02111-1307, USA. */ ...@@ -51,7 +51,11 @@ Boston, MA 02111-1307, USA. */
#define HDRR struct ecoff_symhdr #define HDRR struct ecoff_symhdr
#define pHDRR HDRR * #define pHDRR HDRR *
#define cbHDRR sizeof(HDRR) #define cbHDRR sizeof(HDRR)
#ifdef __OpenBSD__
#define ALPHAMAGIC ECOFF_MAGIC_NATIVE_ALPHA
#else
#define ALPHAMAGIC ECOFF_MAGIC_NETBSD_ALPHA #define ALPHAMAGIC ECOFF_MAGIC_NETBSD_ALPHA
#endif
#define ZMAGIC ECOFF_ZMAGIC #define ZMAGIC ECOFF_ZMAGIC
/* Misc. constants that NetBSD doesn't define at all. */ /* Misc. constants that NetBSD doesn't define at all. */
...@@ -71,7 +75,7 @@ Boston, MA 02111-1307, USA. */ ...@@ -71,7 +75,7 @@ Boston, MA 02111-1307, USA. */
#define _RDATA ".rdata" #define _RDATA ".rdata"
#define _SDATA ".sdata" #define _SDATA ".sdata"
#define _SBSS ".sbss" #define _SBSS ".sbss"
#endif /* __NetBSD__ */ #endif /* __NetBSD__ || __OpenBSD__ */
static void fatal_unexec (); static void fatal_unexec ();
static void mark_x (); static void mark_x ();
...@@ -422,7 +426,7 @@ update_dynamic_symbols (old, new_name, new, aout) ...@@ -422,7 +426,7 @@ update_dynamic_symbols (old, new_name, new, aout)
int new; /* File descriptor for new executable */ int new; /* File descriptor for new executable */
struct aouthdr aout; /* a.out info from the file header */ 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 { typedef struct dynrel_info {
char * addr; char * addr;
...@@ -492,7 +496,7 @@ update_dynamic_symbols (old, new_name, new, aout) ...@@ -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__ */
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment