diff options
| author | Ian Lance Taylor <ian@airs.com> | 2013-03-08 22:34:46 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@airs.com> | 2013-03-08 22:34:46 +0000 |
| commit | 956b03bbdfefa9936821d4ee58e41cf7bacf81f3 (patch) | |
| tree | ca98712965d813d3c7eecce49d49b0fb2c2e8854 /gold | |
| parent | 59c108f731e32b4292c4c31c072a9c11f3ca1404 (diff) | |
| download | fsf-binutils-gdb-956b03bbdfefa9936821d4ee58e41cf7bacf81f3.zip fsf-binutils-gdb-956b03bbdfefa9936821d4ee58e41cf7bacf81f3.tar.gz fsf-binutils-gdb-956b03bbdfefa9936821d4ee58e41cf7bacf81f3.tar.bz2 | |
* options.cc (General_options::string_to_object_format): Accept
"default".
Diffstat (limited to 'gold')
| -rw-r--r-- | gold/ChangeLog | 5 | ||||
| -rw-r--r-- | gold/options.cc | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index 0b5e99e..bbd4eb3 100644 --- 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 fe9a00e..5b94fae 100644 --- 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; |