From 6ece82e9006d16b7fba7660ce09b2c62ab8460fa Mon Sep 17 00:00:00 2001
From: Nico Weber <thakis@chromium.org>
Date: Fri, 24 Sep 2021 18:43:51 -0400
Subject: [PATCH] Revert "[Driver] Correctly handle static C++ standard
 library"

This reverts commit 03142c5f67788bcc1573f76732d0fccd75c6b965.
Breaks check-asan if system ld doesn't support --push-state, even
if lld was built and is used according to lit's output.
See comments on https://reviews.llvm.org/D110128
---
 clang/lib/Driver/ToolChains/Fuchsia.cpp |  7 ++++---
 clang/lib/Driver/ToolChains/Gnu.cpp     |  6 ++----
 clang/test/Driver/fuchsia.cpp           |  6 ++++--
 clang/test/Driver/linux-ld.c            | 16 ----------------
 4 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/clang/lib/Driver/ToolChains/Fuchsia.cpp b/clang/lib/Driver/ToolChains/Fuchsia.cpp
index fe86522..144443d 100644
--- a/clang/lib/Driver/ToolChains/Fuchsia.cpp
+++ b/clang/lib/Driver/ToolChains/Fuchsia.cpp
@@ -138,13 +138,14 @@ void fuchsia::Linker::ConstructJob(Compilation &C, const JobAction &JA,
         bool OnlyLibstdcxxStatic = Args.hasArg(options::OPT_static_libstdcxx) &&
                                    !Args.hasArg(options::OPT_static);
         CmdArgs.push_back("--push-state");
+        CmdArgs.push_back("--as-needed");
         if (OnlyLibstdcxxStatic)
           CmdArgs.push_back("-Bstatic");
-        else
-          CmdArgs.push_back("--as-needed");
         ToolChain.AddCXXStdlibLibArgs(Args, CmdArgs);
-        CmdArgs.push_back("--pop-state");
+        if (OnlyLibstdcxxStatic)
+          CmdArgs.push_back("-Bdynamic");
         CmdArgs.push_back("-lm");
+        CmdArgs.push_back("--pop-state");
       }
     }
 
diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
index 82262e5..9aca453 100644
--- a/clang/lib/Driver/ToolChains/Gnu.cpp
+++ b/clang/lib/Driver/ToolChains/Gnu.cpp
@@ -577,13 +577,11 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
     if (ToolChain.ShouldLinkCXXStdlib(Args)) {
       bool OnlyLibstdcxxStatic = Args.hasArg(options::OPT_static_libstdcxx) &&
                                  !Args.hasArg(options::OPT_static);
-      if (OnlyLibstdcxxStatic) {
-        CmdArgs.push_back("--push-state");
+      if (OnlyLibstdcxxStatic)
         CmdArgs.push_back("-Bstatic");
-      }
       ToolChain.AddCXXStdlibLibArgs(Args, CmdArgs);
       if (OnlyLibstdcxxStatic)
-        CmdArgs.push_back("--pop-state");
+        CmdArgs.push_back("-Bdynamic");
     }
     CmdArgs.push_back("-lm");
   }
diff --git a/clang/test/Driver/fuchsia.cpp b/clang/test/Driver/fuchsia.cpp
index 2165f7e..bd4c7eb 100644
--- a/clang/test/Driver/fuchsia.cpp
+++ b/clang/test/Driver/fuchsia.cpp
@@ -37,8 +37,8 @@
 // CHECK: "--push-state"
 // CHECK: "--as-needed"
 // CHECK: "-lc++"
-// CHECK: "--pop-state"
 // CHECK: "-lm"
+// CHECK: "--pop-state"
 // CHECK-X86_64: "[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}x86_64-unknown-fuchsia{{/|\\\\}}libclang_rt.builtins.a"
 // CHECK-AARCH64: "[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}aarch64-unknown-fuchsia{{/|\\\\}}libclang_rt.builtins.a"
 // CHECK-RISCV64: "[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}riscv64-unknown-fuchsia{{/|\\\\}}libclang_rt.builtins.a"
@@ -55,10 +55,12 @@
 // RUN:     -fuse-ld=lld 2>&1 \
 // RUN:     | FileCheck %s -check-prefix=CHECK-STATIC
 // CHECK-STATIC: "--push-state"
+// CHECK-STATIC: "--as-needed"
 // CHECK-STATIC: "-Bstatic"
 // CHECK-STATIC: "-lc++"
-// CHECK-STATIC: "--pop-state"
+// CHECK-STATIC: "-Bdynamic"
 // CHECK-STATIC: "-lm"
+// CHECK-STATIC: "--pop-state"
 // CHECK-STATIC: "-lc"
 
 // RUN: %clangxx %s -### --target=x86_64-unknown-fuchsia -nostdlib++ -fuse-ld=lld 2>&1 \
diff --git a/clang/test/Driver/linux-ld.c b/clang/test/Driver/linux-ld.c
index 87be241..cc50558 100644
--- a/clang/test/Driver/linux-ld.c
+++ b/clang/test/Driver/linux-ld.c
@@ -496,22 +496,6 @@
 // CHECK-GCC-VERSION1: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
 // CHECK-GCC-VERSION1: "{{.*}}/Inputs/basic_linux_tree/usr/lib/gcc/i386-unknown-linux/10.2.0{{/|\\\\}}crtbegin.o"
 
-// RUN: %clangxx -x c++ %s -### 2>&1 \
-// RUN:     --target=x86_64-unknown-linux-gnu \
-// RUN:     -stdlib=libc++ \
-// RUN:   | FileCheck --check-prefix=CHECK-BASIC-LIBCXX-SHARED %s
-// CHECK-BASIC-LIBCXX-SHARED: "-lc++"
-// CHECK-BASIC-LIBCXX-SHARED-SAME: {{^}} "-lm"
-// RUN: %clangxx  -x c++ %s -### 2>&1 \
-// RUN:     --target=x86_64-unknown-linux-gnu \
-// RUN:     -stdlib=libc++ -static-libstdc++ \
-// RUN:   | FileCheck --check-prefix=CHECK-BASIC-LIBCXX-STATIC %s
-// CHECK-BASIC-LIBCXX-STATIC: "--push-state"
-// CHECK-BASIC-LIBCXX-STATIC-SAME: {{^}} "-Bstatic"
-// CHECK-BASIC-LIBCXX-STATIC-SAME: {{^}} "-lc++"
-// CHECK-BASIC-LIBCXX-STATIC-SAME: {{^}} "--pop-state"
-// CHECK-BASIC-LIBCXX-STATIC-SAME: {{^}} "-lm"
-
 // Test a simulated installation of libc++ on Linux, both through sysroot and
 // the installation path of Clang.
 // RUN: %clangxx -no-canonical-prefixes -x c++ %s -### -o %t.o 2>&1 \
-- 
2.7.4