From c3d58c4aaa5423d57ecd6f53ff897965e2e518fc Mon Sep 17 00:00:00 2001
From: Miod Vallat <miod@cvs.openbsd.org>
Date: Thu, 17 Oct 2013 11:54:03 +0000
Subject: Remove a.out leftovers now that libsa loadfile() will only boot ELF
 binaries.

---
 sys/arch/amd64/include/loadfile_machdep.h   | 3 +--
 sys/arch/armish/include/loadfile_machdep.h  | 3 +--
 sys/arch/armv7/include/loadfile_machdep.h   | 3 +--
 sys/arch/hp300/include/loadfile_machdep.h   | 4 +---
 sys/arch/i386/include/loadfile_machdep.h    | 3 +--
 sys/arch/macppc/include/loadfile_machdep.h  | 3 +--
 sys/arch/mvme68k/include/loadfile_machdep.h | 4 +---
 sys/arch/mvme88k/include/loadfile_machdep.h | 4 +---
 sys/arch/socppc/include/loadfile_machdep.h  | 3 +--
 sys/arch/sparc/include/loadfile_machdep.h   | 3 +--
 sys/arch/sparc64/include/loadfile_machdep.h | 4 +---
 sys/arch/vax/include/loadfile_machdep.h     | 4 +---
 sys/arch/zaurus/include/loadfile_machdep.h  | 3 +--
 13 files changed, 13 insertions(+), 31 deletions(-)

(limited to 'sys/arch')

diff --git a/sys/arch/amd64/include/loadfile_machdep.h b/sys/arch/amd64/include/loadfile_machdep.h
index 735a1b8ed86..eb24b0b67c0 100644
--- a/sys/arch/amd64/include/loadfile_machdep.h
+++ b/sys/arch/amd64/include/loadfile_machdep.h
@@ -1,5 +1,5 @@
 /* XXX - DSR */
-/*	$OpenBSD: loadfile_machdep.h,v 1.3 2008/06/26 05:42:09 ray Exp $	*/
+/*	$OpenBSD: loadfile_machdep.h,v 1.4 2013/10/17 11:53:58 miod Exp $	*/
 /*	$NetBSD: loadfile_machdep.h,v 1.1 1999/04/29 03:17:12 tsubai Exp $	*/
 
 /*-
@@ -52,6 +52,5 @@
 #define PROGRESS(a)		(void) printf a
 #define ALLOC(a)		alloc(a)
 #define FREE(a, b)		free(a, b)
-#define OKMAGIC(a)		((a) == OMAGIC)
 
 void run_loadfile(u_long *, int);
diff --git a/sys/arch/armish/include/loadfile_machdep.h b/sys/arch/armish/include/loadfile_machdep.h
index 86490f2f6eb..aa73cb63bce 100644
--- a/sys/arch/armish/include/loadfile_machdep.h
+++ b/sys/arch/armish/include/loadfile_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: loadfile_machdep.h,v 1.2 2008/06/26 05:42:09 ray Exp $	*/
+/*	$OpenBSD: loadfile_machdep.h,v 1.3 2013/10/17 11:53:59 miod Exp $	*/
 /*	$NetBSD: loadfile_machdep.h,v 1.1 1999/04/29 03:17:12 tsubai Exp $	*/
 
 /*-
@@ -47,6 +47,5 @@
 #define PROGRESS(a)		(void) printf a
 #define ALLOC(a)		alloc(a)
 #define FREE(a, b)		free(a, b)
-#define OKMAGIC(a)		((a) == OMAGIC)
 
 void run_loadfile(u_long *, int);
diff --git a/sys/arch/armv7/include/loadfile_machdep.h b/sys/arch/armv7/include/loadfile_machdep.h
index c552f9c024b..adad3ece9c7 100644
--- a/sys/arch/armv7/include/loadfile_machdep.h
+++ b/sys/arch/armv7/include/loadfile_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: loadfile_machdep.h,v 1.1 2013/09/04 14:38:28 patrick Exp $	*/
+/*	$OpenBSD: loadfile_machdep.h,v 1.2 2013/10/17 11:53:59 miod Exp $	*/
 /*	$NetBSD: loadfile_machdep.h,v 1.1 1999/04/29 03:17:12 tsubai Exp $	*/
 
 /*-
@@ -47,6 +47,5 @@
 #define PROGRESS(a)		(void) printf a
 #define ALLOC(a)		alloc(a)
 #define FREE(a, b)		free(a, b)
-#define OKMAGIC(a)		((a) == OMAGIC)
 
 void run_loadfile(u_long *, int);
diff --git a/sys/arch/hp300/include/loadfile_machdep.h b/sys/arch/hp300/include/loadfile_machdep.h
index 830569e1489..5a3c87d1ac8 100644
--- a/sys/arch/hp300/include/loadfile_machdep.h
+++ b/sys/arch/hp300/include/loadfile_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: loadfile_machdep.h,v 1.1 2013/01/01 17:18:49 miod Exp $	*/
+/*	$OpenBSD: loadfile_machdep.h,v 1.2 2013/10/17 11:53:59 miod Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -29,7 +29,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define	BOOT_AOUT
 #define BOOT_ELF
 
 #define LOAD_KERNEL		LOAD_ALL
@@ -46,4 +45,3 @@
 #define PROGRESS(a)		(void) printf a
 #define ALLOC(a)		alloc(a)
 #define FREE(a, b)		free(a, b)
-#define OKMAGIC(a)		((a) == NMAGIC)
diff --git a/sys/arch/i386/include/loadfile_machdep.h b/sys/arch/i386/include/loadfile_machdep.h
index 1935e80ca6f..e791321148f 100644
--- a/sys/arch/i386/include/loadfile_machdep.h
+++ b/sys/arch/i386/include/loadfile_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: loadfile_machdep.h,v 1.5 2008/06/26 05:42:10 ray Exp $	*/
+/*	$OpenBSD: loadfile_machdep.h,v 1.6 2013/10/17 11:54:00 miod Exp $	*/
 /*	$NetBSD: loadfile_machdep.h,v 1.1 1999/04/29 03:17:12 tsubai Exp $	*/
 
 /*-
@@ -51,6 +51,5 @@
 #define PROGRESS(a)		(void) printf a
 #define ALLOC(a)		alloc(a)
 #define FREE(a, b)		free(a, b)
-#define OKMAGIC(a)		((a) == OMAGIC)
 
 void run_loadfile(u_long *, int);
diff --git a/sys/arch/macppc/include/loadfile_machdep.h b/sys/arch/macppc/include/loadfile_machdep.h
index 8ffb61689f1..21007542ea4 100644
--- a/sys/arch/macppc/include/loadfile_machdep.h
+++ b/sys/arch/macppc/include/loadfile_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: loadfile_machdep.h,v 1.2 2008/06/26 05:42:12 ray Exp $	*/
+/*	$OpenBSD: loadfile_machdep.h,v 1.3 2013/10/17 11:54:00 miod Exp $	*/
 /*	$NetBSD: loadfile_machdep.h,v 1.1 1999/04/29 03:17:12 tsubai Exp $	*/
 
 /*-
@@ -47,4 +47,3 @@
 #define PROGRESS(a)		(void) printf a
 #define ALLOC(a)		alloc(a)
 #define FREE(a, b)		free(a, b)
-#define OKMAGIC(a)		((a) == OMAGIC)
diff --git a/sys/arch/mvme68k/include/loadfile_machdep.h b/sys/arch/mvme68k/include/loadfile_machdep.h
index 7f265583687..6ada208b58a 100644
--- a/sys/arch/mvme68k/include/loadfile_machdep.h
+++ b/sys/arch/mvme68k/include/loadfile_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: loadfile_machdep.h,v 1.1 2012/12/31 21:35:32 miod Exp $	*/
+/*	$OpenBSD: loadfile_machdep.h,v 1.2 2013/10/17 11:54:00 miod Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -29,7 +29,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define	BOOT_AOUT
 #define BOOT_ELF
 
 #define LOAD_KERNEL		LOAD_ALL
@@ -46,4 +45,3 @@
 #define PROGRESS(a)		(void) printf a
 #define ALLOC(a)		alloc(a)
 #define FREE(a, b)		free(a, b)
-#define OKMAGIC(a)		((a) == ZMAGIC)
diff --git a/sys/arch/mvme88k/include/loadfile_machdep.h b/sys/arch/mvme88k/include/loadfile_machdep.h
index 2d9788d3940..101235faf50 100644
--- a/sys/arch/mvme88k/include/loadfile_machdep.h
+++ b/sys/arch/mvme88k/include/loadfile_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: loadfile_machdep.h,v 1.2 2008/06/26 05:42:12 ray Exp $	*/
+/*	$OpenBSD: loadfile_machdep.h,v 1.3 2013/10/17 11:54:01 miod Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -29,7 +29,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define	BOOT_AOUT
 #define BOOT_ELF
 
 #define LOAD_KERNEL		LOAD_ALL
@@ -46,4 +45,3 @@
 #define PROGRESS(a)		(void) printf a
 #define ALLOC(a)		alloc(a)
 #define FREE(a, b)		free(a, b)
-#define OKMAGIC(a)		((a) == ZMAGIC)
diff --git a/sys/arch/socppc/include/loadfile_machdep.h b/sys/arch/socppc/include/loadfile_machdep.h
index c88c02ef628..74f22f22851 100644
--- a/sys/arch/socppc/include/loadfile_machdep.h
+++ b/sys/arch/socppc/include/loadfile_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: loadfile_machdep.h,v 1.2 2008/06/26 05:42:13 ray Exp $	*/
+/*	$OpenBSD: loadfile_machdep.h,v 1.3 2013/10/17 11:54:01 miod Exp $	*/
 /*	$NetBSD: loadfile_machdep.h,v 1.1 1999/04/29 03:17:12 tsubai Exp $	*/
 
 /*-
@@ -47,4 +47,3 @@
 #define PROGRESS(a)		(void) printf a
 #define ALLOC(a)		alloc(a)
 #define FREE(a, b)		free(a, b)
-#define OKMAGIC(a)		((a) == OMAGIC)
diff --git a/sys/arch/sparc/include/loadfile_machdep.h b/sys/arch/sparc/include/loadfile_machdep.h
index 51b665d1d62..9b9f816a191 100644
--- a/sys/arch/sparc/include/loadfile_machdep.h
+++ b/sys/arch/sparc/include/loadfile_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: loadfile_machdep.h,v 1.1 2010/06/29 21:33:52 miod Exp $	*/
+/*	$OpenBSD: loadfile_machdep.h,v 1.2 2013/10/17 11:54:01 miod Exp $	*/
 /*	$NetBSD: loadfile_machdep.h,v 1.3 2000/08/16 08:16:58 mrg Exp $	 */
 
 /*-
@@ -47,4 +47,3 @@
 #define PROGRESS(a)		(void) printf a
 #define ALLOC(a)		alloc(a)
 #define FREE(a, b)		free(a, b)
-#define OKMAGIC(a)		((a) == OMAGIC)
diff --git a/sys/arch/sparc64/include/loadfile_machdep.h b/sys/arch/sparc64/include/loadfile_machdep.h
index 4d701ff49ab..acedfb31ac5 100644
--- a/sys/arch/sparc64/include/loadfile_machdep.h
+++ b/sys/arch/sparc64/include/loadfile_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: loadfile_machdep.h,v 1.2 2008/06/26 05:42:13 ray Exp $	*/
+/*	$OpenBSD: loadfile_machdep.h,v 1.3 2013/10/17 11:54:02 miod Exp $	*/
 /*	$NetBSD: loadfile_machdep.h,v 1.3 2000/08/16 08:16:58 mrg Exp $	 */
 
 /*-
@@ -52,7 +52,6 @@
 #define PROGRESS(a)		(void) printf a
 #define ALLOC(a)		alloc(a)
 #define FREE(a, b)		free(a, b)
-#define OKMAGIC(a)		((a) == OMAGIC)
 #else
 #define LOADADDR(a)		(((u_long)(a)) + offset)
 #define ALIGNENTRY(a)		((u_long)(a))
@@ -63,5 +62,4 @@
 #define PROGRESS(a)		/* nothing */
 #define ALLOC(a)		malloc(a)
 #define FREE(a, b)		free(a)
-#define OKMAGIC(a)		((a) == OMAGIC)
 #endif
diff --git a/sys/arch/vax/include/loadfile_machdep.h b/sys/arch/vax/include/loadfile_machdep.h
index c2c4e585412..7dda94cf4f6 100644
--- a/sys/arch/vax/include/loadfile_machdep.h
+++ b/sys/arch/vax/include/loadfile_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: loadfile_machdep.h,v 1.2 2008/06/26 05:42:14 ray Exp $	*/
+/*	$OpenBSD: loadfile_machdep.h,v 1.3 2013/10/17 11:54:02 miod Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -29,7 +29,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define BOOT_AOUT
 #define BOOT_ELF
 #define ELFSIZE 32
 
@@ -47,4 +46,3 @@
 #define PROGRESS(a)		(void) printf a
 #define ALLOC(a)		alloc(a)
 #define FREE(a, b)		free(a, b)
-#define OKMAGIC(a)		((a) == OMAGIC || (a) == NMAGIC)
diff --git a/sys/arch/zaurus/include/loadfile_machdep.h b/sys/arch/zaurus/include/loadfile_machdep.h
index 82a3e48decc..4889cb25a53 100644
--- a/sys/arch/zaurus/include/loadfile_machdep.h
+++ b/sys/arch/zaurus/include/loadfile_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: loadfile_machdep.h,v 1.2 2008/06/26 05:42:14 ray Exp $	*/
+/*	$OpenBSD: loadfile_machdep.h,v 1.3 2013/10/17 11:54:02 miod Exp $	*/
 /*	$NetBSD: loadfile_machdep.h,v 1.1 1999/04/29 03:17:12 tsubai Exp $	*/
 
 /*-
@@ -47,6 +47,5 @@
 #define PROGRESS(a)		(void) printf a
 #define ALLOC(a)		alloc(a)
 #define FREE(a, b)		free(a, b)
-#define OKMAGIC(a)		((a) == OMAGIC)
 
 void run_loadfile(u_long *, int);
-- 
cgit v1.2.3