Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-12-28 18:10:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stop strip from merging notes when stripping debug or dwo information.

Browse Source 
* objcopy.c (strip_main): Do not enable note merging by default if
	just stripping debug or dwo information.
	* doc/binutils.texi (strip): Update documentation.
This commit is contained in:
Nick Clifton
2019-04-24 17:44:31 +01:00
parent 1903f1385b
commit 1b8dd64326
3 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
binutils/objcopy.c
View File

@@ -4410,8 +4410,7 @@ strip_main (int argc, char *argv[])
int c;
int i;
char *output_file = NULL;
merge_notes = TRUE;
bfd_boolean merge_notes_set = FALSE;
while ((c = getopt_long (argc, argv, "I:O:F:K:MN:R:o:sSpdgxXHhVvwDU",
strip_options, (int *) 0)) != EOF)
@@ -4452,9 +4451,11 @@ strip_main (int argc, char *argv[])
break;
case 'M':
merge_notes = TRUE;
merge_notes_set = TRUE;
break;
case OPTION_NO_MERGE_NOTES:
merge_notes = FALSE;
merge_notes_set = TRUE;
break;
case 'N':
add_specific_symbol (optarg, strip_specific_htab);
@@ -4506,6 +4507,16 @@ strip_main (int argc, char *argv[])
}
}
/* If the user has not expressly chosen to merge/not-merge ELF notes
then enable the merging unless we are stripping debug or dwo info. */
if (! merge_notes_set
&& (strip_symbols == STRIP_UNDEF
|| strip_symbols == STRIP_ALL
|| strip_symbols == STRIP_UNNEEDED
|| strip_symbols == STRIP_NONDEBUG
|| strip_symbols == STRIP_NONDWO))
merge_notes = TRUE;
if (formats_info)
{
display_info ();