DDB supports ELF symbols are all archs, and it's always the same as the

native size, so eliminate the #defines.

ok miod@

14 files changed, 14 insertions, 69 deletions

diff --git a/sys/arch/alpha/include/db_machdep.h b/sys/arch/alpha/include/db_machdep.h
index 7456b8f12be..09e506a041d 100644
--- a/sys/arch/alpha/include/db_machdep.h
+++ b/sys/arch/alpha/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.22 2014/01/26 17:40:11 miod Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.23 2014/03/16 20:31:45 guenther Exp $	*/
 
 /*
  * Copyright (c) 1997 Niklas Hallqvist.  All rights reserved.
@@ -30,12 +30,6 @@
 /* XXX - Need to include vm.h for boolean_t */
 #include <uvm/uvm_extern.h>
 
-/*
- * We use Elf64 symbols in DDB.
- */
-#define	DB_ELF_SYMBOLS
-#define	DB_ELFSIZE	64
-
 struct opcode {
 	enum opc_fmt { OPC_PAL, OPC_RES, OPC_MEM, OPC_OP, OPC_BR } opc_fmt;
 	char *opc_name;
diff --git a/sys/arch/amd64/include/db_machdep.h b/sys/arch/amd64/include/db_machdep.h
index 8b2de9cd8d0..67cd028cbbb 100644
--- a/sys/arch/amd64/include/db_machdep.h
+++ b/sys/arch/amd64/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.11 2014/03/16 07:48:00 guenther Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.12 2014/03/16 20:31:45 guenther Exp $	*/
 /*	$NetBSD: db_machdep.h,v 1.2 2003/04/29 17:06:04 scw Exp $	*/
 
 /* 
@@ -104,9 +104,6 @@ extern struct mutex ddb_mp_mutex;
  */
 #define DB_MACHINE_COMMANDS
 
-#define	DB_ELF_SYMBOLS
-#define	DB_ELFSIZE	64
-
 extern void db_machine_init(void);
 
 extern void cpu_debug_dump(void);
diff --git a/sys/arch/arm/include/db_machdep.h b/sys/arch/arm/include/db_machdep.h
index 3a23b803f22..e0f419cf680 100644
--- a/sys/arch/arm/include/db_machdep.h
+++ b/sys/arch/arm/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.8 2013/05/10 22:08:15 patrick Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.9 2014/03/16 20:31:46 guenther Exp $	*/
 /*	$NetBSD: db_machdep.h,v 1.5 2001/11/22 18:00:00 thorpej Exp $	*/
 
 /*
@@ -101,9 +101,6 @@ void db_machine_init (void);
 #define branch_taken(ins, pc, fun, regs) \
 	db_branch_taken((ins), (pc), (regs))
 
-#define DB_ELF_SYMBOLS
-#define DB_ELFSIZE 32
-
 void db_show_frame_cmd(db_expr_t, int, db_expr_t, char *);
 
 #endif	/* _ARM_DB_MACHDEP_H_ */
diff --git a/sys/arch/hppa/include/db_machdep.h b/sys/arch/hppa/include/db_machdep.h
index d0b9c3ef5ab..d844b6c6a1c 100644
--- a/sys/arch/hppa/include/db_machdep.h
+++ b/sys/arch/hppa/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.17 2011/11/14 14:29:53 deraadt Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.18 2014/03/16 20:31:46 guenther Exp $	*/
 
 /*
  * Copyright (c) 1998-2005 Michael Shalayeff
@@ -22,9 +22,6 @@
 
 #include <uvm/uvm_extern.h>
 
-#define	DB_ELF_SYMBOLS
-#define	DB_ELFSIZE	32
-
 /* types the generic ddb module needs */
 typedef	vaddr_t db_addr_t;
 typedef	long db_expr_t;
diff --git a/sys/arch/hppa64/include/db_machdep.h b/sys/arch/hppa64/include/db_machdep.h
index aab311e5081..9ef14b72ae7 100644
--- a/sys/arch/hppa64/include/db_machdep.h
+++ b/sys/arch/hppa64/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.3 2011/11/14 14:29:57 deraadt Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.4 2014/03/16 20:31:46 guenther Exp $	*/
 
 /*
  * Copyright (c) 1998-2005 Michael Shalayeff
@@ -22,9 +22,6 @@
 
 #include <uvm/uvm_extern.h>
 
-#define	DB_ELF_SYMBOLS
-#define	DB_ELFSIZE	64
-
 /* types the generic ddb module needs */
 typedef	vaddr_t db_addr_t;
 typedef	long db_expr_t;
diff --git a/sys/arch/i386/include/db_machdep.h b/sys/arch/i386/include/db_machdep.h
index 06eced95a76..537eea6baf8 100644
--- a/sys/arch/i386/include/db_machdep.h
+++ b/sys/arch/i386/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.22 2014/03/16 07:48:00 guenther Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.23 2014/03/16 20:31:46 guenther Exp $	*/
 /*	$NetBSD: db_machdep.h,v 1.9 1996/05/03 19:23:59 christos Exp $	*/
 
 /* 
@@ -73,9 +73,6 @@ extern db_regs_t	ddb_regs;	/* register state */
 
 #define DB_MACHINE_COMMANDS
 
-#define DB_ELF_SYMBOLS
-#define DB_ELFSIZE		32
-
 /*
  * Constants for KGDB.
  */
diff --git a/sys/arch/m68k/include/db_machdep.h b/sys/arch/m68k/include/db_machdep.h
index 19d385b4233..b1e12ac59d7 100644
--- a/sys/arch/m68k/include/db_machdep.h
+++ b/sys/arch/m68k/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.12 2013/02/02 13:32:06 miod Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.13 2014/03/16 20:31:46 guenther Exp $	*/
 /*	$NetBSD: db_machdep.h,v 1.20 1997/06/26 01:26:58 thorpej Exp $	*/
 
 /* 
@@ -102,7 +102,4 @@ int 	kdb_trap(int, db_regs_t *);
 
 #endif /* _KERNEL */
 
-#define	DB_ELF_SYMBOLS
-#define	DB_ELFSIZE	32
-
 #endif	/* _M68K_DB_MACHDEP_H_ */
diff --git a/sys/arch/m88k/include/db_machdep.h b/sys/arch/m88k/include/db_machdep.h
index 03cb5a53bf6..ec9c41c6595 100644
--- a/sys/arch/m88k/include/db_machdep.h
+++ b/sys/arch/m88k/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.17 2013/10/17 08:02:16 deraadt Exp $ */
+/*	$OpenBSD: db_machdep.h,v 1.18 2014/03/16 20:31:46 guenther Exp $ */
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -92,9 +92,6 @@ void	m88k_print_instruction(int, u_int, u_int32_t);	/* db_disasm.c */
 /* machine specific commands have been added to ddb */
 #define DB_MACHINE_COMMANDS
 
-#define	DB_ELF_SYMBOLS
-#define	DB_ELFSIZE	32
-
 #ifdef MULTIPROCESSOR
 extern cpuid_t ddb_mp_nextcpu;
 #endif
diff --git a/sys/arch/mips64/include/db_machdep.h b/sys/arch/mips64/include/db_machdep.h
index 44678a9adb8..3f235c55fd5 100644
--- a/sys/arch/mips64/include/db_machdep.h
+++ b/sys/arch/mips64/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.13 2013/02/09 19:25:13 miod Exp $ */
+/*	$OpenBSD: db_machdep.h,v 1.14 2014/03/16 20:31:46 guenther Exp $ */
 
 /*
  * Copyright (c) 1998-2003 Opsycon AB (www.opsycon.se)
@@ -34,8 +34,6 @@
 #include <uvm/uvm_param.h>
 
 #define DB_MACHINE_COMMANDS	/* We have machine specific commands */
-#define	DB_ELF_SYMBOLS		/* Elf style symbol table support */
-#define	DB_ELFSIZE	64
 
 typedef struct trap_frame db_regs_t;
 extern db_regs_t	ddb_regs;
diff --git a/sys/arch/powerpc/include/db_machdep.h b/sys/arch/powerpc/include/db_machdep.h
index 984310981eb..9aceec30ff5 100644
--- a/sys/arch/powerpc/include/db_machdep.h
+++ b/sys/arch/powerpc/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.24 2011/03/23 16:54:36 pirofti Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.25 2014/03/16 20:31:46 guenther Exp $	*/
 /*	$NetBSD: db_machdep.h,v 1.13 1996/04/29 20:50:08 leo Exp $	*/
 
 /*
@@ -37,12 +37,6 @@
 #include <uvm/uvm_param.h>
 #include <machine/trap.h>
 
-/*
- * We use Elf32 symbols in DDB.
- */
-#define	DB_ELF_SYMBOLS
-#define	DB_ELFSIZE	32
-
 typedef	vaddr_t	db_addr_t;	/* address - unsigned */
 typedef	long		db_expr_t;	/* expression - signed */
 struct powerpc_saved_state {
diff --git a/sys/arch/sh/include/db_machdep.h b/sys/arch/sh/include/db_machdep.h
index 8b95aca7269..60f8d39e80a 100644
--- a/sys/arch/sh/include/db_machdep.h
+++ b/sys/arch/sh/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.5 2010/11/27 19:57:23 miod Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.6 2014/03/16 20:31:46 guenther Exp $	*/
 /*	$NetBSD: db_machdep.h,v 1.12 2006/05/10 06:24:03 skrll Exp $	*/
 
 /*
@@ -64,13 +64,6 @@ boolean_t inst_return(int);
 boolean_t inst_trap_return(int);
 
 /*
- * We use ELF symbols in DDB.
- *
- */
-#define	DB_ELF_SYMBOLS
-#define	DB_ELFSIZE	32
-
-/*
  * We have machine-dependent commands.
  */
 #define	DB_MACHINE_COMMANDS
diff --git a/sys/arch/sparc/include/db_machdep.h b/sys/arch/sparc/include/db_machdep.h
index 88e1148862d..77dcf3978af 100644
--- a/sys/arch/sparc/include/db_machdep.h
+++ b/sys/arch/sparc/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.15 2011/03/23 16:54:37 pirofti Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.16 2014/03/16 20:31:46 guenther Exp $	*/
 /*	$NetBSD: db_machdep.h,v 1.10 1997/08/31 21:23:40 pk Exp $ */
 
 /*
@@ -84,10 +84,6 @@ extern db_regs_t	ddb_regs;	/* register state */
 void db_machine_init(void);
 int kdb_trap(int, struct trapframe *);
 
-#define DB_ELF_SYMBOLS
-#define DB_ELFSIZE	32
-
-
 /*
  * KGDB definitions
  */
diff --git a/sys/arch/sparc64/include/db_machdep.h b/sys/arch/sparc64/include/db_machdep.h
index 31665039596..dbab1e2341e 100644
--- a/sys/arch/sparc64/include/db_machdep.h
+++ b/sys/arch/sparc64/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.13 2011/03/23 16:54:37 pirofti Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.14 2014/03/16 20:31:46 guenther Exp $	*/
 /*	$NetBSD: db_machdep.h,v 1.12 2001/07/07 15:16:13 eeh Exp $ */
 
 /*
@@ -134,12 +134,6 @@ void		db_machine_init(void);
 void db_machine_init(void);
 int kdb_trap(int, struct trapframe64 *);
 
-/*
- * We will use elf symbols in DDB when they work.
- */
-#define	DB_ELF_SYMBOLS
-#define DB_ELFSIZE	64
-
 /* Register device-specific method for triggering XIRs. */
 void db_register_xir(void (*)(void *, int), void *);
 
diff --git a/sys/arch/vax/include/db_machdep.h b/sys/arch/vax/include/db_machdep.h
index ed8ee7795c2..e74db7a7636 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.16 2013/10/17 08:02:17 deraadt Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.17 2014/03/16 20:31:46 guenther Exp $	*/
 /*	$NetBSD: db_machdep.h,v 1.6 1998/08/10 14:33:33 ragge Exp $	*/
 
 /* 
@@ -73,7 +73,4 @@ extern db_regs_t	ddb_regs;	/* register state */
 /* Prototypes */
 void	kdb_trap(struct trapframe *);
 
-#define	DB_ELF_SYMBOLS
-#define	DB_ELFSIZE	32
-
 #endif	/* _MACHINE_DB_MACHDEP_H_ */