aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 11862c0..8aae283 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 ff80431..1200eb6 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;