summaryrefslogtreecommitdiffstats
path: root/usr.sbin/crunch/crunchide
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2001-05-02 23:56:21 +0000
committerobrien <obrien@FreeBSD.org>2001-05-02 23:56:21 +0000
commit538e761e025ee84b3b100b7c0eabceaa5b550b49 (patch)
tree212c800046bcfdedaa0f36777e0d9479206e0c43 /usr.sbin/crunch/crunchide
parentd917f606f3edba70f558ca5105b6d31f1d87c910 (diff)
downloadFreeBSD-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/crunch/crunchide')
-rw-r--r--usr.sbin/crunch/crunchide/exec_elf32.c8
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 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)))
OpenPOWER on IntegriCloud