PR 6048

[binutils-gdb.git] / gold / target-select.cc

diff --git a/gold/target-select.cc b/gold/target-select.cc
index 8a7570807891a699dacf2071d30ec753dd4eb410..b81f5a28ea8e38ebc2d180b3a8b1c37e43993d69 100644 (file)
--- a/gold/target-select.cc
+++ b/gold/target-select.cc
@@ -22,6 +22,8 @@
 
 #include "gold.h"
 
+#include <cstring>
+
 #include "elfcpp.h"
 #include "target-select.h"
 
@@ -41,8 +43,11 @@ namespace gold
 // list.  This runs at global constructor time, so we want it to be
 // fast.
 
-Target_selector::Target_selector(int machine, int size, bool is_big_endian)
-  : machine_(machine), size_(size), is_big_endian_(is_big_endian)
+Target_selector::Target_selector(int machine, int size, bool is_big_endian,
+                                const char* bfd_name)
+  : machine_(machine), size_(size), is_big_endian_(is_big_endian),
+    bfd_name_(bfd_name), instantiated_target_(NULL)
+    
 {
   this->next_ = target_selectors;
   target_selectors = this;
@@ -77,11 +82,24 @@ select_target_by_name(const char* name)
 {
   for (Target_selector* p = target_selectors; p != NULL; p = p->next())
     {
-      Target* ret = p->recognize_by_name(name);
-      if (ret != NULL)
-       return ret;
+      const char* pname = p->bfd_name();
+      if (pname == NULL || strcmp(pname, name) == 0)
+       {
+         Target* ret = p->recognize_by_name(name);
+         if (ret != NULL)
+           return ret;
+       }
     }
   return NULL;
 }
 
+// Push all the supported BFD names onto a vector.
+
+void
+supported_target_names(std::vector<const char*>* names)
+{
+  for (Target_selector* p = target_selectors; p != NULL; p = p->next())
+    p->supported_names(names);
+}
+
 } // End namespace gold.