From: Alan Modra <amodra@gmail.com>
Date: Mon, 28 Jan 2013 09:31:01 +0000 (+0000)
Subject: 	* objcopy.c (parse_flags): Add merge and strings section flags.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5dddde8e64ce7587714eb04580ee29c2cc93c8f0;p=binutils-gdb.git

	* objcopy.c (parse_flags): Add merge and strings section flags.
---

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 11862c02337..8aae28307c4 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 ff80431572e..1200eb6270d 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;