3 files changed, 3 insertions, 18 deletions
diff --git a/sys/arch/vax/include/db_machdep.h b/sys/arch/vax/include/db_machdep.h
index 2cd20cb7c7b..ed8ee7795c2 100644
--- a/sys/arch/vax/include/db_machdep.h
+++ b/sys/arch/vax/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.15 2013/07/05 21:10:50 miod Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.16 2013/10/17 08:02:17 deraadt Exp $	*/
 /*	$NetBSD: db_machdep.h,v 1.6 1998/08/10 14:33:33 ragge Exp $	*/
 
 /* 
@@ -73,11 +73,7 @@ extern db_regs_t	ddb_regs;	/* register state */
 /* Prototypes */
 void	kdb_trap(struct trapframe *);
 
-#ifdef __ELF__
 #define	DB_ELF_SYMBOLS
 #define	DB_ELFSIZE	32
-#else
-#define	DB_AOUT_SYMBOLS
-#endif
 
 #endif	/* _MACHINE_DB_MACHDEP_H_ */
diff --git a/sys/arch/vax/include/exec.h b/sys/arch/vax/include/exec.h
index d073a46013b..57eed034786 100644
--- a/sys/arch/vax/include/exec.h
+++ b/sys/arch/vax/include/exec.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.h,v 1.9 2011/03/23 16:54:37 pirofti Exp $	*/
+/*	$OpenBSD: exec.h,v 1.10 2013/10/17 08:02:17 deraadt Exp $	*/
 /*	$NetBSD: exec.h,v 1.4 1995/09/23 14:57:40 ragge Exp $	*/
 
 /*
@@ -47,10 +47,7 @@ struct relocation_info_vax {
 };
 #define relocation_info	relocation_info_vax
 
-#define _NLIST_DO_AOUT
 #define _NLIST_DO_ELF
-
-#define _KERN_DO_AOUT
 #define _KERN_DO_ELF
 
 #define ARCH_ELFSIZE		32
diff --git a/sys/arch/vax/vax/vm_machdep.c b/sys/arch/vax/vax/vm_machdep.c
index f24f9d83876..a6dfdaf4340 100644
--- a/sys/arch/vax/vax/vm_machdep.c
+++ b/sys/arch/vax/vax/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.39 2013/01/16 19:04:43 miod Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.40 2013/10/17 08:02:18 deraadt Exp $	*/
 /*	$NetBSD: vm_machdep.c,v 1.67 2000/06/29 07:14:34 mrg Exp $	     */
 
 /*
@@ -156,14 +156,6 @@ cpu_fork(p1, p2, stack, stacksize, func, arg)
 }
 
 int
-cpu_exec_aout_makecmds(p, epp)
-	struct proc *p;
-	struct exec_package *epp;
-{
-	return ENOEXEC;
-}
-
-int
 sys_sysarch(p, v, retval)
 	struct proc *p;
 	void *v;