[src/trunk]: src Remove ELFNAME macros which are already defines in exec_elf.h

[erh <erh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2ba453c12761
branches:  trunk
changeset: 477569:2ba453c12761
user:      erh <erh%NetBSD.org@localhost>
date:      Thu Oct 21 21:17:08 1999 +0000

description:
Remove ELFNAME macros which are already defines in exec_elf.h

diffstat:

 sys/ddb/db_elf.c                 |   7 ++-----
 usr.sbin/kvm_mkdb/nlist_elf32.c  |  10 ++--------
 usr.sbin/mdsetimage/exec_elf32.c |  10 ++--------
 3 files changed, 6 insertions(+), 21 deletions(-)

diffs (90 lines):

diff -r 6465d5712eef -r 2ba453c12761 sys/ddb/db_elf.c
--- a/sys/ddb/db_elf.c  Thu Oct 21 21:16:07 1999 +0000
+++ b/sys/ddb/db_elf.c  Thu Oct 21 21:17:08 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: db_elf.c,v 1.8 1999/01/08 18:10:35 augustss Exp $      */
+/*     $NetBSD: db_elf.c,v 1.9 1999/10/21 21:19:57 erh Exp $   */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -58,9 +58,6 @@
 
 #include <sys/exec_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))
@@ -139,7 +136,7 @@
 
        switch (elf->e_machine) {
 
-       ELFDEFNAME(MACHDEP_ID_CASES)
+       ELFDEFNNAME(MACHDEP_ID_CASES)
 
        default:
                goto badheader;
diff -r 6465d5712eef -r 2ba453c12761 usr.sbin/kvm_mkdb/nlist_elf32.c
--- a/usr.sbin/kvm_mkdb/nlist_elf32.c   Thu Oct 21 21:16:07 1999 +0000
+++ b/usr.sbin/kvm_mkdb/nlist_elf32.c   Thu Oct 21 21:17:08 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nlist_elf32.c,v 1.6 1997/12/15 04:21:34 mrg Exp $      */
+/*     $NetBSD: nlist_elf32.c,v 1.7 1999/10/21 21:17:08 erh Exp $      */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: nlist_elf32.c,v 1.6 1997/12/15 04:21:34 mrg Exp $");
+__RCSID("$NetBSD: nlist_elf32.c,v 1.7 1999/10/21 21:17:08 erh Exp $");
 #endif /* not lint */
 
 /* If not included by nlist_elf64.c, ELFSIZE won't be defined. */
@@ -65,12 +65,6 @@
 #if (defined(NLIST_ELF32) && (ELFSIZE == 32)) || \
     (defined(NLIST_ELF64) && (ELFSIZE == 64))
 
-#define CONCAT(x,y)     __CONCAT(x,y)
-#define ELFNAME(x)      CONCAT(elf,CONCAT(ELFSIZE,CONCAT(_,x)))
-#define ELFNAME2(x,y)   CONCAT(x,CONCAT(_elf,CONCAT(ELFSIZE,CONCAT(_,y))))
-#define ELFNAMEEND(x)   CONCAT(x,CONCAT(_elf,ELFSIZE))
-#define ELFDEFNNAME(x)  CONCAT(ELF,CONCAT(ELFSIZE,CONCAT(_,x)))
-
 typedef struct nlist NLIST;
 #define        _strx   n_un.n_strx
 #define        _name   n_un.n_name
diff -r 6465d5712eef -r 2ba453c12761 usr.sbin/mdsetimage/exec_elf32.c
--- a/usr.sbin/mdsetimage/exec_elf32.c  Thu Oct 21 21:16:07 1999 +0000
+++ b/usr.sbin/mdsetimage/exec_elf32.c  Thu Oct 21 21:17:08 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: exec_elf32.c,v 1.2 1997/10/17 10:28:30 lukem Exp $     */
+/*     $NetBSD: exec_elf32.c,v 1.3 1999/10/21 21:18:02 erh Exp $       */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: exec_elf32.c,v 1.2 1997/10/17 10:28:30 lukem Exp $");
+__RCSID("$NetBSD: exec_elf32.c,v 1.3 1999/10/21 21:18:02 erh Exp $");
 #endif /* not lint */
 
 #ifndef ELFSIZE
@@ -51,12 +51,6 @@
 #if (defined(NLIST_ELF32) && (ELFSIZE == 32)) || \
     (defined(NLIST_ELF64) && (ELFSIZE == 64))
 
-#define        CONCAT(x,y)     __CONCAT(x,y)
-#define        ELFNAME(x)      CONCAT(elf,CONCAT(ELFSIZE,CONCAT(_,x)))
-#define        ELFNAME2(x,y)   CONCAT(x,CONCAT(_elf,CONCAT(ELFSIZE,CONCAT(_,y))))
-#define        ELFNAMEEND(x)   CONCAT(x,CONCAT(_elf,ELFSIZE))
-#define        ELFDEFNNAME(x)  CONCAT(ELF,CONCAT(ELFSIZE,CONCAT(_,x)))
-
 #define        check(off, size)        ((off < 0) || (off + size > mappedsize))
 #define        BAD                     do { rv = -1; goto out; } while (0)