Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

Support objcopy --remove-section=.relaFOO

Browse Source 
* objcopy.c (handle_remove_section_option): Don't require a dot
	after .rela and .rel to handle a possible relocation section.
	* testsuite/binutils-all/remove-relocs-07.s,
	* testsuite/binutils-all/remove-relocs-07.d,
	* testsuite/binutils-all/remove-relocs-08.d: New tests.
	* testsuite/binutils-all/remove-relocs-01.d,
	* testsuite/binutils-all/remove-relocs-04.d,
	* testsuite/binutils-all/remove-relocs-05.d,
	* testsuite/binutils-all/remove-relocs-06.d: Exclude mips64-openbsd.
This commit is contained in:
Alan Modra
2018-09-12 14:57:48 +09:30
parent a4b9568c7e
commit c12d9fa2af
9 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
binutils/ChangeLog
View File

@@ -1,3 +1,15 @@
2018-09-17 Alan Modra <amodra@gmail.com>
* objcopy.c (handle_remove_section_option): Don't require a dot
after .rela and .rel to handle a possible relocation section.
* testsuite/binutils-all/remove-relocs-07.s,
* testsuite/binutils-all/remove-relocs-07.d,
* testsuite/binutils-all/remove-relocs-08.d: New tests.
* testsuite/binutils-all/remove-relocs-01.d,
* testsuite/binutils-all/remove-relocs-04.d,
* testsuite/binutils-all/remove-relocs-05.d,
* testsuite/binutils-all/remove-relocs-06.d: Exclude mips64-openbsd.
2018-09-17 Alan Modra <amodra@gmail.com> 2018-09-17 Alan Modra <amodra@gmail.com>
* testsuite/lib/binutils-common.exp (is_som_format): New proc. * testsuite/lib/binutils-common.exp (is_som_format): New proc.

15
binutils/objcopy.c
View File

@@ -3943,18 +3943,21 @@ discard_relocations (bfd *ibfd ATTRIBUTE_UNUSED, asection *isection)
/* Wrapper for dealing with --remove-section (-R) command line arguments. /* Wrapper for dealing with --remove-section (-R) command line arguments.
A special case is detected here, if the user asks to remove a relocation A special case is detected here, if the user asks to remove a relocation
section (one starting with ".rela." or ".rel.") then this removal must section (one starting with ".rela" or ".rel") then this removal must
be done using a different technique in a relocatable object. */ be done using a different technique in a relocatable object. */
static void static void
handle_remove_section_option (const char *section_pattern) handle_remove_section_option (const char *section_pattern)
{ {
if (strncmp (section_pattern, ".rela.", 6) == 0)
handle_remove_relocations_option (section_pattern + 5);
else if (strncmp (section_pattern, ".rel.", 5) == 0)
handle_remove_relocations_option (section_pattern + 4);
find_section_list (section_pattern, TRUE, SECTION_CONTEXT_REMOVE); find_section_list (section_pattern, TRUE, SECTION_CONTEXT_REMOVE);
if (strncmp (section_pattern, ".rel", 4) == 0)
{
section_pattern += 4;
if (*section_pattern == 'a')
section_pattern++;
if (*section_pattern)
handle_remove_relocations_option (section_pattern);
}
sections_removed = TRUE; sections_removed = TRUE;
} }

1
binutils/testsuite/binutils-all/remove-relocs-01.d
View File

@@ -2,6 +2,7 @@
#source: remove-relocs-01.s #source: remove-relocs-01.s
#objcopy: --remove-relocations=.data.relocs.01 #objcopy: --remove-relocations=.data.relocs.01
#readelf: -r #readelf: -r
#notarget: "mips64*-*-openbsd*"
Relocation section '\.rela?\.data\.relocs\.02' at offset 0x[0-9a-f]+ contains 3 entries: Relocation section '\.rela?\.data\.relocs\.02' at offset 0x[0-9a-f]+ contains 3 entries:
.* .*

1
binutils/testsuite/binutils-all/remove-relocs-04.d
View File

@@ -2,6 +2,7 @@
#source: remove-relocs-01.s #source: remove-relocs-01.s
#objcopy: --remove-relocations=.data.relocs.0\[12\] #objcopy: --remove-relocations=.data.relocs.0\[12\]
#readelf: -r #readelf: -r
#notarget: "mips64*-*-openbsd*"
Relocation section '\.rela?\.data\.relocs\.03' at offset 0x[0-9a-f]+ contains 3 entries: Relocation section '\.rela?\.data\.relocs\.03' at offset 0x[0-9a-f]+ contains 3 entries:
.* .*

1
binutils/testsuite/binutils-all/remove-relocs-05.d
View File

@@ -2,6 +2,7 @@
#source: remove-relocs-01.s #source: remove-relocs-01.s
#objcopy: --remove-section=.rela.data.relocs.01 --remove-section=.rel.data.relocs.01 #objcopy: --remove-section=.rela.data.relocs.01 --remove-section=.rel.data.relocs.01
#readelf: -r #readelf: -r
#notarget: "mips64*-*-openbsd*"
Relocation section '\.rela?\.data\.relocs\.02' at offset 0x[0-9a-f]+ contains 3 entries: Relocation section '\.rela?\.data\.relocs\.02' at offset 0x[0-9a-f]+ contains 3 entries:
.* .*

1
binutils/testsuite/binutils-all/remove-relocs-06.d
View File

@@ -2,6 +2,7 @@
#source: remove-relocs-01.s #source: remove-relocs-01.s
#objcopy: --remove-relocations=.data.relocs.* --remove-relocations=!.data.relocs.02 #objcopy: --remove-relocations=.data.relocs.* --remove-relocations=!.data.relocs.02
#readelf: -r #readelf: -r
#notarget: "mips64*-*-openbsd*"
Relocation section '\.rela?\.data\.relocs\.02' at offset 0x[0-9a-f]+ contains 3 entries: Relocation section '\.rela?\.data\.relocs\.02' at offset 0x[0-9a-f]+ contains 3 entries:
.* .*

6
binutils/testsuite/binutils-all/remove-relocs-07.d Normal file
View File

@@ -0,0 +1,6 @@
#PROG: objcopy
#source: remove-relocs-07.s
#objcopy: --remove-relocations=FOO
#readelf: -r
There are no relocations in this file\.

2
binutils/testsuite/binutils-all/remove-relocs-07.s Normal file
View File

@@ -0,0 +1,2 @@
.section "FOO","aw",%progbits
.dc.a x

6
binutils/testsuite/binutils-all/remove-relocs-08.d Normal file
View File

@@ -0,0 +1,6 @@
#PROG: objcopy
#source: remove-relocs-07.s
#objcopy: --remove-section=.relFOO --remove-section=.relaFOO
#readelf: -r
There are no relocations in this file\.