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 | bc101383ec308f1b08006255a1ecb42256a7ccfe (patch) | |
| tree | 6fb6a19099b9dfdb581500818e4791e24ce90812 /gold | |
| parent | 53e589dfc9fe46803ed99a29e74470417772cb8d (diff) | |
| download | binutils-redhat-bc101383ec308f1b08006255a1ecb42256a7ccfe.tar.gz | |
* 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 0b5e99e066..bbd4eb3d5a 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 fe9a00e023..5b94faefa5 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; |