summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/alpha/alpha/machdep.c4
-rw-r--r--sys/arch/alpha/include/exec.h5
2 files changed, 5 insertions, 4 deletions
diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c
index 3501a26890a..633a8fca166 100644
--- a/sys/arch/alpha/alpha/machdep.c
+++ b/sys/arch/alpha/alpha/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.87 2004/06/08 18:09:31 marc Exp $ */
+/* $OpenBSD: machdep.c,v 1.88 2004/07/04 01:13:05 deraadt Exp $ */
/* $NetBSD: machdep.c,v 1.210 2000/06/01 17:12:38 thorpej Exp $ */
/*-
@@ -2043,7 +2043,7 @@ delay(n)
: "i" (2), "0" (N));
}
-#if defined(COMPAT_OSF1) || 1 /* XXX */
+#if defined(COMPAT_OSF1)
void cpu_exec_ecoff_setregs(struct proc *, struct exec_package *,
u_long, register_t *);
diff --git a/sys/arch/alpha/include/exec.h b/sys/arch/alpha/include/exec.h
index 12e87fe53f4..0b39b4fd473 100644
--- a/sys/arch/alpha/include/exec.h
+++ b/sys/arch/alpha/include/exec.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: exec.h,v 1.7 2001/01/22 14:51:02 art Exp $ */
+/* $OpenBSD: exec.h,v 1.8 2004/07/04 01:13:07 deraadt Exp $ */
/* $NetBSD: exec.h,v 1.1 1995/02/13 23:07:37 cgd Exp $ */
/*
@@ -48,8 +48,9 @@
#define _NLIST_DO_ECOFF
#define _NLIST_DO_ELF
-#define _KERN_DO_AOUT
+#ifdef COMPAT_OSF1
#define _KERN_DO_ECOFF
+#endif
#define _KERN_DO_ELF64
#endif /* !_ALPHA_EXEC_H_ */