diff options
| author | Renato Botelho <renato@netgate.com> | 2016-03-09 08:41:15 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-03-09 08:41:15 -0300 |
| commit | 22a5a00c6b7b2d9cc56c40859d6fb4fc5a50df4f (patch) | |
| tree | 94a7306181396550b163b02e952c6e6a3e007391 /sys/boot | |
| parent | 2cb9037172ce155f30b73a0605c0a9f0ec20ad24 (diff) | |
| parent | 9f6c0beb36d11aa18540a6697d10617db187affc (diff) | |
| download | FreeBSD-src-22a5a00c6b7b2d9cc56c40859d6fb4fc5a50df4f.zip FreeBSD-src-22a5a00c6b7b2d9cc56c40859d6fb4fc5a50df4f.tar.gz | |
Merge remote-tracking branch 'origin/releng/10.3' into RELENG_2_3
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/common/load_elf_obj.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sys/boot/common/load_elf_obj.c b/sys/boot/common/load_elf_obj.c index 626f2d9..b983ecb 100644 --- a/sys/boot/common/load_elf_obj.c +++ b/sys/boot/common/load_elf_obj.c @@ -221,6 +221,9 @@ __elfN(obj_loadimage)(struct preloaded_file *fp, elf_file_t ef, u_int64_t off) switch (shdr[i].sh_type) { case SHT_PROGBITS: case SHT_NOBITS: +#if defined(__i386__) || defined(__amd64__) + case SHT_AMD64_UNWIND: +#endif lastaddr = roundup(lastaddr, shdr[i].sh_addralign); shdr[i].sh_addr = (Elf_Addr)lastaddr; lastaddr += shdr[i].sh_size; |
