diff options
| author | obrien <obrien@FreeBSD.org> | 2001-05-02 23:56:21 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2001-05-02 23:56:21 +0000 |
| commit | 538e761e025ee84b3b100b7c0eabceaa5b550b49 (patch) | |
| tree | 212c800046bcfdedaa0f36777e0d9479206e0c43 /usr.sbin | |
| parent | d917f606f3edba70f558ca5105b6d31f1d87c910 (diff) | |
| download | FreeBSD-src-538e761e025ee84b3b100b7c0eabceaa5b550b49.zip FreeBSD-src-538e761e025ee84b3b100b7c0eabceaa5b550b49.tar.gz | |
* 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.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/crunch/crunchide/exec_elf32.c | 8 | ||||
| -rw-r--r-- | usr.sbin/kgzip/elfhdr.h | 3 | ||||
| -rw-r--r-- | usr.sbin/kgzip/kgzcmp.c | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/usr.sbin/crunch/crunchide/exec_elf32.c b/usr.sbin/crunch/crunchide/exec_elf32.c index 45883f4..0087408 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))) diff --git a/usr.sbin/kgzip/elfhdr.h b/usr.sbin/kgzip/elfhdr.h index b14b9f1..f689119 100644 --- a/usr.sbin/kgzip/elfhdr.h +++ b/usr.sbin/kgzip/elfhdr.h @@ -26,7 +26,8 @@ * $FreeBSD$ */ -#include <elf.h> +#include <sys/types.h> +#include <machine/elf.h> #include "kgz.h" /* Section header indices */ diff --git a/usr.sbin/kgzip/kgzcmp.c b/usr.sbin/kgzip/kgzcmp.c index 09086ad..b692315 100644 --- a/usr.sbin/kgzip/kgzcmp.c +++ b/usr.sbin/kgzip/kgzcmp.c @@ -29,6 +29,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/wait.h> +#include <machine/elf.h> #include <err.h> #include <fcntl.h> @@ -37,7 +38,6 @@ #include <unistd.h> #include <a.out.h> -#include <elf.h> #include "aouthdr.h" #include "elfhdr.h" |
