From 859d79870d7975ef8d98ea728ee52a264efe7d1e Mon Sep 17 00:00:00 2001 From: Cary Coutant Date: Mon, 9 Nov 2015 08:43:46 -0800 Subject: Remove unnecessary target dependencies on relocation format. 2015-11-09 Cary Coutant Vladimir Radosavljevic gold/ * copy-relocs.h (Copy_relocs::copy_reloc): Replace reloc parameter with type, offset, addend. (Copy_relocs::save): Likewise. * copy-relocs.cc (Copy_relocs::copy_reloc): Likewise. (Copy_relocs::save): Likewise. * aarch64.cc (Target_aarch64::copy_reloc): Pass r_type, r_offset, and r_addend to Copy_relocs::copy_reloc. * arm.cc (Target_arm::copy_reloc): Likewise. * i386.cc (Target_i386::copy_reloc): Likewise. * mips.cc (Target_mips::copy_reloc): Likewise. * powerpc.cc (Target_powerpc::copy_reloc): Likewise. * s390.cc (Target_s390::copy_reloc): Likewise. * sparc.cc (Target_sparc::copy_reloc): Likewise. * tilegx.cc (Target_tilegx::copy_reloc): Likewise. * x86_64.cc (Target_x86_64::copy_reloc): Likewise. --- gold/s390.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gold/s390.cc') diff --git a/gold/s390.cc b/gold/s390.cc index 020fb15..e329703 100644 --- a/gold/s390.cc +++ b/gold/s390.cc @@ -681,10 +681,13 @@ class Target_s390 : public Sized_target unsigned int shndx, Output_section* output_section, Symbol* sym, const elfcpp::Rela& reloc) { + unsigned int r_type = elfcpp::elf_r_type(reloc.get_r_info()); this->copy_relocs_.copy_reloc(symtab, layout, symtab->get_sized_symbol(sym), object, shndx, output_section, - reloc, this->rela_dyn_section(layout)); + r_type, reloc.get_r_offset(), + reloc.get_r_addend(), + this->rela_dyn_section(layout)); } // Information about this specific target which we pass to the -- cgit v1.1