diff options
| author | kib <kib@FreeBSD.org> | 2013-02-20 17:39:52 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2013-02-20 17:39:52 +0000 |
| commit | cda69c96226e8d1ab1647199344302d2d5f4cf02 (patch) | |
| tree | e11ca597288ba6690ebab08a041053e2d8a5a6e8 /sys/boot | |
| parent | d04ffbb5a5cb5fa49847b87fbff94d4c6be4bfe9 (diff) | |
| download | FreeBSD-src-cda69c96226e8d1ab1647199344302d2d5f4cf02.zip FreeBSD-src-cda69c96226e8d1ab1647199344302d2d5f4cf02.tar.gz | |
Convert machine/elf.h, machine/frame.h, machine/sigframe.h,
machine/signal.h and machine/ucontext.h into common x86 includes,
copying from amd64 and merging with i386.
Kernel-only compat definitions are kept in the i386/include/sigframe.h
and i386/include/signal.h, to reduce amd64 kernel namespace pollution.
The amd64 compat uses its own definitions so far.
The _MACHINE_ELF_WANT_32BIT definition is to allow the
sys/boot/userboot/userboot/elf32_freebsd.c to use i386 ELF definitions
on the amd64 compile host. The same hack could be usefully abused by
other code too.
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/userboot/userboot/elf32_freebsd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sys/boot/userboot/userboot/elf32_freebsd.c b/sys/boot/userboot/userboot/elf32_freebsd.c index 8489385..bb5b693 100644 --- a/sys/boot/userboot/userboot/elf32_freebsd.c +++ b/sys/boot/userboot/userboot/elf32_freebsd.c @@ -31,6 +31,7 @@ __FBSDID("$FreeBSD$"); #include <sys/exec.h> #include <sys/linker.h> #include <string.h> +#define _MACHINE_ELF_WANT_32BIT #include <i386/include/bootinfo.h> #include <i386/include/elf.h> #include <stand.h> |
