| Message ID | f970f7938109c40833fc45e3d6d72b1dcdf14595.1477627895.git.panand@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 10/27/2016 09:16 PM, Pratyush Anand wrote: > gcc version in fedora koji is 6.2.1-2.fc25. kexec-tools compiled with this > gcc produced another relocation error: > > machine_apply_elf_rel: ERROR Unknown type: 261 > > This patch fixes the above error. Looks good. Simon, please apply. Reviewed-by: Geoff Levand <geoff@infradead.org>
On Fri, Oct 28, 2016 at 11:43:48AM -0700, Geoff Levand wrote: > On 10/27/2016 09:16 PM, Pratyush Anand wrote: > > gcc version in fedora koji is 6.2.1-2.fc25. kexec-tools compiled with this > > gcc produced another relocation error: > > > > machine_apply_elf_rel: ERROR Unknown type: 261 > > > > This patch fixes the above error. > > Looks good. Simon, please apply. > > Reviewed-by: Geoff Levand <geoff@infradead.org> Thanks, applied.
diff --git a/kexec/arch/arm64/kexec-arm64.c b/kexec/arch/arm64/kexec-arm64.c index 218f0bc832cd..eb0c3b87354e 100644 --- a/kexec/arch/arm64/kexec-arm64.c +++ b/kexec/arch/arm64/kexec-arm64.c @@ -720,6 +720,10 @@ void machine_apply_elf_rel(struct mem_ehdr *ehdr, struct mem_sym *UNUSED(sym), # define R_AARCH64_ABS64 257 #endif +#if !defined(R_AARCH64_PREL32) +# define R_AARCH64_PREL32 261 +#endif + #if !defined(R_AARCH64_LD_PREL_LO19) # define R_AARCH64_LD_PREL_LO19 273 #endif @@ -761,6 +765,12 @@ void machine_apply_elf_rel(struct mem_ehdr *ehdr, struct mem_sym *UNUSED(sym), loc64 = ptr; *loc64 = cpu_to_elf64(ehdr, elf64_to_cpu(ehdr, *loc64) + value); break; + case R_AARCH64_PREL32: + type = "PREL32"; + loc32 = ptr; + *loc32 = cpu_to_elf32(ehdr, + elf32_to_cpu(ehdr, *loc32) + value - address); + break; case R_AARCH64_LD_PREL_LO19: type = "LD_PREL_LO19"; loc32 = ptr;
gcc version in fedora koji is 6.2.1-2.fc25. kexec-tools compiled with this gcc produced another relocation error: machine_apply_elf_rel: ERROR Unknown type: 261 This patch fixes the above error. Signed-off-by: Pratyush Anand <panand@redhat.com> --- v1 -> v2: fixed line width to less than 80 chars kexec/arch/arm64/kexec-arm64.c | 10 ++++++++++ 1 file changed, 10 insertions(+)