summaryrefslogtreecommitdiffstats
path: root/sys/boot/i386
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 /sys/boot/i386
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 'sys/boot/i386')
-rw-r--r--sys/boot/i386/boot2/boot2.c2
-rw-r--r--sys/boot/i386/gptboot/gptboot.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/boot/i386/boot2/boot2.c b/sys/boot/i386/boot2/boot2.c
index 67b9064..ef3f504 100644
--- a/sys/boot/i386/boot2/boot2.c
+++ b/sys/boot/i386/boot2/boot2.c
@@ -23,6 +23,7 @@
#include <sys/disklabel.h>
#include <sys/dirent.h>
#include <machine/bootinfo.h>
+#include <machine/elf.h>
#include <ufs/ffs/fs.h>
#include <ufs/ufs/dinode.h>
@@ -30,7 +31,6 @@
#include <stdarg.h>
#include <a.out.h>
-#include <elf.h>
#include <btxv86.h>
diff --git a/sys/boot/i386/gptboot/gptboot.c b/sys/boot/i386/gptboot/gptboot.c
index 67b9064..ef3f504 100644
--- a/sys/boot/i386/gptboot/gptboot.c
+++ b/sys/boot/i386/gptboot/gptboot.c
@@ -23,6 +23,7 @@
#include <sys/disklabel.h>
#include <sys/dirent.h>
#include <machine/bootinfo.h>
+#include <machine/elf.h>
#include <ufs/ffs/fs.h>
#include <ufs/ufs/dinode.h>
@@ -30,7 +31,6 @@
#include <stdarg.h>
#include <a.out.h>
-#include <elf.h>
#include <btxv86.h>
OpenPOWER on IntegriCloud