diff options
| author | Petr Hosek <phosek@chromium.org> | 2018-11-21 14:10:56 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-11-21 14:10:56 -0800 |
| commit | 42f1f127e40a5f9025eea6989433f19ef05a5e3c (patch) | |
| tree | c3db6f8724ee6e275b13d0889b66f2dbfbce4c37 | |
| parent | fd07c723878f4c0293c0e5fac53149dd6b6cff79 (diff) | |
| parent | ac3d152db0e68766ab437765c656dea9119d310b (diff) | |
| download | clang-42f1f127e40a5f9025eea6989433f19ef05a5e3c.tar.gz | |
Revert "[Driver] Use --push/pop-state with Sanitizer link deps"
am: ac3d152db0
Change-Id: I866bc7fdfae992a73ce125c76816ffbbaa3a7829
| -rw-r--r-- | lib/Driver/ToolChains/CommonArgs.cpp | 2 | ||||
| -rw-r--r-- | test/Driver/sanitizer-ld.c | 14 |
2 files changed, 0 insertions, 16 deletions
diff --git a/lib/Driver/ToolChains/CommonArgs.cpp b/lib/Driver/ToolChains/CommonArgs.cpp index 4f34296488..03298a17c3 100644 --- a/lib/Driver/ToolChains/CommonArgs.cpp +++ b/lib/Driver/ToolChains/CommonArgs.cpp @@ -598,7 +598,6 @@ void tools::linkSanitizerRuntimeDeps(const ToolChain &TC, 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(const ToolChain &TC, if (TC.getTriple().getOS() == llvm::Triple::NetBSD || TC.getTriple().getOS() == llvm::Triple::FreeBSD) CmdArgs.push_back("-lexecinfo"); - CmdArgs.push_back("--pop-state"); } static void diff --git a/test/Driver/sanitizer-ld.c b/test/Driver/sanitizer-ld.c index d0408eb8c6..9ce05996fd 100644 --- a/test/Driver/sanitizer-ld.c +++ b/test/Driver/sanitizer-ld.c @@ -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 \ |