summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordfr <dfr@FreeBSD.org>1998-08-17 08:06:31 +0000
committerdfr <dfr@FreeBSD.org>1998-08-17 08:06:31 +0000
commit988c605cbcc44f6e0046b6f8beb62454e7119c3f (patch)
tree775f1d1d09d457dbf8c9ec51be1967b70c3cb8ed
parente6912eb9df97521a891e8dde4d1c7778a5eef448 (diff)
downloadFreeBSD-src-988c605cbcc44f6e0046b6f8beb62454e7119c3f.zip
FreeBSD-src-988c605cbcc44f6e0046b6f8beb62454e7119c3f.tar.gz
Update to work with the new elf headers.
-rw-r--r--sys/ddb/db_elf.c19
1 files changed, 2 insertions, 17 deletions
diff --git a/sys/ddb/db_elf.c b/sys/ddb/db_elf.c
index a67cbfd..12d216f 100644
--- a/sys/ddb/db_elf.c
+++ b/sys/ddb/db_elf.c
@@ -1,4 +1,4 @@
-/* $Id: db_elf.c,v 1.1 1998/06/28 00:57:27 dfr Exp $ */
+/* $Id: db_elf.c,v 1.2 1998/06/28 00:59:26 dfr Exp $ */
/* $NetBSD: db_elf.c,v 1.4 1998/05/03 18:49:54 thorpej Exp $ */
/*-
@@ -60,9 +60,6 @@
#include <machine/elf.h>
-#define CONCAT(x,y) __CONCAT(x,y)
-#define ELFDEFNAME(x) CONCAT(Elf,CONCAT(ELFSIZE,CONCAT(_,x)))
-
static char *db_elf_find_strtab __P((db_symtab_t *));
#define STAB_TO_SYMSTART(stab) ((Elf_Sym *)((stab)->start))
@@ -70,18 +67,6 @@ static char *db_elf_find_strtab __P((db_symtab_t *));
#define STAB_TO_EHDR(stab) ((Elf_Ehdr *)((stab)->private))
#define STAB_TO_SHDR(stab, e) ((Elf_Shdr *)((stab)->private + (e)->e_shoff))
-#define Elf_Ehdr ELFDEFNAME(Ehdr)
-#define Elf_Shdr ELFDEFNAME(Shdr)
-#define Elf_Sym ELFDEFNAME(Sym)
-
-#if ELFSIZE == 64
-#define ELF_ST_TYPE(x) ELF64_ST_TYPE(x)
-#define ELF_ST_BIND(x) ELF64_ST_BIND(x)
-#else
-#define ELF_ST_TYPE(x) ELF32_ST_TYPE(x)
-#define ELF_ST_BIND(x) ELF32_ST_BIND(x)
-#endif
-
void X_db_sym_init(void *symtab, void *esymtab, char *name);
/*
@@ -392,7 +377,7 @@ X_db_sym_numargs(symtab, cursym, nargp, argnamep)
extern void *ksym_start, *ksym_end;
void
-kdb_init()
+kdb_init(void)
{
if (ksym_end > ksym_start)
OpenPOWER on IntegriCloud