a.out is no longer the commonly encountered binary file format, the world has

moved to ELF.

Move the a.out specific defines and macros, but the MID_xxx values, from
<sys/exec.h> to <a.out.h>, and update the few userland binaries which really
need these defines (i.e. boot-related tools for old architectures) to
explicitly include <a.out.h> when needed.

"Fine" deraadt@

2 files changed, 4 insertions, 4 deletions

diff --git a/usr.sbin/mopd/common/file.c b/usr.sbin/mopd/common/file.c
index c4f5d02b520..12a928549fb 100644
--- a/usr.sbin/mopd/common/file.c
+++ b/usr.sbin/mopd/common/file.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: file.c,v 1.19 2017/10/29 08:45:53 mpi Exp $ */
+/*	$OpenBSD: file.c,v 1.20 2024/10/16 18:47:48 miod Exp $ */
 
 /*
  * Copyright (c) 1995-96 Mats O Jansson.  All rights reserved.
@@ -32,7 +32,7 @@
 
 #ifndef NOAOUT
 #if defined(__OpenBSD__)
-#include <sys/exec.h>
+#include <a.out.h>
 #endif
 #if defined(__bsdi__)
 #define NOAOUT
diff --git a/usr.sbin/mopd/mopa.out/mopa.out.c b/usr.sbin/mopd/mopa.out/mopa.out.c
index 3ecb923fe33..35ed44cb5a0 100644
--- a/usr.sbin/mopd/mopa.out/mopa.out.c
+++ b/usr.sbin/mopd/mopa.out/mopa.out.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mopa.out.c,v 1.18 2022/12/28 21:30:17 jmc Exp $ */
+/*	$OpenBSD: mopa.out.c,v 1.19 2024/10/16 18:47:48 miod Exp $ */
 
 /*
  * mopa.out - Convert a Unix format kernel into something that
@@ -53,7 +53,7 @@
 #include "common/mopdef.h"
 #include "common/file.h"
 #if defined(__OpenBSD__)
-#include <sys/exec.h>
+#include <a.out.h>
 #endif
 #if defined(__FreeBSD__)
 #include <sys/imgact_aout.h>