summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gnu/usr.bin/ld/i386/md.c6
-rw-r--r--gnu/usr.bin/ld/i386/md.h6
-rw-r--r--gnu/usr.bin/ld/m68k/md.c4
-rw-r--r--gnu/usr.bin/ld/ns32k/md.c2
-rw-r--r--gnu/usr.bin/ld/sparc/md.h6
-rw-r--r--gnu/usr.bin/ld/vax/md.c6
-rw-r--r--gnu/usr.bin/ld/vax/md.h6
7 files changed, 18 insertions, 18 deletions
diff --git a/gnu/usr.bin/ld/i386/md.c b/gnu/usr.bin/ld/i386/md.c
index 6f4dfdb475a..029c09235dd 100644
--- a/gnu/usr.bin/ld/i386/md.c
+++ b/gnu/usr.bin/ld/i386/md.c
@@ -27,7 +27,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: md.c,v 1.1 1995/10/18 08:40:56 deraadt Exp $
+ * $Id: md.c,v 1.2 1996/09/30 22:29:26 deraadt Exp $
*/
#include <sys/param.h>
@@ -244,7 +244,7 @@ md_init_header(hp, magic, flags)
struct exec *hp;
int magic, flags;
{
-#ifdef NetBSD
+#if defined(__NetBSD__) || defined(__OpenBSD__)
if (oldmagic || magic == QMAGIC)
hp->a_midmag = magic;
else
@@ -287,7 +287,7 @@ void
md_swapout_exec_hdr(h)
struct exec *h;
{
- /* NetBSD: Always leave magic alone */
+ /* NetBSD/OpenBSD: Always leave magic alone */
int skip = 1;
#if 0
if (N_GETMAGIC(*h) == OMAGIC)
diff --git a/gnu/usr.bin/ld/i386/md.h b/gnu/usr.bin/ld/i386/md.h
index 4f5ae3d97f1..b0d25b9fa38 100644
--- a/gnu/usr.bin/ld/i386/md.h
+++ b/gnu/usr.bin/ld/i386/md.h
@@ -27,7 +27,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: md.h,v 1.1 1995/10/18 08:40:56 deraadt Exp $
+ * $Id: md.h,v 1.2 1996/09/30 22:29:27 deraadt Exp $
*/
@@ -37,13 +37,13 @@
#define MAX_ALIGNMENT (sizeof (long))
-#ifdef NetBSD
+#if defined(__NetBSD__) || defined(__OpenBSD__)
#define PAGSIZ __LDPGSZ
#else
#define PAGSIZ 4096
#endif
-#if defined(NetBSD) || defined(CROSS_LINKER)
+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(CROSS_LINKER)
#define N_SET_FLAG(ex,f) (oldmagic || N_GETMAGIC(ex)==QMAGIC ? (0) : \
N_SETMAGIC(ex, \
diff --git a/gnu/usr.bin/ld/m68k/md.c b/gnu/usr.bin/ld/m68k/md.c
index 63a5d5e7ee6..9eadd9a65a9 100644
--- a/gnu/usr.bin/ld/m68k/md.c
+++ b/gnu/usr.bin/ld/m68k/md.c
@@ -27,7 +27,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: md.c,v 1.1 1995/10/18 08:40:57 deraadt Exp $
+ * $Id: md.c,v 1.2 1996/09/30 22:29:29 deraadt Exp $
*/
#include <sys/param.h>
@@ -292,7 +292,7 @@ void
md_swapout_exec_hdr(h)
struct exec *h;
{
- /* NetBSD: Always leave magic alone */
+ /* NetBSD/OpenBSD: Always leave magic alone */
int skip = 1;
#if 0
if (N_GETMAGIC(*h) == OMAGIC)
diff --git a/gnu/usr.bin/ld/ns32k/md.c b/gnu/usr.bin/ld/ns32k/md.c
index 0d3f1d0b951..d1d6721953a 100644
--- a/gnu/usr.bin/ld/ns32k/md.c
+++ b/gnu/usr.bin/ld/ns32k/md.c
@@ -443,7 +443,7 @@ void
md_swapout_exec_hdr(h)
struct exec *h;
{
- /* NetBSD: Always leave magic alone */
+ /* NetBSD/OpenBSD: Always leave magic alone */
int skip = 1;
#if 0
if (N_GETMAGIC(*h) == OMAGIC)
diff --git a/gnu/usr.bin/ld/sparc/md.h b/gnu/usr.bin/ld/sparc/md.h
index b2f6b353c1a..fd9742a6103 100644
--- a/gnu/usr.bin/ld/sparc/md.h
+++ b/gnu/usr.bin/ld/sparc/md.h
@@ -27,7 +27,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: md.h,v 1.1 1995/10/18 08:40:58 deraadt Exp $
+ * $Id: md.h,v 1.2 1996/09/30 22:29:31 deraadt Exp $
*/
/*
@@ -37,7 +37,7 @@
#define MAX_ALIGNMENT (sizeof (double))
-#ifdef NetBSD
+#if defined(__NetBSD__) || defined(__OpenBSD__)
#define PAGSIZ __LDPGSZ
#define N_SET_FLAG(ex,f) N_SETMAGIC(ex,N_GETMAGIC(ex), \
@@ -65,7 +65,7 @@
#undef relocation_info
#define relocation_info reloc_info_sparc
#define r_symbolnum r_index
-#endif /* NetBSD */
+#endif /* __NetBSD__ || __OpenBSD__ */
#define N_BADMID(ex) \
(N_GETMID(ex) != 0 && N_GETMID(ex) != MID_MACHINE && \
diff --git a/gnu/usr.bin/ld/vax/md.c b/gnu/usr.bin/ld/vax/md.c
index f7f9573983f..a5e5b461186 100644
--- a/gnu/usr.bin/ld/vax/md.c
+++ b/gnu/usr.bin/ld/vax/md.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: md.c,v 1.1 1996/07/27 10:40:00 maja Exp $ */
+/* $OpenBSD: md.c,v 1.2 1996/09/30 22:29:32 deraadt Exp $ */
/* $NetBSD: md.c,v 1.1 1995/10/19 13:10:19 ragge Exp $ */
/*
* Copyright (c) 1993 Paul Kranenburg
@@ -245,7 +245,7 @@ md_init_header(hp, magic, flags)
struct exec *hp;
int magic, flags;
{
-#ifdef NetBSD
+#if defined(__NetBSD__) || defined(__OpenBSD__)
if (oldmagic || magic == QMAGIC)
hp->a_midmag = magic;
else
@@ -288,7 +288,7 @@ void
md_swapout_exec_hdr(h)
struct exec *h;
{
- /* NetBSD: Always leave magic alone */
+ /* NetBSD/OpenBSD: Always leave magic alone */
int skip = 1;
#if 0
if (N_GETMAGIC(*h) == OMAGIC)
diff --git a/gnu/usr.bin/ld/vax/md.h b/gnu/usr.bin/ld/vax/md.h
index e05eb618018..65bf5112a45 100644
--- a/gnu/usr.bin/ld/vax/md.h
+++ b/gnu/usr.bin/ld/vax/md.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: md.h,v 1.1 1996/07/27 10:40:01 maja Exp $ */
+/* $OpenBSD: md.h,v 1.2 1996/09/30 22:29:32 deraadt Exp $ */
/* $NetBSD: md.h,v 1.1 1995/10/19 13:10:20 ragge Exp $ */
/*
* Copyright (c) 1993 Paul Kranenburg
@@ -38,13 +38,13 @@
#define MAX_ALIGNMENT (sizeof (long))
-#ifdef NetBSD
+#if defined(__NetBSD__) || defined(__OpenBSD__)
#define PAGSIZ __LDPGSZ
#else
#define PAGSIZ 1024
#endif
-#if defined(NetBSD) || defined(CROSS_LINKER)
+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(CROSS_LINKER)
#define N_SET_FLAG(ex,f) (oldmagic || N_GETMAGIC(ex)==QMAGIC ? (0) : \
N_SETMAGIC(ex, \
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 20:32:48 +0000