clang: Remove patch chunk that snuck back in.

2 files changed, 11 insertions, 12 deletions

diff --git a/lang/clang/distinfo b/lang/clang/distinfo
index af3d0d8d8f1..d231e37e21d 100644
--- a/lang/clang/distinfo
+++ b/lang/clang/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.64 2020/04/18 07:53:38 adam Exp $
+$NetBSD: distinfo,v 1.65 2020/06/05 15:28:54 jperkin Exp $
 
 SHA1 (clang-10.0.0.src.tar.xz) = cfaa4c4e89a45b604e6f3057f984d73365074727
 RMD160 (clang-10.0.0.src.tar.xz) = 7a2a0b3fd1b6b0d9c59a506f99d628417a565724
@@ -6,7 +6,7 @@ SHA512 (clang-10.0.0.src.tar.xz) = b1cccc13c46abcda3d689f51d486fa613ecec40c581c7
 Size (clang-10.0.0.src.tar.xz) = 14190012 bytes
 SHA1 (patch-lib_Basic_Targets_OSTargets.h) = 02533d1de2c92a431d9c5d4567f348deff056b99
 SHA1 (patch-lib_Driver_ToolChain.cpp) = b49a6032d75e33ffe2606012addd826e9fdbb1db
-SHA1 (patch-lib_Driver_ToolChains_Solaris.cpp) = 797af9f730bcbcf47c374152861964d745634d21
+SHA1 (patch-lib_Driver_ToolChains_Solaris.cpp) = 222d157f44444eeef33ac97e0ed072a55b666690
 SHA1 (patch-lib_Driver_ToolChains_Solaris.h) = 94968d0de0972ff832727822fbdc02442be74ab8
 SHA1 (patch-lib_Frontend_InitHeaderSearch.cpp) = 497ddbe1eac8726d736bed58557a795dce207d1a
 SHA1 (patch-tools_libclang_FatalErrorHandler.cpp) = 5761b54b493587272667d3f79388e98e37a4b1fb
diff --git a/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp b/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp
index c9d17a642de..2d74a0486b3 100644
--- a/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp
+++ b/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-lib_Driver_ToolChains_Solaris.cpp,v 1.5 2020/04/18 07:53:38 adam Exp $
+$NetBSD: patch-lib_Driver_ToolChains_Solaris.cpp,v 1.6 2020/06/05 15:28:54 jperkin Exp $
 
 Use compiler-rt instead of libgcc.
 Pull in libcxx correctly.
@@ -7,7 +7,7 @@ Don't specify --dynamic-linker, makes it impossible for the user to use -Wl,-r
 Ensure we reset to -zdefaultextract prior to adding compiler-rt.
 Test removing -Bdynamic for golang.
 
---- lib/Driver/ToolChains/Solaris.cpp.orig	2020-03-19 09:19:04.000000000 +0000
+--- lib/Driver/ToolChains/Solaris.cpp.orig	2020-03-23 15:01:02.000000000 +0000
 +++ lib/Driver/ToolChains/Solaris.cpp
 @@ -49,8 +49,29 @@ void solaris::Linker::ConstructJob(Compi
                                     const InputInfoList &Inputs,
@@ -59,7 +59,7 @@ Test removing -Bdynamic for golang.
  
      const Arg *Std = Args.getLastArg(options::OPT_std_EQ, options::OPT_ansi);
      bool HaveAnsi = false;
-@@ -101,16 +121,16 @@ void solaris::Linker::ConstructJob(Compi
+@@ -101,16 +121,14 @@ void solaris::Linker::ConstructJob(Compi
      // Use values-Xc.o for -ansi, -std=c*, -std=iso9899:199409.
      if (HaveAnsi || (LangStd && !LangStd->isGNUMode()))
        values_X = "values-Xc.o";
@@ -72,14 +72,13 @@ Test removing -Bdynamic for golang.
        values_xpg = "values-xpg4.o";
      CmdArgs.push_back(
 -        Args.MakeArgString(getToolChain().GetFilePath(values_xpg)));
-+        Args.MakeArgString(SysPath + values_xpg));
-     CmdArgs.push_back(
+-    CmdArgs.push_back(
 -        Args.MakeArgString(getToolChain().GetFilePath("crtbegin.o")));
-+        Args.MakeArgString(SysPath + "crtbegin.o"));
++        Args.MakeArgString(SysPath + values_xpg));
    }
  
    getToolChain().AddFilePathLibArgs(Args, CmdArgs);
-@@ -122,30 +142,23 @@ void solaris::Linker::ConstructJob(Compi
+@@ -122,30 +140,23 @@ void solaris::Linker::ConstructJob(Compi
    AddLinkerInputs(getToolChain(), Inputs, Args, CmdArgs, JA);
  
    if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) {
@@ -121,7 +120,7 @@ Test removing -Bdynamic for golang.
  
    getToolChain().addProfileRTLibs(Args, CmdArgs);
  
-@@ -174,26 +187,9 @@ Solaris::Solaris(const Driver &D, const 
+@@ -174,26 +185,9 @@ Solaris::Solaris(const Driver &D, const 
                   const ArgList &Args)
      : Generic_ELF(D, Triple, Args) {
  
@@ -151,7 +150,7 @@ Test removing -Bdynamic for golang.
  }
  
  SanitizerMask Solaris::getSupportedSanitizers() const {
-@@ -218,6 +214,32 @@ Tool *Solaris::buildAssembler() const {
+@@ -218,6 +212,32 @@ Tool *Solaris::buildAssembler() const {
  
  Tool *Solaris::buildLinker() const { return new tools::solaris::Linker(*this); }
  
@@ -184,7 +183,7 @@ Test removing -Bdynamic for golang.
  void Solaris::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
                                          ArgStringList &CC1Args) const {
    const Driver &D = getDriver();
-@@ -250,40 +272,20 @@ void Solaris::AddClangSystemIncludeArgs(
+@@ -250,40 +270,20 @@ void Solaris::AddClangSystemIncludeArgs(
      return;
    }