diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2001-05-02 23:56:21 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2001-05-02 23:56:21 +0000 |
| commit | 5e6220d9d0ed9bc47d825655629563debeb4c790 (patch) | |
| tree | ea44581323d4d5406c62189361371b4f8e3c1db4 /usr.sbin/crunch | |
| parent | 1eb55ff65dd85e929f20bc5c4f11d71d76096b92 (diff) | |
| download | src-5e6220d9d0ed9bc47d825655629563debeb4c790.tar.gz src-5e6220d9d0ed9bc47d825655629563debeb4c790.zip | |
* include/elf.h has been repo copied to include/elf-hints.h, and it no
longer includes machine/elf.h.
* consumers of elf.h now use the minimalist elf header possible.
This change is motivated by Binutils 2.11.0 and too much clashing over
our base elf headers and the Binutils elf headers.
Notes
Notes:
svn path=/head/; revision=76224
Diffstat (limited to 'usr.sbin/crunch')
| -rw-r--r-- | usr.sbin/crunch/crunchide/exec_elf32.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.sbin/crunch/crunchide/exec_elf32.c b/usr.sbin/crunch/crunchide/exec_elf32.c index 45883f437e2e..00874084180b 100644 --- a/usr.sbin/crunch/crunchide/exec_elf32.c +++ b/usr.sbin/crunch/crunchide/exec_elf32.c @@ -1,5 +1,3 @@ -/* $NetBSD: exec_elf32.c,v 1.4 1997/08/12 06:07:24 mikel Exp $ */ - /* * Copyright (c) 1997 Christopher G. Demetriou. All rights reserved. * @@ -32,8 +30,12 @@ #include <sys/cdefs.h> #ifndef lint +#if 0 __RCSID("$NetBSD: exec_elf32.c,v 1.4 1997/08/12 06:07:24 mikel Exp $"); #endif +static const char rcsid[] = + "$FreeBSD$"; +#endif #ifndef ELFSIZE #define ELFSIZE 32 @@ -53,7 +55,7 @@ __RCSID("$NetBSD: exec_elf32.c,v 1.4 1997/08/12 06:07:24 mikel Exp $"); #if (defined(NLIST_ELF32) && (ELFSIZE == 32)) || \ (defined(NLIST_ELF64) && (ELFSIZE == 64)) -#include <elf.h> +#include <machine/elf.h> #define CONCAT(x,y) __CONCAT(x,y) #define ELFNAME(x) CONCAT(elf,CONCAT(ELFSIZE,CONCAT(_,x))) |