diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2015-08-20 21:47:16 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2015-08-20 21:47:16 +0000 |
| commit | 2e6062cd41b3d0165e442168d47e8c1a48d33fb2 (patch) | |
| tree | 2814d12baaf5e09fc7e0bc49d45bf13ba294de86 | |
| parent | 4da1a3754af691dfb9128228db19687f59467aff (diff) | |
| download | bcm5719-llvm-2e6062cd41b3d0165e442168d47e8c1a48d33fb2.tar.gz bcm5719-llvm-2e6062cd41b3d0165e442168d47e8c1a48d33fb2.zip | |
Revert r245344.
That change is causing strange test failures on Fedora 22 (PR24503),
and it does not have any effect with Gold linker anyway (PR15823,
https://sourceware.org/bugzilla/show_bug.cgi?id=18859).
llvm-svn: 245619
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 1 | ||||
| -rw-r--r-- | clang/test/Driver/sanitizer-ld.c | 7 |
2 files changed, 0 insertions, 8 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 1a2a028db32..237a244fb98 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -2484,7 +2484,6 @@ static void linkSanitizerRuntimeDeps(const ToolChain &TC, CmdArgs.push_back("--no-as-needed"); CmdArgs.push_back("-lpthread"); CmdArgs.push_back("-lrt"); - CmdArgs.push_back("-lutil"); CmdArgs.push_back("-lm"); // There's no libdl on FreeBSD. if (TC.getTriple().getOS() != llvm::Triple::FreeBSD) diff --git a/clang/test/Driver/sanitizer-ld.c b/clang/test/Driver/sanitizer-ld.c index d63393c0238..5fef8170e31 100644 --- a/clang/test/Driver/sanitizer-ld.c +++ b/clang/test/Driver/sanitizer-ld.c @@ -14,7 +14,6 @@ // CHECK-ASAN-LINUX-NOT: "-export-dynamic" // CHECK-ASAN-LINUX: "-lpthread" // CHECK-ASAN-LINUX: "-lrt" -// CHECK-ASAN-LINUX: "-lutil" // CHECK-ASAN-LINUX: "-ldl" // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ @@ -30,7 +29,6 @@ // CHECK-SHARED-ASAN-LINUX: "-whole-archive" "{{.*}}libclang_rt.asan-preinit-i386.a" "-no-whole-archive" // CHECK-SHARED-ASAN-LINUX-NOT: "-lpthread" // CHECK-SHARED-ASAN-LINUX-NOT: "-lrt" -// CHECK-SHARED-ASAN-LINUX-NOT: "-lutil" // CHECK-SHARED-ASAN-LINUX-NOT: "-ldl" // CHECK-SHARED-ASAN-LINUX-NOT: "-export-dynamic" // CHECK-SHARED-ASAN-LINUX-NOT: "--dynamic-list" @@ -48,7 +46,6 @@ // CHECK-DSO-SHARED-ASAN-LINUX: libclang_rt.asan-i386.so" // CHECK-DSO-SHARED-ASAN-LINUX-NOT: "-lpthread" // CHECK-DSO-SHARED-ASAN-LINUX-NOT: "-lrt" -// CHECK-DSO-SHARED-ASAN-LINUX-NOT: "-lutil" // CHECK-DSO-SHARED-ASAN-LINUX-NOT: "-ldl" // CHECK-DSO-SHARED-ASAN-LINUX-NOT: "-export-dynamic" // CHECK-DSO-SHARED-ASAN-LINUX-NOT: "--dynamic-list" @@ -68,7 +65,6 @@ // CHECK-ASAN-FREEBSD: "-export-dynamic" // CHECK-ASAN-FREEBSD: "-lpthread" // CHECK-ASAN-FREEBSD: "-lrt" -// CHECK-ASAN-FREEBSD: "-lutil" // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ // RUN: -target i386-unknown-freebsd -fsanitize=address \ @@ -94,7 +90,6 @@ // CHECK-ASAN-LINUX-CXX: stdc++ // CHECK-ASAN-LINUX-CXX: "-lpthread" // CHECK-ASAN-LINUX-CXX: "-lrt" -// CHECK-ASAN-LINUX-CXX: "-lutil" // CHECK-ASAN-LINUX-CXX: "-ldl" // RUN: %clang -no-canonical-prefixes %s -### -o /dev/null -fsanitize=address \ @@ -172,7 +167,6 @@ // CHECK-TSAN-LINUX-CXX: stdc++ // CHECK-TSAN-LINUX-CXX: "-lpthread" // CHECK-TSAN-LINUX-CXX: "-lrt" -// CHECK-TSAN-LINUX-CXX: "-lutil" // CHECK-TSAN-LINUX-CXX: "-ldl" // RUN: %clangxx -no-canonical-prefixes %s -### -o %t.o 2>&1 \ @@ -191,7 +185,6 @@ // CHECK-MSAN-LINUX-CXX: stdc++ // CHECK-MSAN-LINUX-CXX: "-lpthread" // CHECK-MSAN-LINUX-CXX: "-lrt" -// CHECK-MSAN-LINUX-CXX: "-lutil" // CHECK-MSAN-LINUX-CXX: "-ldl" // RUN: %clang -fsanitize=undefined %s -### -o %t.o 2>&1 \ |
