* options.h (class General_options): Add --print-output-format.

	Move -EL next to -EB, for  better --help output.
	* target-select.cc: Include <cstdio>, "options.h", and
	"parameters.h".
	(Target_selector::do_target_bfd_name): New function.
	(print_output_format): New function.
	* target-select.h (class Target_selector): Update declarations.
	(Target_selector::target_bfd_name): New function.
	(print_output_format): Declare.
	* main.cc: Include "target-select.h".
	(main): Handle --print-output-format.
	* gold.cc: Include "target-select.h".
	(queue_initial_tasks): Handle --print-output-format when there are
	no input files.
	* parameters.cc (parameters_force_valid_target): Give a better
	error message if -EB/-EL does not match target.
	* freebsd.h (Target_selector_freebsd::do_target_bfd_name): New
	function.

1 files changed, 11 insertions, 0 deletions

diff --git a/gold/freebsd.h b/gold/freebsd.h
index 8f0d46dfef..175dd0561c 100644
--- a/gold/freebsd.h
+++ b/gold/freebsd.h
@@ -80,6 +80,17 @@ class Target_selector_freebsd : public Target_selector
     names->push_back(this->freebsd_bfd_name_);
   }
 
+  // Return appropriate BFD name.
+  virtual const char*
+  do_target_bfd_name(const Target* target)
+  {
+    if (!this->is_our_target(target))
+      return NULL;
+    return (target->osabi() == elfcpp::ELFOSABI_FREEBSD
+	    ? this->freebsd_bfd_name_
+	    : this->bfd_name_);
+  }
+
  private:
   // The BFD name for the non-Freebsd target.
   const char* bfd_name_;