summaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
authorthorpej <thorpej@NetBSD.org>2002-12-10 17:14:02 +0000
committerthorpej <thorpej@NetBSD.org>2002-12-10 17:14:02 +0000
commite8cc3884dec357e603ca9fd904f2ab5c8d584857 (patch)
tree09ea0d1a50d7907dfde8207448bb5a98e4c10339 /libexec
parentd8ae1c92f77da7ada20095be5f9270798d446a54 (diff)
Rename __LDPGSZ to AOUT_LDPGSZ, to accurately reflect what it is.
Diffstat (limited to 'libexec')
-rw-r--r--libexec/ld.aout_so/arch/arm32/md.h6
-rw-r--r--libexec/ld.aout_so/arch/i386/md.h4
-rw-r--r--libexec/ld.aout_so/arch/m68k/md.h8
-rw-r--r--libexec/ld.aout_so/arch/ns32k/md.h4
-rw-r--r--libexec/ld.aout_so/arch/powerpc/md.h4
-rw-r--r--libexec/ld.aout_so/arch/sparc/md.h4
-rw-r--r--libexec/ld.aout_so/arch/vax/md.h4
-rw-r--r--libexec/ld.aout_so/rtld.c4
8 files changed, 19 insertions, 19 deletions
diff --git a/libexec/ld.aout_so/arch/arm32/md.h b/libexec/ld.aout_so/arch/arm32/md.h
index 17cc533c759..56b7d1d8af5 100644
--- a/libexec/ld.aout_so/arch/arm32/md.h
+++ b/libexec/ld.aout_so/arch/arm32/md.h
@@ -1,4 +1,4 @@
-/* $NetBSD: md.h,v 1.4 2000/05/28 01:53:05 matt Exp $ */
+/* $NetBSD: md.h,v 1.5 2002/12/10 17:14:35 thorpej Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe
@@ -42,7 +42,7 @@
#define MAX_ALIGNMENT (sizeof (long))
#ifdef NetBSD
-#define PAGSIZ __LDPGSZ
+#define PAGSIZ AOUT_LDPGSZ
#else
#define PAGSIZ 4096
#endif
@@ -67,7 +67,7 @@
#define TEXT_START(ex) ((ex).a_entry < PAGSIZ ? 0 : 0x001000)
#define DATA_START(ex) (N_GETMAGIC(ex) == OMAGIC \
? TEXT_START(ex) + (ex).a_text \
- : (TEXT_START(ex) + (ex).a_text + __LDPGSZ - 1) & ~(__LDPGSZ - 1))
+ : (TEXT_START(ex) + (ex).a_text + AOUT_LDPGSZ - 1) & ~(AOUT_LDPGSZ - 1))
#endif
#define RELOC_STATICS_THROUGH_GOT_P(r) (1)
diff --git a/libexec/ld.aout_so/arch/i386/md.h b/libexec/ld.aout_so/arch/i386/md.h
index 9a3e7393050..f87a4b59e6d 100644
--- a/libexec/ld.aout_so/arch/i386/md.h
+++ b/libexec/ld.aout_so/arch/i386/md.h
@@ -1,4 +1,4 @@
-/* $NetBSD: md.h,v 1.13 2000/05/28 01:53:07 matt Exp $ */
+/* $NetBSD: md.h,v 1.14 2002/12/10 17:14:37 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
#define MAX_ALIGNMENT (sizeof (long))
#ifdef NetBSD
-#define PAGSIZ __LDPGSZ
+#define PAGSIZ AOUT_LDPGSZ
#else
#define PAGSIZ 4096
#endif
diff --git a/libexec/ld.aout_so/arch/m68k/md.h b/libexec/ld.aout_so/arch/m68k/md.h
index 75d25f61232..4506f96cf59 100644
--- a/libexec/ld.aout_so/arch/m68k/md.h
+++ b/libexec/ld.aout_so/arch/m68k/md.h
@@ -1,4 +1,4 @@
-/* $NetBSD: md.h,v 1.10 2001/07/25 12:21:33 aymeric Exp $ */
+/* $NetBSD: md.h,v 1.11 2002/12/10 17:14:38 thorpej Exp $ */
/*
* - m68k dependent definitions
@@ -25,11 +25,11 @@ void _cachectl __P((void *, size_t));
#undef MID_MACHINE
#define MID_MACHINE MID_M68K
-#undef __LDPGSZ
-#define __LDPGSZ 8192
+#undef AOUT_LDPGSZ
+#define AOUT_LDPGSZ 8192
#endif /* CROSS_LINKER */
-#define PAGSIZ __LDPGSZ
+#define PAGSIZ AOUT_LDPGSZ
#define N_SET_FLAG(ex,f) N_SETMAGIC(ex,N_GETMAGIC(ex), MID_MACHINE, \
N_GETFLAG(ex)|(f))
diff --git a/libexec/ld.aout_so/arch/ns32k/md.h b/libexec/ld.aout_so/arch/ns32k/md.h
index 5446a3a5a4d..34985ff98ef 100644
--- a/libexec/ld.aout_so/arch/ns32k/md.h
+++ b/libexec/ld.aout_so/arch/ns32k/md.h
@@ -1,4 +1,4 @@
-/* $NetBSD: md.h,v 1.8 2000/05/28 01:53:11 matt Exp $ */
+/* $NetBSD: md.h,v 1.9 2002/12/10 17:14:39 thorpej Exp $ */
/*
* - ns32k dependent definitions
@@ -10,7 +10,7 @@
#define MAX_ALIGNMENT (sizeof (long))
-#define PAGSIZ __LDPGSZ
+#define PAGSIZ AOUT_LDPGSZ
#define N_SET_FLAG(ex,f) N_SETMAGIC(ex,N_GETMAGIC(ex), MID_MACHINE, \
N_GETFLAG(ex)|(f))
diff --git a/libexec/ld.aout_so/arch/powerpc/md.h b/libexec/ld.aout_so/arch/powerpc/md.h
index a7178fd786e..ae1ae14dbc7 100644
--- a/libexec/ld.aout_so/arch/powerpc/md.h
+++ b/libexec/ld.aout_so/arch/powerpc/md.h
@@ -1,4 +1,4 @@
-/* $NetBSD: md.h,v 1.3 2000/05/28 01:53:12 matt Exp $ */
+/* $NetBSD: md.h,v 1.4 2002/12/10 17:14:42 thorpej Exp $ */
/*
* Copyright (c) 1995 Wolfgang Solfrank
@@ -34,7 +34,7 @@
#define MAX_ALIGNMENT (sizeof (double)) /* 32??? */
-#define PAGSIZ __LDPGSZ
+#define PAGSIZ AOUT_LDPGSZ
#define N_SET_FLAG(ex,f) N_SETMAGIC(ex, \
N_GETMAGIC(ex), \
diff --git a/libexec/ld.aout_so/arch/sparc/md.h b/libexec/ld.aout_so/arch/sparc/md.h
index 596ea7e42a9..36a003b4cb3 100644
--- a/libexec/ld.aout_so/arch/sparc/md.h
+++ b/libexec/ld.aout_so/arch/sparc/md.h
@@ -1,4 +1,4 @@
-/* $NetBSD: md.h,v 1.17 2000/05/28 01:53:12 matt Exp $ */
+/* $NetBSD: md.h,v 1.18 2002/12/10 17:14:43 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
#define MAX_ALIGNMENT (sizeof (double))
#ifdef __NetBSD__
-#define PAGSIZ __LDPGSZ
+#define PAGSIZ AOUT_LDPGSZ
#define N_SET_FLAG(ex,f) N_SETMAGIC(ex,N_GETMAGIC(ex), \
MID_MACHINE, N_GETFLAG(ex)|(f))
diff --git a/libexec/ld.aout_so/arch/vax/md.h b/libexec/ld.aout_so/arch/vax/md.h
index 62639e57b38..ecf795b537d 100644
--- a/libexec/ld.aout_so/arch/vax/md.h
+++ b/libexec/ld.aout_so/arch/vax/md.h
@@ -1,4 +1,4 @@
-/* $NetBSD: md.h,v 1.11 2000/05/28 01:53:13 matt Exp $ */
+/* $NetBSD: md.h,v 1.12 2002/12/10 17:14:44 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
#define MAX_ALIGNMENT (sizeof (long))
#ifdef __NetBSD__
-#define PAGSIZ __LDPGSZ
+#define PAGSIZ AOUT_LDPGSZ
#else
#define PAGSIZ 1024
#endif
diff --git a/libexec/ld.aout_so/rtld.c b/libexec/ld.aout_so/rtld.c
index fac035dc456..cc1993b600b 100644
--- a/libexec/ld.aout_so/rtld.c
+++ b/libexec/ld.aout_so/rtld.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld.c,v 1.85 2002/08/08 13:24:14 soren Exp $ */
+/* $NetBSD: rtld.c,v 1.86 2002/12/10 17:14:34 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
#ifdef __m68k__
/*
* This is a slight hack to allow the same loader to be used on
- * 4k and 8k __LDPGSZ executables.
+ * 4k and 8k AOUT_LDPGSZ executables.
*/
static int page_size = 0x2000;
#undef PAGSIZ