From: Petr Hosek <phosek@chromium.org>
Date: Wed, 21 Nov 2018 21:59:39 +0000 (+0000)
Subject: Revert "[Driver] Use --push/pop-state with Sanitizer link deps"
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ac3d152db0e68766ab437765c656dea9119d310b;p=clang

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.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@347430 91177308-0d34-0410-b5e6-96231b3b80d8
---

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 \