summaryrefslogtreecommitdiff
path: root/binutils
diff options
context:
space:
mode:
authorAlan Modra <amodra@bigpond.net.au>2013-01-28 09:31:01 +0000
committerAlan Modra <amodra@bigpond.net.au>2013-01-28 09:31:01 +0000
commitac34ccbcc52acfc97443ab3daee2fdc95b582a1f (patch)
treed84dff8a179b4f4fab1417c4cb8373a45c996eb6 /binutils
parent8751d6497794691d6741ef9976c735381f7795bd (diff)
downloadbinutils-redhat-ac34ccbcc52acfc97443ab3daee2fdc95b582a1f.tar.gz
* objcopy.c (parse_flags): Add merge and strings section flags.
Diffstat (limited to 'binutils')
-rw-r--r--binutils/ChangeLog4
-rw-r--r--binutils/objcopy.c4
2 files changed, 7 insertions, 1 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 11862c0233..8aae28307c 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,7 @@
+2013-01-28 Robert Schiele <rschiele@gmail.com>
+
+ * objcopy.c (parse_flags): Add merge and strings section flags.
+
2013-01-25 Cary Coutant <ccoutant@google.com>
* dwarf.c (display_loc_list): Update offset for each line
diff --git a/binutils/objcopy.c b/binutils/objcopy.c
index ff80431572..1200eb6270 100644
--- a/binutils/objcopy.c
+++ b/binutils/objcopy.c
@@ -690,6 +690,8 @@ parse_flags (const char *s)
PARSE_FLAG ("rom", SEC_ROM);
PARSE_FLAG ("share", SEC_COFF_SHARED);
PARSE_FLAG ("contents", SEC_HAS_CONTENTS);
+ PARSE_FLAG ("merge", SEC_MERGE);
+ PARSE_FLAG ("strings", SEC_STRINGS);
#undef PARSE_FLAG
else
{
@@ -700,7 +702,7 @@ parse_flags (const char *s)
copy[len] = '\0';
non_fatal (_("unrecognized section flag `%s'"), copy);
fatal (_("supported flags: %s"),
- "alloc, load, noload, readonly, debug, code, data, rom, share, contents");
+ "alloc, load, noload, readonly, debug, code, data, rom, share, contents, merge, strings");
}
s = snext;