Module Name: src
Committed By: christos
Date: Mon Nov 6 03:47:49 UTC 2017
Modified Files:
src/sys/arch/aarch64/include: elf_machdep.h
src/sys/arch/acorn26/include: db_machdep.h
src/sys/arch/alpha/include: db_machdep.h elf_machdep.h
src/sys/arch/amd64/include: db_machdep.h elf_machdep.h
src/sys/arch/amiga/include: db_machdep.h
src/sys/arch/arm/include: db_machdep.h elf_machdep.h
src/sys/arch/atari/include: db_machdep.h
src/sys/arch/cobalt/cobalt: machdep.c
src/sys/arch/evbarm/ixm1200: ixm1200_machdep.c
src/sys/arch/evbcf/include: db_machdep.h
src/sys/arch/evbmips/sbmips: machdep.c
src/sys/arch/ews4800mips/ews4800mips: machdep.c
src/sys/arch/hpcarm/hpcarm: pxa2x0_hpc_machdep.c sa11x0_hpc_machdep.c
src/sys/arch/hpcarm/include: db_machdep.h
src/sys/arch/hpcmips/hpcmips: machdep.c
src/sys/arch/hpcsh/hpcsh: machdep.c
src/sys/arch/hppa/include: db_machdep.h elf_machdep.h
src/sys/arch/i386/include: db_machdep.h elf_machdep.h
src/sys/arch/ia64/include: db_machdep.h elf_machdep.h
src/sys/arch/landisk/landisk: machdep.c
src/sys/arch/luna68k/include: db_machdep.h
src/sys/arch/m68k/include: db_machdep.h elf_machdep.h
src/sys/arch/mac68k/include: db_machdep.h
src/sys/arch/mips/include: db_machdep.h elf_machdep.h
src/sys/arch/mvme68k/include: db_machdep.h
src/sys/arch/next68k/include: db_machdep.h
src/sys/arch/or1k/include: elf_machdep.h
src/sys/arch/playstation2/include: db_machdep.h
src/sys/arch/playstation2/playstation2: machdep.c
src/sys/arch/pmax/include: db_machdep.h
src/sys/arch/powerpc/include: db_machdep.h elf_machdep.h
src/sys/arch/riscv/include: db_machdep.h elf_machdep.h
src/sys/arch/sbmips/sbmips: machdep.c
src/sys/arch/sgimips/sgimips: machdep.c
src/sys/arch/sh3/include: db_machdep.h elf_machdep.h
src/sys/arch/sparc/include: db_machdep.h elf_machdep.h
src/sys/arch/sparc64/include: db_machdep.h elf_machdep.h
src/sys/arch/sun2/include: db_machdep.h
src/sys/arch/sun3/include: db_machdep.h
src/sys/arch/vax/include: db_machdep.h elf_machdep.h
src/sys/arch/x68k/include: db_machdep.h
src/sys/arch/zaurus/include: db_machdep.h
Log Message:
Cleanup and clarify the ELFSIZE mess:
We now have 2 variables automatically set in elf_machdep.h:
ARCH_ELFSIZE: the size for userland binaries
KERN_ELFSIZE: the size for the kernel binaries
DB_ELFSIZE has been deleted and KERN_ELFSIZE should have always the
same values DB_ELFSIZE used to have.
In sys/exec_elf.h, if ELFSIZE is not set, it is set to KERN_ELFSIZE
for the kernel and ARCH_ELFSIZE for userland. These defaults should
eliminate the need for most manual ELFSIZE setting.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/aarch64/include/elf_machdep.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/acorn26/include/db_machdep.h
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/alpha/include/db_machdep.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/alpha/include/elf_machdep.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/amd64/include/db_machdep.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/amd64/include/elf_machdep.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/amiga/include/db_machdep.h
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/include/db_machdep.h
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/include/elf_machdep.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/atari/include/db_machdep.h
cvs rdiff -u -r1.119 -r1.120 src/sys/arch/cobalt/cobalt/machdep.c
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbcf/include/db_machdep.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbmips/sbmips/machdep.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/ews4800mips/ews4800mips/machdep.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hpcarm/include/db_machdep.h
cvs rdiff -u -r1.123 -r1.124 src/sys/arch/hpcmips/hpcmips/machdep.c
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/hpcsh/hpcsh/machdep.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hppa/include/db_machdep.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hppa/include/elf_machdep.h
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/i386/include/db_machdep.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/i386/include/elf_machdep.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/include/db_machdep.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/include/elf_machdep.h
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/landisk/landisk/machdep.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/luna68k/include/db_machdep.h
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/m68k/include/db_machdep.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/m68k/include/elf_machdep.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mac68k/include/db_machdep.h
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/mips/include/db_machdep.h
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/mips/include/elf_machdep.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mvme68k/include/db_machdep.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/next68k/include/db_machdep.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/or1k/include/elf_machdep.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/playstation2/include/db_machdep.h
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/playstation2/playstation2/machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/pmax/include/db_machdep.h
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/powerpc/include/db_machdep.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/powerpc/include/elf_machdep.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/riscv/include/db_machdep.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/riscv/include/elf_machdep.h
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/sbmips/sbmips/machdep.c
cvs rdiff -u -r1.144 -r1.145 src/sys/arch/sgimips/sgimips/machdep.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sh3/include/db_machdep.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sh3/include/elf_machdep.h
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/sparc/include/db_machdep.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sparc/include/elf_machdep.h
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/sparc64/include/db_machdep.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sparc64/include/elf_machdep.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sun2/include/db_machdep.h
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sun3/include/db_machdep.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/vax/include/db_machdep.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/vax/include/elf_machdep.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x68k/include/db_machdep.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/zaurus/include/db_machdep.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/aarch64/include/elf_machdep.h
diff -u src/sys/arch/aarch64/include/elf_machdep.h:1.1 src/sys/arch/aarch64/include/elf_machdep.h:1.2
--- src/sys/arch/aarch64/include/elf_machdep.h:1.1 Sun Aug 10 01:47:38 2014
+++ src/sys/arch/aarch64/include/elf_machdep.h Sun Nov 5 22:47:45 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: elf_machdep.h,v 1.1 2014/08/10 05:47:38 matt Exp $ */
+/* $NetBSD: elf_machdep.h,v 1.2 2017/11/06 03:47:45 christos Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -74,6 +74,7 @@
#define ELF64_MACHDEP_ID EM_AARCH64
+#define KERN_ELFSIZE 64
#define ARCH_ELFSIZE 64 /* MD native binary size */
/* Processor specific relocation types */
Index: src/sys/arch/acorn26/include/db_machdep.h
diff -u src/sys/arch/acorn26/include/db_machdep.h:1.9 src/sys/arch/acorn26/include/db_machdep.h:1.10
--- src/sys/arch/acorn26/include/db_machdep.h:1.9 Sat Jan 5 10:04:00 2013
+++ src/sys/arch/acorn26/include/db_machdep.h Sun Nov 5 22:47:45 2017
@@ -1,10 +1,9 @@
-/* $NetBSD: db_machdep.h,v 1.9 2013/01/05 15:04:00 christos Exp $ */
+/* $NetBSD: db_machdep.h,v 1.10 2017/11/06 03:47:45 christos Exp $ */
#include <arm/db_machdep.h>
/* acorn26 uses ELF */
#define DB_ELF_SYMBOLS
-#define DB_ELFSIZE 32
void db_show_frame_cmd(db_expr_t, bool, db_expr_t, const char *);
void db_bus_write_cmd(db_expr_t, bool, db_expr_t, const char *);
Index: src/sys/arch/alpha/include/db_machdep.h
diff -u src/sys/arch/alpha/include/db_machdep.h:1.18 src/sys/arch/alpha/include/db_machdep.h:1.19
--- src/sys/arch/alpha/include/db_machdep.h:1.18 Thu May 26 11:34:12 2011
+++ src/sys/arch/alpha/include/db_machdep.h Sun Nov 5 22:47:45 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.18 2011/05/26 15:34:12 joerg Exp $ */
+/* $NetBSD: db_machdep.h,v 1.19 2017/11/06 03:47:45 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
@@ -107,7 +107,6 @@ void alpha_kgdb_init(const char **, stru
* We use Elf64 symbols in DDB.
*/
#define DB_ELF_SYMBOLS
-#define DB_ELFSIZE 64
/*
* Stuff for KGDB.
Index: src/sys/arch/alpha/include/elf_machdep.h
diff -u src/sys/arch/alpha/include/elf_machdep.h:1.12 src/sys/arch/alpha/include/elf_machdep.h:1.13
--- src/sys/arch/alpha/include/elf_machdep.h:1.12 Thu Sep 30 05:11:19 2010
+++ src/sys/arch/alpha/include/elf_machdep.h Sun Nov 5 22:47:45 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: elf_machdep.h,v 1.12 2010/09/30 09:11:19 skrll Exp $ */
+/* $NetBSD: elf_machdep.h,v 1.13 2017/11/06 03:47:45 christos Exp $ */
#ifndef _ALPHA_ELF_MACHDEP_H_
#define _ALPHA_ELF_MACHDEP_H_
@@ -21,6 +21,7 @@
#define ELF64_MACHDEP_ID EM_ALPHA_EXP /* XXX */
+#define KERN_ELFSIZE 64
#define ARCH_ELFSIZE 64 /* MD native binary size */
/*
Index: src/sys/arch/amd64/include/db_machdep.h
diff -u src/sys/arch/amd64/include/db_machdep.h:1.15 src/sys/arch/amd64/include/db_machdep.h:1.16
--- src/sys/arch/amd64/include/db_machdep.h:1.15 Sun Jul 26 06:49:05 2015
+++ src/sys/arch/amd64/include/db_machdep.h Sun Nov 5 22:47:45 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.15 2015/07/26 10:49:05 mrg Exp $ */
+/* $NetBSD: db_machdep.h,v 1.16 2017/11/06 03:47:45 christos Exp $ */
/*
* Mach Operating System
@@ -141,7 +141,6 @@ int kdb_trap(int, int, db_regs_t *);
#endif
#define DB_ELF_SYMBOLS
-#define DB_ELFSIZE 64
extern void db_machine_init(void);
Index: src/sys/arch/amd64/include/elf_machdep.h
diff -u src/sys/arch/amd64/include/elf_machdep.h:1.5 src/sys/arch/amd64/include/elf_machdep.h:1.6
--- src/sys/arch/amd64/include/elf_machdep.h:1.5 Tue Feb 2 15:13:59 2016
+++ src/sys/arch/amd64/include/elf_machdep.h Sun Nov 5 22:47:45 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: elf_machdep.h,v 1.5 2016/02/02 20:13:59 christos Exp $ */
+/* $NetBSD: elf_machdep.h,v 1.6 2017/11/06 03:47:45 christos Exp $ */
#if !defined __i386__
@@ -15,6 +15,7 @@
#define ELF32_MACHDEP_ID EM_386
#define ELF64_MACHDEP_ID EM_X86_64
+#define KERN_ELFSIZE 64
#define ARCH_ELFSIZE 64 /* MD native binary size */
/* x86-64 relocations */
Index: src/sys/arch/amiga/include/db_machdep.h
diff -u src/sys/arch/amiga/include/db_machdep.h:1.5 src/sys/arch/amiga/include/db_machdep.h:1.6
--- src/sys/arch/amiga/include/db_machdep.h:1.5 Tue Aug 14 21:29:29 2001
+++ src/sys/arch/amiga/include/db_machdep.h Sun Nov 5 22:47:45 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.5 2001/08/15 01:29:29 mhitch Exp $ */
+/* $NetBSD: db_machdep.h,v 1.6 2017/11/06 03:47:45 christos Exp $ */
#ifndef _MACHINE_DB_MACHDEP_H_
#define _MACHINE_DB_MACHDEP_H_
@@ -6,6 +6,5 @@
#include <m68k/db_machdep.h>
#define DB_ELF_SYMBOLS
-#define DB_ELFSIZE 32
#endif
Index: src/sys/arch/arm/include/db_machdep.h
diff -u src/sys/arch/arm/include/db_machdep.h:1.24 src/sys/arch/arm/include/db_machdep.h:1.25
--- src/sys/arch/arm/include/db_machdep.h:1.24 Mon Feb 20 12:27:32 2017
+++ src/sys/arch/arm/include/db_machdep.h Sun Nov 5 22:47:45 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.24 2017/02/20 17:27:32 skrll Exp $ */
+/* $NetBSD: db_machdep.h,v 1.25 2017/11/06 03:47:45 christos Exp $ */
/*
* Copyright (c) 1996 Scott K Stevens
@@ -121,7 +121,6 @@ void db_machine_init(void);
int db_validate_address(vaddr_t addr);
#define DB_ELF_SYMBOLS
-#define DB_ELFSIZE 32
/*
* kgdb
Index: src/sys/arch/arm/include/elf_machdep.h
diff -u src/sys/arch/arm/include/elf_machdep.h:1.18 src/sys/arch/arm/include/elf_machdep.h:1.19
--- src/sys/arch/arm/include/elf_machdep.h:1.18 Thu Aug 10 15:03:27 2017
+++ src/sys/arch/arm/include/elf_machdep.h Sun Nov 5 22:47:45 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: elf_machdep.h,v 1.18 2017/08/10 19:03:27 joerg Exp $ */
+/* $NetBSD: elf_machdep.h,v 1.19 2017/11/06 03:47:45 christos Exp $ */
#ifndef _ARM_ELF_MACHDEP_H_
#define _ARM_ELF_MACHDEP_H_
@@ -41,6 +41,7 @@
#define ELF32_MACHDEP_ID EM_ARM
+#define KERN_ELFSIZE 32
#define ARCH_ELFSIZE 32 /* MD native binary size */
/* Processor specific relocation types */
Index: src/sys/arch/atari/include/db_machdep.h
diff -u src/sys/arch/atari/include/db_machdep.h:1.2 src/sys/arch/atari/include/db_machdep.h:1.3
--- src/sys/arch/atari/include/db_machdep.h:1.2 Mon Sep 24 05:21:24 2001
+++ src/sys/arch/atari/include/db_machdep.h Sun Nov 5 22:47:46 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.2 2001/09/24 09:21:24 leo Exp $ */
+/* $NetBSD: db_machdep.h,v 1.3 2017/11/06 03:47:46 christos Exp $ */
#ifndef _MACHINE_DB_MACHDEP_H_
#define _MACHINE_DB_MACHDEP_H_
@@ -6,6 +6,5 @@
#include <m68k/db_machdep.h>
#define DB_ELF_SYMBOLS
-#define DB_ELFSIZE 32
#endif
Index: src/sys/arch/cobalt/cobalt/machdep.c
diff -u src/sys/arch/cobalt/cobalt/machdep.c:1.119 src/sys/arch/cobalt/cobalt/machdep.c:1.120
--- src/sys/arch/cobalt/cobalt/machdep.c:1.119 Thu Dec 22 09:47:54 2016
+++ src/sys/arch/cobalt/cobalt/machdep.c Sun Nov 5 22:47:46 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.119 2016/12/22 14:47:54 cherry Exp $ */
+/* $NetBSD: machdep.c,v 1.120 2017/11/06 03:47:46 christos Exp $ */
/*-
* Copyright (c) 2006 Izumi Tsutsui. All rights reserved.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.119 2016/12/22 14:47:54 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.120 2017/11/06 03:47:46 christos Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -89,7 +89,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#if NKSYMS || defined(DDB) || defined(MODULAR)
#include <mips/db_machdep.h>
#include <ddb/db_extern.h>
-#define ELFSIZE DB_ELFSIZE
#include <sys/exec_elf.h>
#endif
Index: src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c
diff -u src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c:1.57 src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c:1.58
--- src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c:1.57 Thu Dec 22 09:47:55 2016
+++ src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c Sun Nov 5 22:47:46 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ixm1200_machdep.c,v 1.57 2016/12/22 14:47:55 cherry Exp $ */
+/* $NetBSD: ixm1200_machdep.c,v 1.58 2017/11/06 03:47:46 christos Exp $ */
/*
* Copyright (c) 2002, 2003
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.57 2016/12/22 14:47:55 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.58 2017/11/06 03:47:46 christos Exp $");
#include "opt_ddb.h"
#include "opt_modular.h"
@@ -90,10 +90,6 @@ __KERNEL_RCSID(0, "$NetBSD: ixm1200_mach
#include <machine/db_machdep.h>
#include <ddb/db_sym.h>
#include <ddb/db_extern.h>
-#ifndef DB_ELFSIZE
-#error Must define DB_ELFSIZE!
-#endif
-#define ELFSIZE DB_ELFSIZE
#include <sys/exec_elf.h>
#endif
Index: src/sys/arch/evbcf/include/db_machdep.h
diff -u src/sys/arch/evbcf/include/db_machdep.h:1.2 src/sys/arch/evbcf/include/db_machdep.h:1.3
--- src/sys/arch/evbcf/include/db_machdep.h:1.2 Tue Mar 18 14:20:41 2014
+++ src/sys/arch/evbcf/include/db_machdep.h Sun Nov 5 22:47:46 2017
@@ -1,7 +1,6 @@
-/* $NetBSD: db_machdep.h,v 1.2 2014/03/18 18:20:41 riastradh Exp $ */
+/* $NetBSD: db_machdep.h,v 1.3 2017/11/06 03:47:46 christos Exp $ */
/* Just use the common m68k definition */
#include <m68k/db_machdep.h>
#define DB_ELF_SYMBOLS
-#define DB_ELFSIZE 32
Index: src/sys/arch/evbmips/sbmips/machdep.c
diff -u src/sys/arch/evbmips/sbmips/machdep.c:1.2 src/sys/arch/evbmips/sbmips/machdep.c:1.3
--- src/sys/arch/evbmips/sbmips/machdep.c:1.2 Mon Jul 24 05:56:45 2017
+++ src/sys/arch/evbmips/sbmips/machdep.c Sun Nov 5 22:47:46 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.2 2017/07/24 09:56:45 mrg Exp $ */
+/* $NetBSD: machdep.c,v 1.3 2017/11/06 03:47:46 christos Exp $ */
/*
* Copyright 2000, 2001
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.2 2017/07/24 09:56:45 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.3 2017/11/06 03:47:46 christos Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
@@ -111,10 +111,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <ddb/db_access.h>
#include <ddb/db_sym.h>
#include <ddb/db_extern.h>
-#ifndef DB_ELFSIZE
-#error Must define DB_ELFSIZE!
-#endif
-#define ELFSIZE DB_ELFSIZE
#include <sys/exec_elf.h>
#endif
Index: src/sys/arch/ews4800mips/ews4800mips/machdep.c
diff -u src/sys/arch/ews4800mips/ews4800mips/machdep.c:1.27 src/sys/arch/ews4800mips/ews4800mips/machdep.c:1.28
--- src/sys/arch/ews4800mips/ews4800mips/machdep.c:1.27 Thu Dec 22 09:47:57 2016
+++ src/sys/arch/ews4800mips/ews4800mips/machdep.c Sun Nov 5 22:47:46 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.27 2016/12/22 14:47:57 cherry Exp $ */
+/* $NetBSD: machdep.c,v 1.28 2017/11/06 03:47:46 christos Exp $ */
/*-
* Copyright (c) 2001, 2004, 2005 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.27 2016/12/22 14:47:57 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.28 2017/11/06 03:47:46 christos Exp $");
#include "opt_ddb.h"
@@ -57,10 +57,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <ddb/db_sym.h>
#include <ddb/db_extern.h>
#include <ddb/db_output.h>
-#ifndef DB_ELFSIZE
-#error Must define DB_ELFSIZE!
-#endif
-#define ELFSIZE DB_ELFSIZE
#include <sys/exec_elf.h>
#endif
Index: src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.23 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.24
--- src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.23 Thu Dec 22 09:47:57 2016
+++ src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c Sun Nov 5 22:47:46 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pxa2x0_hpc_machdep.c,v 1.23 2016/12/22 14:47:57 cherry Exp $ */
+/* $NetBSD: pxa2x0_hpc_machdep.c,v 1.24 2017/11/06 03:47:46 christos Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.23 2016/12/22 14:47:57 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.24 2017/11/06 03:47:46 christos Exp $");
#include "opt_ddb.h"
#include "opt_dram_pages.h"
@@ -64,10 +64,6 @@ __KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_m
#include <machine/db_machdep.h>
#include <ddb/db_sym.h>
#include <ddb/db_extern.h>
-#ifndef DB_ELFSIZE
-#error Must define DB_ELFSIZE!
-#endif
-#define ELFSIZE DB_ELFSIZE
#include <sys/exec_elf.h>
#endif
Index: src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c:1.11 src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c:1.12
--- src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c:1.11 Thu Dec 22 09:47:57 2016
+++ src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c Sun Nov 5 22:47:46 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sa11x0_hpc_machdep.c,v 1.11 2016/12/22 14:47:57 cherry Exp $ */
+/* $NetBSD: sa11x0_hpc_machdep.c,v 1.12 2017/11/06 03:47:46 christos Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sa11x0_hpc_machdep.c,v 1.11 2016/12/22 14:47:57 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sa11x0_hpc_machdep.c,v 1.12 2017/11/06 03:47:46 christos Exp $");
#include "opt_ddb.h"
#include "opt_dram_pages.h"
@@ -67,10 +67,6 @@ __KERNEL_RCSID(0, "$NetBSD: sa11x0_hpc_m
#include <machine/db_machdep.h>
#include <ddb/db_sym.h>
#include <ddb/db_extern.h>
-#ifndef DB_ELFSIZE
-#error Must define DB_ELFSIZE!
-#endif
-#define ELFSIZE DB_ELFSIZE
#include <sys/exec_elf.h>
#endif
Index: src/sys/arch/hpcarm/include/db_machdep.h
diff -u src/sys/arch/hpcarm/include/db_machdep.h:1.3 src/sys/arch/hpcarm/include/db_machdep.h:1.4
--- src/sys/arch/hpcarm/include/db_machdep.h:1.3 Tue Mar 20 13:01:49 2001
+++ src/sys/arch/hpcarm/include/db_machdep.h Sun Nov 5 22:47:46 2017
@@ -1,7 +1,6 @@
-/* $NetBSD: db_machdep.h,v 1.3 2001/03/20 18:01:49 toshii Exp $ */
+/* $NetBSD: db_machdep.h,v 1.4 2017/11/06 03:47:46 christos Exp $ */
#include <arm/db_machdep.h>
/* hpcarm uses ELF for kernel */
#define DB_ELF_SYMBOLS
-#define DB_ELFSIZE 32
Index: src/sys/arch/hpcmips/hpcmips/machdep.c
diff -u src/sys/arch/hpcmips/hpcmips/machdep.c:1.123 src/sys/arch/hpcmips/hpcmips/machdep.c:1.124
--- src/sys/arch/hpcmips/hpcmips/machdep.c:1.123 Sun May 7 08:22:22 2017
+++ src/sys/arch/hpcmips/hpcmips/machdep.c Sun Nov 5 22:47:46 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.123 2017/05/07 12:22:22 skrll Exp $ */
+/* $NetBSD: machdep.c,v 1.124 2017/11/06 03:47:46 christos Exp $ */
/*-
* Copyright (c) 1999 Shin Takemura, All rights reserved.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.123 2017/05/07 12:22:22 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.124 2017/11/06 03:47:46 christos Exp $");
#include "opt_vr41xx.h"
#include "opt_tx39xx.h"
@@ -122,10 +122,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <machine/db_machdep.h>
#include <ddb/db_sym.h>
#include <ddb/db_extern.h>
-#ifndef DB_ELFSIZE
-#error Must define DB_ELFSIZE!
-#endif
-#define ELFSIZE DB_ELFSIZE
#include <sys/exec_elf.h>
#endif
Index: src/sys/arch/hpcsh/hpcsh/machdep.c
diff -u src/sys/arch/hpcsh/hpcsh/machdep.c:1.77 src/sys/arch/hpcsh/hpcsh/machdep.c:1.78
--- src/sys/arch/hpcsh/hpcsh/machdep.c:1.77 Mon Mar 24 16:06:32 2014
+++ src/sys/arch/hpcsh/hpcsh/machdep.c Sun Nov 5 22:47:46 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.77 2014/03/24 20:06:32 christos Exp $ */
+/* $NetBSD: machdep.c,v 1.78 2017/11/06 03:47:46 christos Exp $ */
/*-
* Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.77 2014/03/24 20:06:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.78 2017/11/06 03:47:46 christos Exp $");
#include "opt_md.h"
#include "opt_ddb.h"
@@ -76,10 +76,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <machine/db_machdep.h>
#include <ddb/db_sym.h>
#include <ddb/db_extern.h>
-#ifndef DB_ELFSIZE
-#error Must define DB_ELFSIZE!
-#endif
-#define ELFSIZE DB_ELFSIZE
#include <sys/exec_elf.h>
#endif /* NKSYMS || MODULAR || DDB || KGDB */
Index: src/sys/arch/hppa/include/db_machdep.h
diff -u src/sys/arch/hppa/include/db_machdep.h:1.13 src/sys/arch/hppa/include/db_machdep.h:1.14
--- src/sys/arch/hppa/include/db_machdep.h:1.13 Mon Jan 11 03:14:08 2016
+++ src/sys/arch/hppa/include/db_machdep.h Sun Nov 5 22:47:46 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.13 2016/01/11 08:14:08 skrll Exp $ */
+/* $NetBSD: db_machdep.h,v 1.14 2017/11/06 03:47:46 christos Exp $ */
/* $OpenBSD: db_machdep.h,v 1.5 2001/02/16 19:20:13 mickey Exp $ */
@@ -39,7 +39,6 @@
#include <machine/frame.h>
#define DB_ELF_SYMBOLS
-#define DB_ELFSIZE 32
/* types the generic ddb module needs */
typedef vaddr_t db_addr_t;
Index: src/sys/arch/hppa/include/elf_machdep.h
diff -u src/sys/arch/hppa/include/elf_machdep.h:1.3 src/sys/arch/hppa/include/elf_machdep.h:1.4
--- src/sys/arch/hppa/include/elf_machdep.h:1.3 Sat May 30 01:56:52 2009
+++ src/sys/arch/hppa/include/elf_machdep.h Sun Nov 5 22:47:46 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: elf_machdep.h,v 1.3 2009/05/30 05:56:52 skrll Exp $ */
+/* $NetBSD: elf_machdep.h,v 1.4 2017/11/06 03:47:46 christos Exp $ */
#define ELF32_MACHDEP_ENDIANNESS ELFDATA2MSB
#define ELF32_MACHDEP_ID_CASES \
@@ -11,6 +11,7 @@
#define ELF32_MACHDEP_ID EM_PARISC
+#define KERN_ELFSIZE 32
#define ARCH_ELFSIZE 32 /* MD native binary size */
/* hppa relocation types */
Index: src/sys/arch/i386/include/db_machdep.h
diff -u src/sys/arch/i386/include/db_machdep.h:1.30 src/sys/arch/i386/include/db_machdep.h:1.31
--- src/sys/arch/i386/include/db_machdep.h:1.30 Thu May 26 11:34:13 2011
+++ src/sys/arch/i386/include/db_machdep.h Sun Nov 5 22:47:46 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.30 2011/05/26 15:34:13 joerg Exp $ */
+/* $NetBSD: db_machdep.h,v 1.31 2017/11/06 03:47:46 christos Exp $ */
/*
* Mach Operating System
@@ -143,7 +143,6 @@ int kdb_trap(int, int, db_regs_t *);
* We use Elf32 symbols in DDB.
*/
#define DB_ELF_SYMBOLS
-#define DB_ELFSIZE 32
extern void db_machine_init(void);
Index: src/sys/arch/i386/include/elf_machdep.h
diff -u src/sys/arch/i386/include/elf_machdep.h:1.12 src/sys/arch/i386/include/elf_machdep.h:1.13
--- src/sys/arch/i386/include/elf_machdep.h:1.12 Tue Feb 2 15:16:59 2016
+++ src/sys/arch/i386/include/elf_machdep.h Sun Nov 5 22:47:46 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: elf_machdep.h,v 1.12 2016/02/02 20:16:59 christos Exp $ */
+/* $NetBSD: elf_machdep.h,v 1.13 2017/11/06 03:47:46 christos Exp $ */
#define ELF32_MACHDEP_ENDIANNESS ELFDATA2LSB
#define ELF32_MACHDEP_ID_CASES \
@@ -12,6 +12,7 @@
#define ELF32_MACHDEP_ID EM_386
+#define KERN_ELFSIZE 32
#define ARCH_ELFSIZE 32 /* MD native binary size */
/* i386 relocations */
Index: src/sys/arch/ia64/include/db_machdep.h
diff -u src/sys/arch/ia64/include/db_machdep.h:1.3 src/sys/arch/ia64/include/db_machdep.h:1.4
--- src/sys/arch/ia64/include/db_machdep.h:1.3 Thu May 26 11:34:13 2011
+++ src/sys/arch/ia64/include/db_machdep.h Sun Nov 5 22:47:47 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.3 2011/05/26 15:34:13 joerg Exp $ */
+/* $NetBSD: db_machdep.h,v 1.4 2017/11/06 03:47:47 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
@@ -123,7 +123,6 @@ int ia64_trap(int, int, db_regs_t *); /*
* We use Elf64 symbols in DDB.
*/
#define DB_ELF_SYMBOLS
-#define DB_ELFSIZE 64
/*
* Stuff for KGDB.
Index: src/sys/arch/ia64/include/elf_machdep.h
diff -u src/sys/arch/ia64/include/elf_machdep.h:1.2 src/sys/arch/ia64/include/elf_machdep.h:1.3
--- src/sys/arch/ia64/include/elf_machdep.h:1.2 Fri Aug 5 12:58:33 2016
+++ src/sys/arch/ia64/include/elf_machdep.h Sun Nov 5 22:47:47 2017
@@ -41,6 +41,7 @@
#define ELF64_MACHDEP_ID EM_IA_64 /* XXX */
+#define KERN_ELFSIZE 64
#define ARCH_ELFSIZE 64 /* MD native binary size */
/*
Index: src/sys/arch/landisk/landisk/machdep.c
diff -u src/sys/arch/landisk/landisk/machdep.c:1.22 src/sys/arch/landisk/landisk/machdep.c:1.23
--- src/sys/arch/landisk/landisk/machdep.c:1.22 Thu Feb 2 16:57:03 2017
+++ src/sys/arch/landisk/landisk/machdep.c Sun Nov 5 22:47:47 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.22 2017/02/02 21:57:03 uwe Exp $ */
+/* $NetBSD: machdep.c,v 1.23 2017/11/06 03:47:47 christos Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.22 2017/02/02 21:57:03 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.23 2017/11/06 03:47:47 christos Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -121,10 +121,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <machine/db_machdep.h>
#include <ddb/db_sym.h>
#include <ddb/db_extern.h>
-#ifndef DB_ELFSIZE
-#error Must define DB_ELFSIZE!
-#endif
-#define ELFSIZE DB_ELFSIZE
#include <sys/exec_elf.h>
#endif
Index: src/sys/arch/luna68k/include/db_machdep.h
diff -u src/sys/arch/luna68k/include/db_machdep.h:1.3 src/sys/arch/luna68k/include/db_machdep.h:1.4
--- src/sys/arch/luna68k/include/db_machdep.h:1.3 Mon Apr 11 00:22:30 2011
+++ src/sys/arch/luna68k/include/db_machdep.h Sun Nov 5 22:47:47 2017
@@ -1,7 +1,6 @@
-/* $NetBSD: db_machdep.h,v 1.3 2011/04/11 04:22:30 mrg Exp $ */
+/* $NetBSD: db_machdep.h,v 1.4 2017/11/06 03:47:47 christos Exp $ */
/* Just use the common m68k definition */
#include <m68k/db_machdep.h>
#define DB_ELF_SYMBOLS
-#define DB_ELFSIZE 32
Index: src/sys/arch/m68k/include/db_machdep.h
diff -u src/sys/arch/m68k/include/db_machdep.h:1.32 src/sys/arch/m68k/include/db_machdep.h:1.33
--- src/sys/arch/m68k/include/db_machdep.h:1.32 Sun Nov 5 11:16:26 2017
+++ src/sys/arch/m68k/include/db_machdep.h Sun Nov 5 22:47:47 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.32 2017/11/05 16:16:26 christos Exp $ */
+/* $NetBSD: db_machdep.h,v 1.33 2017/11/06 03:47:47 christos Exp $ */
/*
* Mach Operating System
@@ -110,6 +110,5 @@ int kdb_trap(int, db_regs_t *);
* We use Elf32 symbols in DDB.
*/
#define DB_ELF_SYMBOLS
-#define DB_ELFSIZE 32
#endif /* _M68K_DB_MACHDEP_H_ */
Index: src/sys/arch/m68k/include/elf_machdep.h
diff -u src/sys/arch/m68k/include/elf_machdep.h:1.8 src/sys/arch/m68k/include/elf_machdep.h:1.9
--- src/sys/arch/m68k/include/elf_machdep.h:1.8 Sat May 30 01:56:52 2009
+++ src/sys/arch/m68k/include/elf_machdep.h Sun Nov 5 22:47:47 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: elf_machdep.h,v 1.8 2009/05/30 05:56:52 skrll Exp $ */
+/* $NetBSD: elf_machdep.h,v 1.9 2017/11/06 03:47:47 christos Exp $ */
#define ELF32_MACHDEP_ENDIANNESS ELFDATA2MSB
#define ELF32_MACHDEP_ID_CASES \
@@ -17,6 +17,7 @@
#define EF_CPU32 0x00810000
#define EF_M68000 0x01000000
+#define KERN_ELFSIZE 32
#define ARCH_ELFSIZE 32 /* MD native binary size */
/* m68k relocation types */
Index: src/sys/arch/mac68k/include/db_machdep.h
diff -u src/sys/arch/mac68k/include/db_machdep.h:1.4 src/sys/arch/mac68k/include/db_machdep.h:1.5
--- src/sys/arch/mac68k/include/db_machdep.h:1.4 Mon Nov 19 22:19:42 2001
+++ src/sys/arch/mac68k/include/db_machdep.h Sun Nov 5 22:47:47 2017
@@ -1,5 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.4 2001/11/20 03:19:42 chs Exp $ */
+/* $NetBSD: db_machdep.h,v 1.5 2017/11/06 03:47:47 christos Exp $ */
#include <m68k/db_machdep.h>
#define DB_ELF_SYMBOLS
-#define DB_ELFSIZE 32
Index: src/sys/arch/mips/include/db_machdep.h
diff -u src/sys/arch/mips/include/db_machdep.h:1.29 src/sys/arch/mips/include/db_machdep.h:1.30
--- src/sys/arch/mips/include/db_machdep.h:1.29 Sat Jun 6 18:19:07 2015
+++ src/sys/arch/mips/include/db_machdep.h Sun Nov 5 22:47:47 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.29 2015/06/06 22:19:07 matt Exp $ */
+/* $NetBSD: db_machdep.h,v 1.30 2017/11/06 03:47:47 christos Exp $ */
/*
* Copyright (c) 1997 Jonathan Stone (hereinafter referred to as the author)
@@ -41,9 +41,6 @@
#include <mips/pcb.h>
#define DB_ELF_SYMBOLS
-#ifndef DB_ELFSIZE
-#define DB_ELFSIZE 32
-#endif
typedef vaddr_t db_addr_t; /* address - unsigned */
#ifdef __mips_n32
Index: src/sys/arch/mips/include/elf_machdep.h
diff -u src/sys/arch/mips/include/elf_machdep.h:1.18 src/sys/arch/mips/include/elf_machdep.h:1.19
--- src/sys/arch/mips/include/elf_machdep.h:1.18 Thu May 23 17:39:49 2013
+++ src/sys/arch/mips/include/elf_machdep.h Sun Nov 5 22:47:47 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: elf_machdep.h,v 1.18 2013/05/23 21:39:49 christos Exp $ */
+/* $NetBSD: elf_machdep.h,v 1.19 2017/11/06 03:47:47 christos Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -28,6 +28,7 @@
#ifndef _MIPS_ELF_MACHDEP_H_
#define _MIPS_ELF_MACHDEP_H_
+#define KERN_ELFSIZE 32
#ifdef _LP64
#define ARCH_ELFSIZE 64 /* MD native binary size */
#else
Index: src/sys/arch/mvme68k/include/db_machdep.h
diff -u src/sys/arch/mvme68k/include/db_machdep.h:1.3 src/sys/arch/mvme68k/include/db_machdep.h:1.4
--- src/sys/arch/mvme68k/include/db_machdep.h:1.3 Mon Apr 11 00:22:30 2011
+++ src/sys/arch/mvme68k/include/db_machdep.h Sun Nov 5 22:47:47 2017
@@ -1,7 +1,6 @@
-/* $NetBSD: db_machdep.h,v 1.3 2011/04/11 04:22:30 mrg Exp $ */
+/* $NetBSD: db_machdep.h,v 1.4 2017/11/06 03:47:47 christos Exp $ */
/* Just use the common m68k definition */
#include <m68k/db_machdep.h>
#define DB_ELF_SYMBOLS
-#define DB_ELFSIZE 32
Index: src/sys/arch/next68k/include/db_machdep.h
diff -u src/sys/arch/next68k/include/db_machdep.h:1.2 src/sys/arch/next68k/include/db_machdep.h:1.3
--- src/sys/arch/next68k/include/db_machdep.h:1.2 Sat May 12 18:35:29 2001
+++ src/sys/arch/next68k/include/db_machdep.h Sun Nov 5 22:47:47 2017
@@ -1,5 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.2 2001/05/12 22:35:29 chs Exp $ */
+/* $NetBSD: db_machdep.h,v 1.3 2017/11/06 03:47:47 christos Exp $ */
#include <m68k/db_machdep.h>
#define DB_ELF_SYMBOLS
-#define DB_ELFSIZE 32
Index: src/sys/arch/or1k/include/elf_machdep.h
diff -u src/sys/arch/or1k/include/elf_machdep.h:1.1 src/sys/arch/or1k/include/elf_machdep.h:1.2
--- src/sys/arch/or1k/include/elf_machdep.h:1.1 Wed Sep 3 15:34:26 2014
+++ src/sys/arch/or1k/include/elf_machdep.h Sun Nov 5 22:47:47 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: elf_machdep.h,v 1.1 2014/09/03 19:34:26 matt Exp $ */
+/* $NetBSD: elf_machdep.h,v 1.2 2017/11/06 03:47:47 christos Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -43,6 +43,7 @@
#define ELF64_MACHDEP_ID_CASES
+#define KERN_ELFSIZE 32
#define ARCH_ELFSIZE 32 /* MD native binary size */
/* Processor specific flags for the ELF header e_flags field. */
Index: src/sys/arch/playstation2/include/db_machdep.h
diff -u src/sys/arch/playstation2/include/db_machdep.h:1.3 src/sys/arch/playstation2/include/db_machdep.h:1.4
--- src/sys/arch/playstation2/include/db_machdep.h:1.3 Mon Mar 31 07:25:49 2014
+++ src/sys/arch/playstation2/include/db_machdep.h Sun Nov 5 22:47:47 2017
@@ -1,6 +1,5 @@
-/* $NetBSD: db_machdep.h,v 1.3 2014/03/31 11:25:49 martin Exp $ */
+/* $NetBSD: db_machdep.h,v 1.4 2017/11/06 03:47:47 christos Exp $ */
#include <mips/db_machdep.h>
#define DB_ELF_SYMBOLS
-#define DB_ELFSIZE 32
Index: src/sys/arch/playstation2/playstation2/machdep.c
diff -u src/sys/arch/playstation2/playstation2/machdep.c:1.32 src/sys/arch/playstation2/playstation2/machdep.c:1.33
--- src/sys/arch/playstation2/playstation2/machdep.c:1.32 Thu Dec 22 09:47:58 2016
+++ src/sys/arch/playstation2/playstation2/machdep.c Sun Nov 5 22:47:47 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.32 2016/12/22 14:47:58 cherry Exp $ */
+/* $NetBSD: machdep.c,v 1.33 2017/11/06 03:47:47 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.32 2016/12/22 14:47:58 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.33 2017/11/06 03:47:47 christos Exp $");
#include "opt_ddb.h"
#include "opt_kloader.h"
@@ -49,10 +49,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <machine/db_machdep.h>
#include <ddb/db_sym.h>
#include <ddb/db_extern.h>
-#ifndef DB_ELFSIZE
-#error Must define DB_ELFSIZE!
-#endif
-#define ELFSIZE DB_ELFSIZE
#include <sys/exec_elf.h>
#endif
Index: src/sys/arch/pmax/include/db_machdep.h
diff -u src/sys/arch/pmax/include/db_machdep.h:1.4 src/sys/arch/pmax/include/db_machdep.h:1.5
--- src/sys/arch/pmax/include/db_machdep.h:1.4 Mon Apr 11 00:22:31 2011
+++ src/sys/arch/pmax/include/db_machdep.h Sun Nov 5 22:47:48 2017
@@ -1,10 +1,9 @@
-/* $NetBSD: db_machdep.h,v 1.4 2011/04/11 04:22:31 mrg Exp $ */
+/* $NetBSD: db_machdep.h,v 1.5 2017/11/06 03:47:48 christos Exp $ */
#ifndef _PMAX_DB_MACHDEP_H_
#define _PMAX_DB_MACHDEP_H_
#define DB_ELF_SYMBOLS
-#define DB_ELFSIZE 32
#include <mips/db_machdep.h>
Index: src/sys/arch/powerpc/include/db_machdep.h
diff -u src/sys/arch/powerpc/include/db_machdep.h:1.25 src/sys/arch/powerpc/include/db_machdep.h:1.26
--- src/sys/arch/powerpc/include/db_machdep.h:1.25 Fri Jan 23 02:27:05 2015
+++ src/sys/arch/powerpc/include/db_machdep.h Sun Nov 5 22:47:48 2017
@@ -1,5 +1,5 @@
/* $OpenBSD: db_machdep.h,v 1.2 1997/03/21 00:48:48 niklas Exp $ */
-/* $NetBSD: db_machdep.h,v 1.25 2015/01/23 07:27:05 nonaka Exp $ */
+/* $NetBSD: db_machdep.h,v 1.26 2017/11/06 03:47:48 christos Exp $ */
/*
* Mach Operating System
@@ -42,7 +42,6 @@
#endif
#define DB_ELF_SYMBOLS
-#define DB_ELFSIZE 32
typedef vaddr_t db_addr_t; /* address - unsigned */
#define DDB_EXPR_FMT "l" /* expression is long */
Index: src/sys/arch/powerpc/include/elf_machdep.h
diff -u src/sys/arch/powerpc/include/elf_machdep.h:1.13 src/sys/arch/powerpc/include/elf_machdep.h:1.14
--- src/sys/arch/powerpc/include/elf_machdep.h:1.13 Thu Aug 10 15:03:27 2017
+++ src/sys/arch/powerpc/include/elf_machdep.h Sun Nov 5 22:47:48 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: elf_machdep.h,v 1.13 2017/08/10 19:03:27 joerg Exp $ */
+/* $NetBSD: elf_machdep.h,v 1.14 2017/11/06 03:47:48 christos Exp $ */
#ifndef _POWERPC_ELF_MACHDEP_H_
#define _POWERPC_ELF_MACHDEP_H_
@@ -16,6 +16,8 @@
#define ELF32_MACHDEP_ID EM_PPC
#define ELF64_MACHDEP_ID EM_PPC64
+#define KERN_ELFSIZE 32
+
#ifndef ARCH_ELFSIZE
#ifdef _LP64
#define ARCH_ELFSIZE 64 /* MD native binary size */
Index: src/sys/arch/riscv/include/db_machdep.h
diff -u src/sys/arch/riscv/include/db_machdep.h:1.1 src/sys/arch/riscv/include/db_machdep.h:1.2
--- src/sys/arch/riscv/include/db_machdep.h:1.1 Fri Sep 19 13:36:26 2014
+++ src/sys/arch/riscv/include/db_machdep.h Sun Nov 5 22:47:48 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.1 2014/09/19 17:36:26 matt Exp $ */
+/* $NetBSD: db_machdep.h,v 1.2 2017/11/06 03:47:48 christos Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -34,9 +34,6 @@
#include <riscv/locore.h> /* T_BREAK */
#define DB_ELF_SYMBOLS
-#ifndef DB_ELFSIZE
-#define DB_ELFSIZE 32
-#endif
typedef vaddr_t db_addr_t; /* address - unsigned */
#define DDB_EXPR_FMT "l" /* expression is long */
Index: src/sys/arch/riscv/include/elf_machdep.h
diff -u src/sys/arch/riscv/include/elf_machdep.h:1.5 src/sys/arch/riscv/include/elf_machdep.h:1.6
--- src/sys/arch/riscv/include/elf_machdep.h:1.5 Wed May 27 22:19:05 2015
+++ src/sys/arch/riscv/include/elf_machdep.h Sun Nov 5 22:47:48 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: elf_machdep.h,v 1.5 2015/05/28 02:19:05 matt Exp $ */
+/* $NetBSD: elf_machdep.h,v 1.6 2017/11/06 03:47:48 christos Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -46,6 +46,7 @@
case EM_RISCV: \
break;
+#define KERN_ELFSIZE 32
#ifdef _LP64
#define ARCH_ELFSIZE 64 /* MD native binary size */
#else
Index: src/sys/arch/sbmips/sbmips/machdep.c
diff -u src/sys/arch/sbmips/sbmips/machdep.c:1.54 src/sys/arch/sbmips/sbmips/machdep.c:1.55
--- src/sys/arch/sbmips/sbmips/machdep.c:1.54 Thu Dec 22 09:47:59 2016
+++ src/sys/arch/sbmips/sbmips/machdep.c Sun Nov 5 22:47:48 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.54 2016/12/22 14:47:59 cherry Exp $ */
+/* $NetBSD: machdep.c,v 1.55 2017/11/06 03:47:48 christos Exp $ */
/*
* Copyright 2000, 2001
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.54 2016/12/22 14:47:59 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.55 2017/11/06 03:47:48 christos Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
@@ -110,10 +110,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <ddb/db_access.h>
#include <ddb/db_sym.h>
#include <ddb/db_extern.h>
-#ifndef DB_ELFSIZE
-#error Must define DB_ELFSIZE!
-#endif
-#define ELFSIZE DB_ELFSIZE
#include <sys/exec_elf.h>
#endif
Index: src/sys/arch/sgimips/sgimips/machdep.c
diff -u src/sys/arch/sgimips/sgimips/machdep.c:1.144 src/sys/arch/sgimips/sgimips/machdep.c:1.145
--- src/sys/arch/sgimips/sgimips/machdep.c:1.144 Thu Feb 9 23:00:48 2017
+++ src/sys/arch/sgimips/sgimips/machdep.c Sun Nov 5 22:47:48 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.144 2017/02/10 04:00:48 christos Exp $ */
+/* $NetBSD: machdep.c,v 1.145 2017/11/06 03:47:48 christos Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.144 2017/02/10 04:00:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.145 2017/11/06 03:47:48 christos Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -98,10 +98,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <ddb/db_access.h>
#include <ddb/db_sym.h>
#include <ddb/db_extern.h>
-#ifndef DB_ELFSIZE
-#error Must define DB_ELFSIZE!
-#endif
-#define ELFSIZE DB_ELFSIZE
#include <sys/exec_elf.h>
#endif
Index: src/sys/arch/sh3/include/db_machdep.h
diff -u src/sys/arch/sh3/include/db_machdep.h:1.16 src/sys/arch/sh3/include/db_machdep.h:1.17
--- src/sys/arch/sh3/include/db_machdep.h:1.16 Thu May 26 11:34:13 2011
+++ src/sys/arch/sh3/include/db_machdep.h Sun Nov 5 22:47:48 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.16 2011/05/26 15:34:13 joerg Exp $ */
+/* $NetBSD: db_machdep.h,v 1.17 2017/11/06 03:47:48 christos Exp $ */
/*
* Mach Operating System
@@ -104,7 +104,6 @@ bool inst_trap_return(int);
*
*/
#define DB_ELF_SYMBOLS
-#define DB_ELFSIZE 32
/*
* We have machine-dependent commands.
Index: src/sys/arch/sh3/include/elf_machdep.h
diff -u src/sys/arch/sh3/include/elf_machdep.h:1.12 src/sys/arch/sh3/include/elf_machdep.h:1.13
--- src/sys/arch/sh3/include/elf_machdep.h:1.12 Mon Dec 5 07:42:33 2016
+++ src/sys/arch/sh3/include/elf_machdep.h Sun Nov 5 22:47:48 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: elf_machdep.h,v 1.12 2016/12/05 12:42:33 joerg Exp $ */
+/* $NetBSD: elf_machdep.h,v 1.13 2017/11/06 03:47:48 christos Exp $ */
#include <machine/endian_machdep.h>
@@ -17,6 +17,7 @@
#define ELF32_MACHDEP_ID EM_SH
+#define KERN_ELFSIZE 32
#define ARCH_ELFSIZE 32 /* MD native binary size */
/*
Index: src/sys/arch/sparc/include/db_machdep.h
diff -u src/sys/arch/sparc/include/db_machdep.h:1.27 src/sys/arch/sparc/include/db_machdep.h:1.28
--- src/sys/arch/sparc/include/db_machdep.h:1.27 Sat Dec 10 05:41:07 2016
+++ src/sys/arch/sparc/include/db_machdep.h Sun Nov 5 22:47:48 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.27 2016/12/10 10:41:07 mrg Exp $ */
+/* $NetBSD: db_machdep.h,v 1.28 2017/11/06 03:47:48 christos Exp $ */
/*
* Mach Operating System
@@ -118,7 +118,6 @@ int kdb_trap(int, struct trapframe *);
* We use elf symbols in DDB.
*/
#define DB_ELF_SYMBOLS
-#define DB_ELFSIZE 32
/*
Index: src/sys/arch/sparc/include/elf_machdep.h
diff -u src/sys/arch/sparc/include/elf_machdep.h:1.9 src/sys/arch/sparc/include/elf_machdep.h:1.10
--- src/sys/arch/sparc/include/elf_machdep.h:1.9 Sat Aug 12 05:03:28 2017
+++ src/sys/arch/sparc/include/elf_machdep.h Sun Nov 5 22:47:48 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: elf_machdep.h,v 1.9 2017/08/12 09:03:28 joerg Exp $ */
+/* $NetBSD: elf_machdep.h,v 1.10 2017/11/06 03:47:48 christos Exp $ */
#define ELF32_MACHDEP_ENDIANNESS ELFDATA2MSB
#define ELF32_MACHDEP_ID_CASES \
@@ -12,6 +12,7 @@
#define ELF32_MACHDEP_ID EM_SPARC
+#define KERN_ELFSIZE 32
#define ARCH_ELFSIZE 32 /* MD native binary size */
#define R_SPARC_NONE 0
Index: src/sys/arch/sparc64/include/db_machdep.h
diff -u src/sys/arch/sparc64/include/db_machdep.h:1.34 src/sys/arch/sparc64/include/db_machdep.h:1.35
--- src/sys/arch/sparc64/include/db_machdep.h:1.34 Fri Oct 30 22:36:17 2015
+++ src/sys/arch/sparc64/include/db_machdep.h Sun Nov 5 22:47:48 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.34 2015/10/31 02:36:17 nakayama Exp $ */
+/* $NetBSD: db_machdep.h,v 1.35 2017/11/06 03:47:48 christos Exp $ */
/*
* Mach Operating System
@@ -134,11 +134,6 @@ int kdb_trap(int, struct trapframe64 *);
* We use elf symbols in DDB.
*/
#define DB_ELF_SYMBOLS
-#ifdef __arch64__
-#define DB_ELFSIZE 64
-#else
-#define DB_ELFSIZE 32
-#endif
/*
* KGDB definitions
Index: src/sys/arch/sparc64/include/elf_machdep.h
diff -u src/sys/arch/sparc64/include/elf_machdep.h:1.13 src/sys/arch/sparc64/include/elf_machdep.h:1.14
--- src/sys/arch/sparc64/include/elf_machdep.h:1.13 Sat Aug 12 05:03:28 2017
+++ src/sys/arch/sparc64/include/elf_machdep.h Sun Nov 5 22:47:48 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: elf_machdep.h,v 1.13 2017/08/12 09:03:28 joerg Exp $ */
+/* $NetBSD: elf_machdep.h,v 1.14 2017/11/06 03:47:48 christos Exp $ */
#define ELF32_MACHDEP_ENDIANNESS ELFDATA2MSB
#define ELF32_MACHDEP_ID_CASES \
@@ -15,8 +15,10 @@
#define ELF64_MACHDEP_ID EM_SPARCV9
#ifdef __arch64__
+#define KERN_ELFSIZE 64
#define ARCH_ELFSIZE 64 /* MD native binary size */
#else
+#define KERN_ELFSIZE 32
#define ARCH_ELFSIZE 32 /* MD native binary size */
#endif
Index: src/sys/arch/sun2/include/db_machdep.h
diff -u src/sys/arch/sun2/include/db_machdep.h:1.7 src/sys/arch/sun2/include/db_machdep.h:1.8
--- src/sys/arch/sun2/include/db_machdep.h:1.7 Sun Dec 11 07:19:16 2005
+++ src/sys/arch/sun2/include/db_machdep.h Sun Nov 5 22:47:48 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.7 2005/12/11 12:19:16 christos Exp $ */
+/* $NetBSD: db_machdep.h,v 1.8 2017/11/06 03:47:48 christos Exp $ */
/*
* Mach Operating System
@@ -35,7 +35,6 @@
#include <m68k/db_machdep.h>
#define DB_ELF_SYMBOLS
-#define DB_ELFSIZE 32
/* This enables some code in db_command.c */
#define DB_MACHINE_COMMANDS
Index: src/sys/arch/sun3/include/db_machdep.h
diff -u src/sys/arch/sun3/include/db_machdep.h:1.18 src/sys/arch/sun3/include/db_machdep.h:1.19
--- src/sys/arch/sun3/include/db_machdep.h:1.18 Thu Feb 2 11:06:48 2012
+++ src/sys/arch/sun3/include/db_machdep.h Sun Nov 5 22:47:48 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.18 2012/02/02 16:06:48 tsutsui Exp $ */
+/* $NetBSD: db_machdep.h,v 1.19 2017/11/06 03:47:48 christos Exp $ */
/*
* Mach Operating System
@@ -35,7 +35,6 @@
#include <m68k/db_machdep.h>
#define DB_ELF_SYMBOLS
-#define DB_ELFSIZE 32
/* This enables some code in db_command.c */
/* XXX: disable db_machdep.c for crash(8) */
Index: src/sys/arch/vax/include/db_machdep.h
diff -u src/sys/arch/vax/include/db_machdep.h:1.19 src/sys/arch/vax/include/db_machdep.h:1.20
--- src/sys/arch/vax/include/db_machdep.h:1.19 Sat Jul 2 22:18:20 2011
+++ src/sys/arch/vax/include/db_machdep.h Sun Nov 5 22:47:48 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.19 2011/07/03 02:18:20 matt Exp $ */
+/* $NetBSD: db_machdep.h,v 1.20 2017/11/06 03:47:48 christos Exp $ */
/*
* Mach Operating System
@@ -82,6 +82,5 @@ void kdb_trap(struct trapframe *);
* We use a.out symbols in DDB (unless we are ELF then we use ELF symbols).
*/
#define DB_ELF_SYMBOLS
-#define DB_ELFSIZE 32
#endif /* _VAX_DB_MACHDEP_H_ */
Index: src/sys/arch/vax/include/elf_machdep.h
diff -u src/sys/arch/vax/include/elf_machdep.h:1.5 src/sys/arch/vax/include/elf_machdep.h:1.6
--- src/sys/arch/vax/include/elf_machdep.h:1.5 Sun Dec 9 18:05:59 2001
+++ src/sys/arch/vax/include/elf_machdep.h Sun Nov 5 22:47:48 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: elf_machdep.h,v 1.5 2001/12/09 23:05:59 thorpej Exp $ */
+/* $NetBSD: elf_machdep.h,v 1.6 2017/11/06 03:47:48 christos Exp $ */
#define ELF32_MACHDEP_ENDIANNESS ELFDATA2LSB
#define ELF32_MACHDEP_ID_CASES \
@@ -11,6 +11,7 @@
#define ELF32_MACHDEP_ID EM_VAX
+#define KERN_ELFSIZE 32
#define ARCH_ELFSIZE 32 /* MD native binary size */
/* VAX relocations */
Index: src/sys/arch/x68k/include/db_machdep.h
diff -u src/sys/arch/x68k/include/db_machdep.h:1.2 src/sys/arch/x68k/include/db_machdep.h:1.3
--- src/sys/arch/x68k/include/db_machdep.h:1.2 Wed Dec 5 23:13:12 2001
+++ src/sys/arch/x68k/include/db_machdep.h Sun Nov 5 22:47:48 2017
@@ -1,7 +1,6 @@
-/* $NetBSD: db_machdep.h,v 1.2 2001/12/06 04:13:12 minoura Exp $ */
+/* $NetBSD: db_machdep.h,v 1.3 2017/11/06 03:47:48 christos Exp $ */
/* Just use the common m68k definition */
#include <m68k/db_machdep.h>
#define DB_ELF_SYMBOLS
-#define DB_ELFSIZE 32
Index: src/sys/arch/zaurus/include/db_machdep.h
diff -u src/sys/arch/zaurus/include/db_machdep.h:1.1 src/sys/arch/zaurus/include/db_machdep.h:1.2
--- src/sys/arch/zaurus/include/db_machdep.h:1.1 Sat Dec 16 00:43:53 2006
+++ src/sys/arch/zaurus/include/db_machdep.h Sun Nov 5 22:47:49 2017
@@ -1,7 +1,6 @@
-/* $NetBSD: db_machdep.h,v 1.1 2006/12/16 05:43:53 ober Exp $ */
+/* $NetBSD: db_machdep.h,v 1.2 2017/11/06 03:47:49 christos Exp $ */
#include <arm/db_machdep.h>
/* zaurus uses ELF for kernel */
#define DB_ELF_SYMBOLS
-#define DB_ELFSIZE 32
