summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/sparc/include/exec.h4
-rw-r--r--sys/arch/sparc/sparc/machdep.c6
2 files changed, 6 insertions, 4 deletions
diff --git a/sys/arch/sparc/include/exec.h b/sys/arch/sparc/include/exec.h
index dabf3f6afc0..ca9db7262ed 100644
--- a/sys/arch/sparc/include/exec.h
+++ b/sys/arch/sparc/include/exec.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: exec.h,v 1.9 2002/08/11 23:06:03 art Exp $ */
+/* $OpenBSD: exec.h,v 1.10 2004/07/06 21:05:36 deraadt Exp $ */
/* $NetBSD: exec.h,v 1.7 1994/11/20 20:53:02 deraadt Exp $ */
/*
@@ -120,7 +120,9 @@ struct relocation_info_sparc {
#define _NLIST_DO_AOUT
#define _NLIST_DO_ELF
+#ifdef COMPAT_SUNOS
#define _KERN_DO_AOUT
+#endif
#define _KERN_DO_ELF
#endif /* _SPARC_EXEC_H_ */
diff --git a/sys/arch/sparc/sparc/machdep.c b/sys/arch/sparc/sparc/machdep.c
index f8067b59510..10a475506e5 100644
--- a/sys/arch/sparc/sparc/machdep.c
+++ b/sys/arch/sparc/sparc/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.100 2004/05/30 21:52:49 deraadt Exp $ */
+/* $OpenBSD: machdep.c,v 1.101 2004/07/06 21:05:36 deraadt Exp $ */
/* $NetBSD: machdep.c,v 1.85 1997/09/12 08:55:02 pk Exp $ */
/*
@@ -987,6 +987,7 @@ mapdev(phys, virt, offset, size)
return (ret);
}
+#ifdef COMPAT_SUNOS
int
cpu_exec_aout_makecmds(p, epp)
struct proc *p;
@@ -994,13 +995,12 @@ cpu_exec_aout_makecmds(p, epp)
{
int error = ENOEXEC;
-#ifdef COMPAT_SUNOS
extern int sunos_exec_aout_makecmds(struct proc *, struct exec_package *);
if ((error = sunos_exec_aout_makecmds(p, epp)) == 0)
return 0;
-#endif
return error;
}
+#endif
#ifdef SUN4
void