Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove ELFNAME defines since they are defined in sys/exec_elf.h

This commit is contained in:
erh 1999-11-04 02:00:17 +00:00
parent 97bbad1f0b
commit 6752f572d8
6 changed files with 9 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/libc/gen/nlist_elf32.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nlist_elf32.c,v 1.18 1999/10/25 13:57:11 kleink Exp $ */
/* $NetBSD: nlist_elf32.c,v 1.19 1999/11/04 02:00:17 erh Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@ -56,12 +56,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)))
/* No need to check for off < 0 because it is unsigned */
#define check(off, size) (off + size > mappedsize)
#define BAD goto out

8
libexec/ld.elf_so/map_object.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: map_object.c,v 1.8 1999/10/25 13:57:12 kleink Exp $ */
/* $NetBSD: map_object.c,v 1.9 1999/11/04 02:00:18 erh Exp $ */
/*
* Copyright 1996 John D. Polstra.
@ -40,12 +40,6 @@
#include "rtld.h"
#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)))
static int protflags __P((int)); /* Elf flags -> mmap protection */
/*

8
libexec/ld.elf_so/search.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: search.c,v 1.8 1999/10/25 13:57:12 kleink Exp $ */
/* $NetBSD: search.c,v 1.9 1999/11/04 02:00:18 erh Exp $ */
/*
* Copyright 1996 Matt Thomas <matt@3am-software.com>
@ -52,12 +52,6 @@
#include "debug.h"
#include "rtld.h"
#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)))
/*
* Data declarations.
*/

10
usr.bin/crunch/crunchide/exec_elf32.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: exec_elf32.c,v 1.9 1999/10/25 13:57:11 kleink Exp $ */
/* $NetBSD: exec_elf32.c,v 1.10 1999/11/04 02:00:18 erh Exp $ */
/*
* Copyright (c) 1997, 1998 Christopher G. Demetriou. All rights reserved.
@ -32,7 +32,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: exec_elf32.c,v 1.9 1999/10/25 13:57:11 kleink Exp $");
__RCSID("$NetBSD: exec_elf32.c,v 1.10 1999/11/04 02:00:18 erh Exp $");
#endif
#ifndef ELFSIZE
@ -55,12 +55,6 @@ __RCSID("$NetBSD: exec_elf32.c,v 1.9 1999/10/25 13:57:11 kleink Exp $");
#include <sys/exec_elf.h>
#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)))
struct listelem {
struct listelem *next;
void *mem;

10
usr.sbin/kvm_mkdb/nlist_elf32.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nlist_elf32.c,v 1.9 1999/10/25 13:57:12 kleink Exp $ */
/* $NetBSD: nlist_elf32.c,v 1.10 1999/11/04 02:00:18 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.9 1999/10/25 13:57:12 kleink Exp $");
__RCSID("$NetBSD: nlist_elf32.c,v 1.10 1999/11/04 02:00:18 erh Exp $");
#endif /* not lint */
/* If not included by nlist_elf64.c, ELFSIZE won't be defined. */
@ -65,12 +65,6 @@ __RCSID("$NetBSD: nlist_elf32.c,v 1.9 1999/10/25 13:57:12 kleink Exp $");
#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

10
usr.sbin/mdsetimage/exec_elf32.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: exec_elf32.c,v 1.5 1999/10/25 13:57:12 kleink Exp $ */
/* $NetBSD: exec_elf32.c,v 1.6 1999/11/04 02:00:19 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.5 1999/10/25 13:57:12 kleink Exp $");
__RCSID("$NetBSD: exec_elf32.c,v 1.6 1999/11/04 02:00:19 erh Exp $");
#endif /* not lint */
#ifndef ELFSIZE
@ -51,12 +51,6 @@ __RCSID("$NetBSD: exec_elf32.c,v 1.5 1999/10/25 13:57:12 kleink Exp $");
#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)