diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-01-04 12:10:24 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-01-04 12:10:24 +0000 |
| commit | 39356c1d4443c2428f28abe318c71c6ebb2ed256 (patch) | |
| tree | 7bfcb48a2cd800cb438d083fc93f6808d849266e /usr/src | |
| parent | c009bfad466702b7c3f2f59cb69eb07291895b75 (diff) | |
| parent | b8692e0c2f0c23ce751c0af9c1efb4391bfd00f2 (diff) | |
| download | illumos-joyent-release-20170105.tar.gz | |
[illumos-gate merge]release-20170105
commit bb8a2a6a74b7eec7d62e371f17d319edb81f8501
7699 build of localedef data files should be parallelized
commit dabb4d4fd2378abdd534ba701b0323ceacfdcfc2
7705 loader.efi bzipfs should use preprocessor guard
commit 066242363458fbf87291daff9454b6f2ac9ebd8b
7704 loader: Fix EFI self relocation code for rela architectures
commit 079d2996640860ff94d139e2c8cff6849c849af7
7276 zfs(1m) manpage could better describe space properties (remove extra line)
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/boot/sys/boot/common/self_reloc.c | 20 | ||||
| -rw-r--r-- | usr/src/boot/sys/boot/efi/loader/conf.c | 2 | ||||
| -rw-r--r-- | usr/src/man/man1m/zfs.1m | 1 |
3 files changed, 11 insertions, 12 deletions
diff --git a/usr/src/boot/sys/boot/common/self_reloc.c b/usr/src/boot/sys/boot/common/self_reloc.c index 3b27b17c76..f82006078f 100644 --- a/usr/src/boot/sys/boot/common/self_reloc.c +++ b/usr/src/boot/sys/boot/common/self_reloc.c @@ -25,13 +25,12 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <elf.h> #include <bootstrap.h> -#if defined(__aarch64__) +#if defined(__aarch64__) || defined(__amd64__) #define ElfW_Rel Elf64_Rela #define ElfW_Dyn Elf64_Dyn #define ELFW_R_TYPE ELF64_R_TYPE @@ -40,10 +39,6 @@ __FBSDID("$FreeBSD$"); #define ElfW_Rel Elf32_Rel #define ElfW_Dyn Elf32_Dyn #define ELFW_R_TYPE ELF32_R_TYPE -#elif defined(__amd64__) -#define ElfW_Rel Elf64_Rel -#define ElfW_Dyn Elf64_Dyn -#define ELFW_R_TYPE ELF64_R_TYPE #else #error architecture not supported #endif @@ -99,7 +94,9 @@ self_reloc(Elf_Addr baseaddr, ElfW_Dyn *dynamic) } /* - * Perform the actual relocation. + * Perform the actual relocation. We rely on the object having been + * linked at 0, so that the difference between the load and link + * address is the same as the load address. */ for (; relsz > 0; relsz -= relent) { switch (ELFW_R_TYPE(rel->r_info)) { @@ -108,12 +105,13 @@ self_reloc(Elf_Addr baseaddr, ElfW_Dyn *dynamic) break; case RELOC_TYPE_RELATIVE: - /* Address relative to the base address. */ newaddr = (Elf_Addr *)(rel->r_offset + baseaddr); - *newaddr += baseaddr; - /* Add the addend when the ABI uses them */ #ifdef ELF_RELA - *newaddr += rel->r_addend; + /* Addend relative to the base address. */ + *newaddr = baseaddr + rel->r_addend; +#else + /* Address relative to the base address. */ + *newaddr += baseaddr; #endif break; default: diff --git a/usr/src/boot/sys/boot/efi/loader/conf.c b/usr/src/boot/sys/boot/efi/loader/conf.c index 594b1809ce..1af649a022 100644 --- a/usr/src/boot/sys/boot/efi/loader/conf.c +++ b/usr/src/boot/sys/boot/efi/loader/conf.c @@ -55,7 +55,9 @@ struct fs_ops *file_system[] = { &dosfs_fsops, &tftp_fsops, &nfs_fsops, +#ifdef LOADER_BZIP2_SUPPORT &bzipfs_fsops, +#endif NULL }; diff --git a/usr/src/man/man1m/zfs.1m b/usr/src/man/man1m/zfs.1m index c0edc2e780..1c7dce2559 100644 --- a/usr/src/man/man1m/zfs.1m +++ b/usr/src/man/man1m/zfs.1m @@ -763,7 +763,6 @@ The amount of space .Sy referenced by this dataset, that was written since the previous snapshot .Pq i.e. that is not referenced by the previous snapshot . -space written to this dataset since the previous snapshot. .It Sy written Ns @ Ns Em snapshot The amount of .Sy referenced |