Re: [PATCH] add supporting of the sanitizer arguments into Clang on FreeBSD platform.

[Viktor Kutuzov]

  Updated to leverage changes by Alexey Samsonov.

  The change in ##getCompilerRTLibDir()## is necessary as otherwise it yields 
"lib/freebsd10.0" on FreeBSD 10.0 whereas "lib/freebsd" (without the version 
number) is expected.

  Thanks, Alexey!

Hi kcc, samsonov,

http://llvm-reviews.chandlerc.com/D2644

CHANGE SINCE LAST DIFF
  http://llvm-reviews.chandlerc.com/D2644?vs=7178&id=7639#toc

Files:
  lib/Driver/Tools.cpp

Index: lib/Driver/Tools.cpp
===================================================================
--- lib/Driver/Tools.cpp
+++ lib/Driver/Tools.cpp
@@ -1772,7 +1772,8 @@
 static SmallString<128> getCompilerRTLibDir(const ToolChain &TC) {
   // The runtimes are located in the OS-specific resource directory.
   SmallString<128> Res(TC.getDriver().ResourceDir);
-  llvm::sys::path::append(Res, "lib", TC.getOS());
+  const llvm::Triple &Triple = TC.getTriple();
+  llvm::sys::path::append(Res, "lib", Triple.getOSTypeName(Triple.getOS()));
   return Res;
 }
 
@@ -6230,6 +6231,8 @@
     CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crtn.o")));
   }
 
+  addSanitizerRuntimes(getToolChain(), Args, CmdArgs);
+
   addProfileRT(ToolChain, Args, CmdArgs);
 
   const char *Exec =

Index: lib/Driver/Tools.cpp
===================================================================
--- lib/Driver/Tools.cpp
+++ lib/Driver/Tools.cpp
@@ -1772,7 +1772,8 @@
 static SmallString<128> getCompilerRTLibDir(const ToolChain &TC) {
   // The runtimes are located in the OS-specific resource directory.
   SmallString<128> Res(TC.getDriver().ResourceDir);
-  llvm::sys::path::append(Res, "lib", TC.getOS());
+  const llvm::Triple &Triple = TC.getTriple();
+  llvm::sys::path::append(Res, "lib", Triple.getOSTypeName(Triple.getOS()));
   return Res;
 }
 
@@ -6230,6 +6231,8 @@
     CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crtn.o")));
   }
 
+  addSanitizerRuntimes(getToolChain(), Args, CmdArgs);
+
   addProfileRT(ToolChain, Args, CmdArgs);
 
   const char *Exec =

_______________________________________________
cfe-commits mailing list
cfe-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits