PR ld/6430

[deliverable/binutils-gdb.git] / gold / options.cc

diff --git a/gold/options.cc b/gold/options.cc
index a80f32cb960046ceec9789705fc7704eb8aa8d1f..8d18c11fbc2f758445263c7a84b1ce7220877f90 100644 (file)
--- a/gold/options.cc
+++ b/gold/options.cc
@@ -221,6 +221,12 @@ parse_dirlist(const char*, const char* arg, Dir_list* retval)
   retval->push_back(Search_directory(arg, false));
 }
 
+void
+parse_set(const char*, const char* arg, String_set* retval)
+{
+  retval->insert(std::string(arg));
+}
+
 void
 parse_choices(const char* option_name, const char* arg, const char** retval,
               const char* choices[], int num_choices)
@@ -263,9 +269,16 @@ General_options::parse_version(const char* opt, const char*, Command_line*)
 }
 
 void
-General_options::parse_Bstatic(const char*, const char*, Command_line*)
+General_options::parse_V(const char*, const char*, Command_line*)
 {
-  this->set_Bdynamic(false);
+  gold::print_version(true);
+  printf(_("  Supported targets:\n"));
+  std::vector<const char*> supported_names;
+  gold::supported_target_names(&supported_names);
+  for (std::vector<const char*>::const_iterator p = supported_names.begin();
+       p != supported_names.end();
+       ++p)
+    printf("   %s\n", *p);
 }
 
 void
@@ -324,13 +337,6 @@ General_options::parse_version_script(const char*, const char* arg,
     gold::gold_fatal(_("unable to parse version script file %s"), arg);
 }
 
-void
-General_options::parse_wrap(const char*, const char* arg,
-                           Command_line*)
-{
-  this->wrap_symbols_.insert(std::string(arg));
-}
-
 void
 General_options::parse_start_group(const char*, const char*,
                                    Command_line* cmdline)
@@ -588,7 +594,7 @@ namespace gold
 
 General_options::General_options()
   : execstack_status_(General_options::EXECSTACK_FROM_INPUT), static_(false),
-    do_demangle_(false), wrap_symbols_()
+    do_demangle_(false)
 {
 }
 
@@ -717,10 +723,33 @@ General_options::finalize()
                  program_name);
 #endif
 
-  // Even if they don't specify it, we add -L /lib and -L /usr/lib.
-  // FIXME: We should only do this when configured in native mode.
-  this->add_to_library_path_with_sysroot("/lib");
-  this->add_to_library_path_with_sysroot("/usr/lib");
+  if (this->user_set_Y())
+    {
+      std::string s = this->Y();
+      if (s.compare(0, 2, "P,") == 0)
+       s.erase(0, 2);
+
+      size_t pos = 0;
+      size_t next_pos;
+      do
+       {
+         next_pos = s.find(':', pos);
+         size_t len = (next_pos == std::string::npos
+                       ? next_pos
+                       : next_pos - pos);
+         if (len != 0)
+           this->add_to_library_path_with_sysroot(s.substr(pos, len).c_str());
+         pos = next_pos + 1;
+       }
+      while (next_pos != std::string::npos);
+    }
+  else
+    {
+      // Even if they don't specify it, we add -L /lib and -L /usr/lib.
+      // FIXME: We should only do this when configured in native mode.
+      this->add_to_library_path_with_sysroot("/lib");
+      this->add_to_library_path_with_sysroot("/usr/lib");
+    }
 
   // Normalize library_path() by adding the sysroot to all directories
   // in the path, as appropriate.