diff options
| author | dfr <dfr@FreeBSD.org> | 2011-06-30 16:08:56 +0000 |
|---|---|---|
| committer | dfr <dfr@FreeBSD.org> | 2011-06-30 16:08:56 +0000 |
| commit | 2b9b009195e403f0f2fc9bf0d9eeefc2297d94b8 (patch) | |
| tree | a32b66abbdbc4e1ab303ad37461df4652cb74043 /sys/boot/common/load_elf.c | |
| parent | 4d4c5b3285343962855e4ac2e891fc6711595b64 (diff) | |
| download | FreeBSD-src-2b9b009195e403f0f2fc9bf0d9eeefc2297d94b8.zip FreeBSD-src-2b9b009195e403f0f2fc9bf0d9eeefc2297d94b8.tar.gz | |
Add a version of the FreeBSD bootloader which can run in userland, packaged
as a shared library. This is intended to be used by BHyVe to load FreeBSD
kernels into new virtual machines.
Diffstat (limited to 'sys/boot/common/load_elf.c')
| -rw-r--r-- | sys/boot/common/load_elf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/boot/common/load_elf.c b/sys/boot/common/load_elf.c index ee6389f..bf095bb 100644 --- a/sys/boot/common/load_elf.c +++ b/sys/boot/common/load_elf.c @@ -260,7 +260,7 @@ __elfN(loadimage)(struct preloaded_file *fp, elf_file_t ef, u_int64_t off) firstaddr = lastaddr = 0; ehdr = ef->ehdr; if (ef->kernel) { -#ifdef __i386__ +#if defined(__i386__) || defined(__amd64__) #if __ELF_WORD_SIZE == 64 off = - (off & 0xffffffffff000000ull);/* x86_64 relocates after locore */ #else |
