From 32e74e3550ac6380cb95de86066531718f73474e Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Thu, 14 Dec 1995 04:06:32 +0000
Subject: [PATCH] from netbsd: 1) undef various EXEC_ cpp symbols before
 defining them, in case they're already defined for some reason (this can
 happen on the alpha, for example, which needs to define EXEC_ECOFF in the
 std.alpha config file). 2) add hpux compat

---
 sys/kern/exec_conf.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/sys/kern/exec_conf.c b/sys/kern/exec_conf.c
index 4abc28c4814..f2f9017ec0f 100644
--- a/sys/kern/exec_conf.c
+++ b/sys/kern/exec_conf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: exec_conf.c,v 1.14 1995/10/10 01:26:50 mycroft Exp $	*/
+/*	$NetBSD: exec_conf.c,v 1.16 1995/12/09 05:34:47 cgd Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994 Christopher G. Demetriou
@@ -30,14 +30,18 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define	EXEC_SCRIPT			/* XXX */
+#undef EXEC_SCRIPT			/* XXX */
+#define EXEC_SCRIPT			/* XXX */
+#undef EXEC_AOUT			/* XXX */
 #define EXEC_AOUT			/* XXX */
 
 #if defined(COMPAT_ULTRIX) || defined(COMPAT_OSF1)
+#undef EXEC_ECOFF
 #define EXEC_ECOFF
 #endif
 
 #if defined(COMPAT_SVR4) || defined(COMPAT_LINUX)
+#undef EXEC_ELF
 #define EXEC_ELF
 #endif
 
@@ -76,6 +80,10 @@
 #include <compat/freebsd/freebsd_exec.h>
 #endif
 
+#ifdef COMPAT_HPUX
+#include <compat/hpux/hpux_exec.h>
+#endif
+
 struct execsw execsw[] = {
 #ifdef LKM
 	{ 0, NULL, },					/* entries for LKMs */
@@ -106,6 +114,9 @@ struct execsw execsw[] = {
 #ifdef COMPAT_FREEBSD
 	{ FREEBSD_AOUT_HDR_SIZE, exec_freebsd_aout_makecmds, },	/* a.out */
 #endif
+#ifdef COMPAT_HPUX
+	{ HPUX_EXEC_HDR_SIZE, exec_hpux_makecmds, },	/* HP-UX a.out */
+#endif
 };
 int nexecs = (sizeof execsw / sizeof(*execsw));
 int exec_maxhdrsz;
-- 
2.20.1