Commit 65ac319b authored by Bill Wendling's avatar Bill Wendling
Browse files

Merging r182645: 

------------------------------------------------------------------------
r182645 | eugenis | 2013-05-24 07:28:03 -0700 (Fri, 24 May 2013) | 6 lines

Add -lrt to sanitizer link arguments.

Sanitizer runtime intercepts functions from librt. Not doing this will fail
if the librt dependency is not present at program startup (ex. comes from a
dlopen()ed library).

------------------------------------------------------------------------

llvm-svn: 182944
parent 1e3c34de

clang/lib/Driver/Tools.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1671,6 +1671,7 @@ static void addSanitizerRTLinkFlagsLinux( 
                 LibSanitizerArgs.begin(), LibSanitizerArgs.end());



  CmdArgs.push_back("-lpthread");

  CmdArgs.push_back("-lrt");

  CmdArgs.push_back("-ldl");



  // If possible, use a dynamic symbols file to export the symbols from the

clang/test/Driver/sanitizer-ld.c

+4 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
// CHECK-ASAN-LINUX-NOT: "-lc"

// CHECK-ASAN-LINUX: libclang_rt.asan-i386.a"

// CHECK-ASAN-LINUX: "-lpthread"

// CHECK-ASAN-LINUX: "-lrt"

// CHECK-ASAN-LINUX: "-ldl"

// CHECK-ASAN-LINUX-NOT: "-export-dynamic"

// CHECK-ASAN-LINUX: "--dynamic-list={{.*}}libclang_rt.asan-i386.a.syms"
@@ -24,6 +25,7 @@ 
// CHECK-ASAN-LINUX-CXX-NOT: "-lc"

// CHECK-ASAN-LINUX-CXX: "-whole-archive" "{{.*}}libclang_rt.asan-i386.a" "-no-whole-archive"

// CHECK-ASAN-LINUX-CXX: "-lpthread"

// CHECK-ASAN-LINUX-CXX: "-lrt"

// CHECK-ASAN-LINUX-CXX: "-ldl"

// CHECK-ASAN-LINUX-CXX: "-export-dynamic"

// CHECK-ASAN-LINUX-CXX-NOT: "--dynamic-list"
@@ -70,6 +72,7 @@ 
// CHECK-TSAN-LINUX-CXX-NOT: stdc++

// CHECK-TSAN-LINUX-CXX: "-whole-archive" "{{.*}}libclang_rt.tsan-x86_64.a" "-no-whole-archive"

// CHECK-TSAN-LINUX-CXX: "-lpthread"

// CHECK-TSAN-LINUX-CXX: "-lrt"

// CHECK-TSAN-LINUX-CXX: "-ldl"

// CHECK-TSAN-LINUX-CXX-NOT: "-export-dynamic"

// CHECK-TSAN-LINUX-CXX: "--dynamic-list={{.*}}libclang_rt.tsan-x86_64.a.syms"
@@ -85,6 +88,7 @@ 
// CHECK-MSAN-LINUX-CXX-NOT: stdc++

// CHECK-MSAN-LINUX-CXX: "-whole-archive" "{{.*}}libclang_rt.msan-x86_64.a" "-no-whole-archive"

// CHECK-MSAN-LINUX-CXX: "-lpthread"

// CHECK-MSAN-LINUX-CXX: "-lrt"

// CHECK-MSAN-LINUX-CXX: "-ldl"

// CHECK-MSAN-LINUX-CXX-NOT: "-export-dynamic"

// CHECK-MSAN-LINUX-CXX: "--dynamic-list={{.*}}libclang_rt.msan-x86_64.a.syms"