* options.cc (General_options::string_to_object_format): Accept

	"default".

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 0b5e99e06629d82e5430e96a3cdd0db7c8e238b3..bbd4eb3d5aaba75177df4600ed65f744548cf945 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-08  Ian Lance Taylor  <iant@google.com>
+
+       * options.cc (General_options::string_to_object_format): Accept
+       "default".
+
 2013-03-08  Alan Modra  <amodra@gmail.com>
 
        * ehframe.h (Post_fdes) Make it a vector of Post_fde rather than

diff --git a/gold/options.cc b/gold/options.cc
index fe9a00e023d372b44e66bb54d71e85d3c9a596ab..5b94faefa5e5c1438028c5b6a44d0ea50a045605 100644 (file)
--- a/gold/options.cc
+++ b/gold/options.cc
@@ -652,7 +652,7 @@ General_options::check_excluded_libs(const std::string &name) const
 General_options::Object_format
 General_options::string_to_object_format(const char* arg)
 {
-  if (strncmp(arg, "elf", 3) == 0)
+  if (strncmp(arg, "elf", 3) == 0 || strcmp(arg, "default") == 0)
     return gold::General_options::OBJECT_FORMAT_ELF;
   else if (strcmp(arg, "binary") == 0)
     return gold::General_options::OBJECT_FORMAT_BINARY;