objcopy renaming section with explicit flags
This tidies SEC_RELOC handling in bfd, in the process fixing a bug with objcopy when renaming sections. bfd/ * reloc.c (_bfd_generic_set_reloc): Set/clear SEC_RELOC depending on reloc count. * elf64-sparc.c (elf64_sparc_set_reloc): Likewise. binutils/ * objcopy.c (copy_relocations_in_section): Remove now unnecessary clearing of SEC_RELOC. * testsuite/binutils-all/rename-section-01.d: New test. * testsuite/binutils-all/objcopy.exp: Run it. gas/ * write.c (size_seg): Remove unneccesary twiddle of SEC_RELOC. (write_relocs): Likewise. Always call bfd_set_reloc.
This commit is contained in:
+1
-6
@@ -4331,10 +4331,7 @@ copy_relocations_in_section (bfd *ibfd, sec_ptr isection, void *obfdarg)
|
||||
}
|
||||
|
||||
if (relsize == 0)
|
||||
{
|
||||
bfd_set_reloc (obfd, osection, NULL, 0);
|
||||
osection->flags &= ~SEC_RELOC;
|
||||
}
|
||||
bfd_set_reloc (obfd, osection, NULL, 0);
|
||||
else
|
||||
{
|
||||
if (isection->orelocation != NULL)
|
||||
@@ -4377,8 +4374,6 @@ copy_relocations_in_section (bfd *ibfd, sec_ptr isection, void *obfdarg)
|
||||
}
|
||||
|
||||
bfd_set_reloc (obfd, osection, relcount == 0 ? NULL : relpp, relcount);
|
||||
if (relcount == 0)
|
||||
osection->flags &= ~SEC_RELOC;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1448,3 +1448,5 @@ if { [istarget *-*-cygwin] || [istarget *-*-mingw*] } {
|
||||
if { ![is_xcoff_format] } {
|
||||
objcopy_test "pr25662" $src executable "" $ldflags
|
||||
}
|
||||
|
||||
run_dump_test "rename-section-01"
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
#PROG: objcopy
|
||||
#name: objcopy rename-section with flags - keep relocation
|
||||
#source: needed-by-reloc.s
|
||||
#objcopy: --rename-section .data=myrodata,contents,alloc,load,readonly
|
||||
#objdump: -r
|
||||
#notarget: alpha*-*-*vms* rx-*-elf [is_som_format] [is_aout_format]
|
||||
|
||||
.*: +file format .*
|
||||
|
||||
#...
|
||||
RELOCATION RECORDS FOR .*myrodata.*:
|
||||
OFFSET +TYPE +VALUE
|
||||
0+ .*
|
||||
#pass
|
||||
Reference in New Issue
Block a user