Author: phosek
Date: Wed Nov 21 13:59:39 2018
New Revision: 347430
URL: http://llvm.org/viewvc/llvm-project?rev=347430&view=rev
Log:
Revert "[Driver] Use --push/pop-state with Sanitizer link deps"
This reverts commit r347413: older versions of ld.gold that are used
by Android don't support --push/pop-state which broke sanitizer bots.
Modified:
cfe/trunk/lib/Driver/ToolChains/CommonArgs.cpp
cfe/trunk/test/Driver/sanitizer-ld.c
Modified: cfe/trunk/lib/Driver/ToolChains/CommonArgs.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/CommonArgs.cpp?rev=347430&r1=347429&r2=347430&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/ToolChains/CommonArgs.cpp (original)
+++ cfe/trunk/lib/Driver/ToolChains/CommonArgs.cpp Wed Nov 21 13:59:39 2018
@@ -598,7 +598,6 @@ void tools::linkSanitizerRuntimeDeps(con
ArgStringList &CmdArgs) {
// Force linking against the system libraries sanitizers depends on
// (see PR15823 why this is necessary).
- CmdArgs.push_back("--push-state");
CmdArgs.push_back("--no-as-needed");
// There's no libpthread or librt on RTEMS & Android.
if (TC.getTriple().getOS() != llvm::Triple::RTEMS &&
@@ -618,7 +617,6 @@ void tools::linkSanitizerRuntimeDeps(con
if (TC.getTriple().getOS() == llvm::Triple::NetBSD ||
TC.getTriple().getOS() == llvm::Triple::FreeBSD)
CmdArgs.push_back("-lexecinfo");
- CmdArgs.push_back("--pop-state");
}
static void
Modified: cfe/trunk/test/Driver/sanitizer-ld.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/sanitizer-ld.c?rev=347430&r1=347429&r2=347430&view=diff
==============================================================================
--- cfe/trunk/test/Driver/sanitizer-ld.c (original)
+++ cfe/trunk/test/Driver/sanitizer-ld.c Wed Nov 21 13:59:39 2018
@@ -220,20 +220,6 @@
// CHECK-ASAN-MYRIAD-NOT: "-lc"
// CHECK-ASAN-MYRIAD: libclang_rt.asan-sparcel.a"
-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
-// RUN: -target i386-unknown-linux -fuse-ld=ld -fsanitize=address -static \
-// RUN: -resource-dir=%S/Inputs/resource_dir \
-// RUN: --sysroot=%S/Inputs/basic_linux_tree \
-// RUN: | FileCheck --check-prefix=CHECK-ASAN-LINUX-STATIC %s
-//
-// CHECK-ASAN-LINUX-STATIC: "--push-state"
-// CHECK-ASAN-LINUX-STATIC: "--no-as-needed"
-// CHECK-ASAN-LINUX-STATIC: "-lpthread"
-// CHECK-ASAN-LINUX-STATIC: "-lrt"
-// CHECK-ASAN-LINUX-STATIC: "-lm"
-// CHECK-ASAN-LINUX-STATIC: "-ldl"
-// CHECK-ASAN-LINUX-STATIC: "--pop-state"
-
// RUN: %clangxx -no-canonical-prefixes %s -### -o %t.o 2>&1 \
// RUN: -target x86_64-unknown-linux -fuse-ld=ld -stdlib=platform -lstdc++
\
// RUN: -fsanitize=thread \
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
