svn commit: r219011 - head/contrib/llvm/tools/clang/lib/Driver

Dimitry Andric dim at
Thu Feb 24 21:45:59 UTC 2011

Author: dim
Date: Thu Feb 24 21:45:58 2011
New Revision: 219011

  Recently, in upstream clang, a fix was done to add -L/usr/lib to the
  arguments passed to ld, when linking.  This was to appease configure
  scripts in several ports, that grep for such a -L option in "${CC} -v"
  output, to determine the startup objects passed to ld.  Note ld itself
  does not need to be told about /usr/lib, since it has this path builtin
  However, if clang is built as a bootstrap tool during buildworld, it
  should not use *anything* outside ${WORLDTMP} to include or link with.
  The upstream fix to add -L/usr/lib breaks this assumption, and can thus
  cause libraries from /usr/lib to be linked in during buildworld.
  This can result in buildworld dying during linking of zinject, where it
  picks up the wrong copy of, eventually leading to:
  /usr/obj/usr/src/tmp/lib/ undefined reference to `_rtld_get_stack_prot'
  Fix this issue by not adding any hardcoded paths, but by looping through
  the run-time library path list, which is already correctly set for the
  bootstrap phase.
  Reported by:	datastream.freecity at
  Pointy hat to:	dim


Modified: head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
--- head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp	Thu Feb 24 21:19:30 2011	(r219010)
+++ head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp	Thu Feb 24 21:45:58 2011	(r219011)
@@ -3206,7 +3206,12 @@ void freebsd::Link::ConstructJob(Compila
   Args.AddAllArgs(CmdArgs, options::OPT_L);
-  CmdArgs.push_back("-L/usr/lib");
+  const ToolChain::path_list Paths = getToolChain().getFilePaths();
+  for (ToolChain::path_list::const_iterator i = Paths.begin(), e = Paths.end();
+       i != e; ++i)
+    CmdArgs.push_back(Args.MakeArgString(llvm::StringRef("-L") + *i));
   Args.AddAllArgs(CmdArgs, options::OPT_T_Group);
   Args.AddAllArgs(CmdArgs, options::OPT_e);
   Args.AddAllArgs(CmdArgs, options::OPT_s);
@@ -3568,13 +3573,9 @@ void linuxtools::Link::ConstructJob(Comp
   Args.AddAllArgs(CmdArgs, options::OPT_L);
   const ToolChain::path_list Paths = ToolChain.getFilePaths();
-  for (ToolChain::path_list::const_iterator i = Paths.begin(),
-         e = Paths.end();
-       i != e; ++i) {
-    const std::string &s = *i;
-    CmdArgs.push_back(Args.MakeArgString(std::string("-L") + s));
-  }
+  for (ToolChain::path_list::const_iterator i = Paths.begin(), e = Paths.end();
+       i != e; ++i)
+    CmdArgs.push_back(Args.MakeArgString(llvm::StringRef("-L") + *i));
   AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs);

More information about the svn-src-all mailing list