diff options
| author | Renato Botelho <renato@netgate.com> | 2016-03-07 11:03:11 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-03-07 11:03:11 -0300 |
| commit | 81ca6de1be9c20d444d1a292655e4732a9c76539 (patch) | |
| tree | f3d51afe9a1f2b88dea2c5e10289db1f3f2ed5d1 /sys/boot/common/load_elf_obj.c | |
| parent | 124a553c4366e5f98bf66430356250b0db8eb135 (diff) | |
| parent | 81dfa2bb6c9e62b96e6586a82c13db809c03fd20 (diff) | |
| download | FreeBSD-src-81ca6de1be9c20d444d1a292655e4732a9c76539.zip FreeBSD-src-81ca6de1be9c20d444d1a292655e4732a9c76539.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/boot/common/load_elf_obj.c')
| -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; |
