* 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, 57 insertions, 0 deletions

diff --git a/gold/target-select.cc b/gold/target-select.cc
index b8a9f40d856..9370a8714ab 100644
--- a/gold/target-select.cc
+++ b/gold/target-select.cc
@@ -22,9 +22,12 @@
 
 #include "gold.h"
 
+#include <cstdio>
 #include <cstring>
 
 #include "elfcpp.h"
+#include "options.h"
+#include "parameters.h"
 #include "target-select.h"
 
 namespace
@@ -80,6 +83,18 @@ Target_selector::set_target()
   this->instantiated_target_ = this->do_instantiate_target();
 }
 
+// If we instantiated TARGET, return the corresponding BFD name.
+
+const char*
+Target_selector::do_target_bfd_name(const Target* target)
+{
+  if (!this->is_our_target(target))
+    return NULL;
+  const char* my_bfd_name = this->bfd_name();
+  gold_assert(my_bfd_name != NULL);
+  return my_bfd_name;
+}
+
 // Find the target for an ELF file.
 
 Target*
@@ -157,4 +172,46 @@ supported_emulation_names(std::vector<const char*>* names)
     p->supported_emulations(names);
 }
 
+// Implement the --print-output-format option.
+
+void
+print_output_format()
+{
+  if (!parameters->target_valid())
+    {
+      // This case arises when --print-output-format is used with no
+      // input files.  We need to come up with the right string to
+      // print based on the other options.  If the user specified the
+      // format using a --oformat option, use that.  That saves each
+      // target from having to remember the name that was used to
+      // select it.  In other cases, we will just have to ask the
+      // target.
+      if (parameters->options().user_set_oformat())
+	{
+	  const char* bfd_name = parameters->options().oformat();
+	  Target* target = select_target_by_bfd_name(bfd_name);
+	  if (target != NULL)
+	    printf("%s\n", bfd_name);
+	  else
+	    gold_error(_("unrecognized output format %s"), bfd_name);
+	  return;
+	}
+
+      parameters_force_valid_target();
+    }
+
+  const Target* target = &parameters->target();
+  for (Target_selector* p = target_selectors; p != NULL; p = p->next())
+    {
+      const char* bfd_name = p->target_bfd_name(target);
+      if (bfd_name != NULL)
+	{
+	  printf("%s\n", bfd_name);
+	  return;
+	}
+    }
+
+  gold_unreachable();
+}
+
 } // End namespace gold.