Module Name: src
Committed By: he
Date: Thu Aug 20 22:26:19 UTC 2009
Modified Files:
src/usr.sbin/mopd/mopcopy: Makefile mopcopy.c
Log Message:
Use NOAOUT so that this builds without a.out support, and enable
that define if we're building for mips.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/mopd/mopcopy/Makefile
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/mopd/mopcopy/mopcopy.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/mopd/mopcopy/Makefile
diff -u src/usr.sbin/mopd/mopcopy/Makefile:1.1 src/usr.sbin/mopd/mopcopy/Makefile:1.2
--- src/usr.sbin/mopd/mopcopy/Makefile:1.1 Thu Jun 6 23:01:00 2002
+++ src/usr.sbin/mopd/mopcopy/Makefile Thu Aug 20 22:26:19 2009
@@ -1,5 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2002/06/06 23:01:00 thorpej Exp $
+# $NetBSD: Makefile,v 1.2 2009/08/20 22:26:19 he Exp $
PROG= mopcopy
+.include <bsd.own.mk>
+.if ${MACHINE_CPU} == "mips"
+CFLAGS+= -DNOAOUT
+.endif
+
.include <bsd.prog.mk>
Index: src/usr.sbin/mopd/mopcopy/mopcopy.c
diff -u src/usr.sbin/mopd/mopcopy/mopcopy.c:1.3 src/usr.sbin/mopd/mopcopy/mopcopy.c:1.4
--- src/usr.sbin/mopd/mopcopy/mopcopy.c:1.3 Tue Nov 5 05:06:05 2002
+++ src/usr.sbin/mopd/mopcopy/mopcopy.c Thu Aug 20 22:26:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mopcopy.c,v 1.3 2002/11/05 05:06:05 thorpej Exp $ */
+/* $NetBSD: mopcopy.c,v 1.4 2009/08/20 22:26:19 he Exp $ */
/* mopcopy - Convert a Unix format kernel into something that
* can be transfered via MOP.
@@ -49,19 +49,21 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: mopcopy.c,v 1.3 2002/11/05 05:06:05 thorpej Exp $");
+__RCSID("$NetBSD: mopcopy.c,v 1.4 2009/08/20 22:26:19 he Exp $");
#endif
#include "os.h"
#include "common.h"
#include "mopdef.h"
#include "file.h"
+#if !defined(NOAOUT)
#if defined(__NetBSD__) || defined(__OpenBSD__)
#include <sys/exec_aout.h>
#endif
#if defined(__FreeBSD__)
#include <sys/imgact_aout.h>
#endif
+#endif /* !NOAOUT */
#if defined(__bsdi__)
#include <a.out.h>
#define NOAOUT
@@ -82,7 +84,9 @@
#endif /* NOELF */
u_char header[512]; /* The VAX header we generate is 1 block. */
+#if !defined(NOAOUT)
struct exec ex, ex_swap;
+#endif
int
main (int argc, char **argv)
