elfcpp/

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

diff --git a/gold/options.cc b/gold/options.cc
index dcf6ba71ace25c080fa3d479cd09bbf94f1be921..fe9a00e023d372b44e66bb54d71e85d3c9a596ab 100644 (file)
--- a/gold/options.cc
+++ b/gold/options.cc
@@ -1121,33 +1121,48 @@ General_options::finalize()
                  program_name);
 #endif
 
+  std::string libpath;
   if (this->user_set_Y())
     {
-      std::string s = this->Y();
-      if (s.compare(0, 2, "P,") == 0)
-       s.erase(0, 2);
+      libpath = this->Y();
+      if (libpath.compare(0, 2, "P,") == 0)
+       libpath.erase(0, 2);
+    }
+  else if (!this->nostdlib())
+    {
+#ifndef NATIVE_LINKER
+#define NATIVE_LINKER 0
+#endif
+      const char* p = LIB_PATH;
+      if (strcmp(p, "::DEFAULT::") != 0)
+       libpath = p;
+      else if (NATIVE_LINKER
+              || this->user_set_sysroot()
+              || *TARGET_SYSTEM_ROOT != '\0')
+       {
+         this->add_to_library_path_with_sysroot("/lib");
+         this->add_to_library_path_with_sysroot("/usr/lib");
+       }
+      else
+       this->add_to_library_path_with_sysroot(TOOLLIBDIR);
+    }
 
+  if (!libpath.empty())
+    {
       size_t pos = 0;
       size_t next_pos;
       do
        {
-         next_pos = s.find(':', pos);
+         next_pos = libpath.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());
+           this->add_to_library_path_with_sysroot(libpath.substr(pos, len));
          pos = next_pos + 1;
        }
       while (next_pos != std::string::npos);
     }
-  else if (!this->nostdlib())
-    {
-      // 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");
-    }
 
   // Parse the contents of -retain-symbols-file into a set.
   if (this->retain_symbols_file())
@@ -1188,6 +1203,8 @@ General_options::finalize()
     gold_fatal(_("-shared and -static are incompatible"));
   if (this->shared() && this->pie())
     gold_fatal(_("-shared and -pie are incompatible"));
+  if (this->pie() && this->is_static())
+    gold_fatal(_("-pie and -static are incompatible"));
 
   if (this->shared() && this->relocatable())
     gold_fatal(_("-shared and -r are incompatible"));