Don't use the user-specified output format unless the user actually

specified one.

diff --git a/gold/parameters.cc b/gold/parameters.cc
index f240c1d990c6151e6c8fa3979864eb3909cbb23f..9c57ef322e1e3ebb92718afed0e13d1b1e264efc 100644 (file)
--- a/gold/parameters.cc
+++ b/gold/parameters.cc
@@ -74,7 +74,7 @@ const Target&
 Parameters::default_target() const
 {
   gold_assert(this->options_valid());
-  if (this->options().oformat() != NULL)
+  if (this->options().user_set_oformat())
     {
       const Target* target
           = select_target_by_name(this->options().oformat());