fix use of renamed member function in patch

Author: h-vetinari

recipe/patches/0001-Fix-sysroot-detection-for-linux.patch

@@ -1,4 +1,4 @@
-From 9e7489a7585037b21c90dcf74d410c600cde56e2 Mon Sep 17 00:00:00 2001
+From a9db4f6f2feecd44d7ee7e65b5ec5919fbc80726 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <[email protected]>
 Date: Mon, 8 Apr 2019 16:32:17 -0500
 Subject: [PATCH 1/8] Fix sysroot detection for linux
@@ -8,10 +8,10 @@ Subject: [PATCH 1/8] Fix sysroot detection for linux
  1 file changed, 16 insertions(+), 4 deletions(-)
 
 diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
-index 1ba222bf83b1..ee361924b9e8 100644
+index 4300a2bdff17..401834493cb3 100644
 --- a/clang/lib/Driver/ToolChains/Linux.cpp
 +++ b/clang/lib/Driver/ToolChains/Linux.cpp
-@@ -394,18 +394,30 @@ std::string Linux::computeSysRoot() const {
+@@ -398,18 +398,30 @@ std::string Linux::computeSysRoot() const {
      return std::string();
    }
 

recipe/patches/0002-clang-add-conda-specific-env-var-CONDA_BUILD_SYSROOT.patch

@@ -1,4 +1,4 @@
-From 790933939291c1d7204bc98c51da8727da871c81 Mon Sep 17 00:00:00 2001
+From 3d48e9d06b4c1af2995851c21856858579c05c8e Mon Sep 17 00:00:00 2001
 From: Nehal J Wani <[email protected]>
 Date: Sat, 25 Aug 2018 09:20:04 -0500
 Subject: [PATCH 2/8] clang: add conda specific env var CONDA_BUILD_SYSROOT
@@ -9,10 +9,10 @@ Subject: [PATCH 2/8] clang: add conda specific env var CONDA_BUILD_SYSROOT
  2 files changed, 10 insertions(+), 1 deletion(-)
 
 diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
-index bdbdad9362e1..eef06f2c0a59 100644
+index 93cddf742d52..00d0466a5de2 100644
 --- a/clang/lib/Driver/Driver.cpp
 +++ b/clang/lib/Driver/Driver.cpp
-@@ -1348,6 +1348,11 @@ Compilation *Driver::BuildCompilation(ArrayRef<const char *> ArgList) {
+@@ -1352,6 +1352,11 @@ Compilation *Driver::BuildCompilation(ArrayRef<const char *> ArgList) {
        CompilerPath = Split.second;
      }
    }
@@ -25,7 +25,7 @@ index bdbdad9362e1..eef06f2c0a59 100644
      SysRoot = A->getValue();
    if (const Arg *A = Args.getLastArg(options::OPT__dyld_prefix_EQ))
 diff --git a/clang/lib/Lex/InitHeaderSearch.cpp b/clang/lib/Lex/InitHeaderSearch.cpp
-index 41382d7cb3fc..3f2fab2b5bb9 100644
+index 2218db15013d..d05cfa38e4fb 100644
 --- a/clang/lib/Lex/InitHeaderSearch.cpp
 +++ b/clang/lib/Lex/InitHeaderSearch.cpp
 @@ -24,6 +24,7 @@
@@ -36,7 +36,7 @@ index 41382d7cb3fc..3f2fab2b5bb9 100644
  #include "llvm/Support/raw_ostream.h"
  #include "llvm/TargetParser/Triple.h"
  #include <optional>
-@@ -241,7 +242,10 @@ void InitHeaderSearch::AddDefaultCIncludePaths(const llvm::Triple &triple,
+@@ -210,7 +211,10 @@ void InitHeaderSearch::AddDefaultCIncludePaths(const llvm::Triple &triple,
        [[fallthrough]];
      default:
        // FIXME: temporary hack: hard-coded paths.

recipe/patches/0003-Fix-normalizeProgramName-s-handling-of-dots-outside-.patch

@@ -1,4 +1,4 @@
-From 8256e78c1bdcd778994807548f410404d5485c00 Mon Sep 17 00:00:00 2001
+From 3f82e5619383f7fda54c0281e93bcce1d20678fb Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <[email protected]>
 Date: Wed, 30 Aug 2017 20:01:49 +0100
 Subject: [PATCH 3/8] Fix normalizeProgramName()'s handling of dots outside of
@@ -18,7 +18,7 @@ x86_64-apple-darwin13.4
  1 file changed, 22 insertions(+), 1 deletion(-)
 
 diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
-index 8dafc3d481c2..9b0010361dcc 100644
+index 388030592b48..f41635fc0021 100644
 --- a/clang/lib/Driver/ToolChain.cpp
 +++ b/clang/lib/Driver/ToolChain.cpp
 @@ -55,6 +55,7 @@ using namespace driver;
@@ -40,7 +40,7 @@ index 8dafc3d481c2..9b0010361dcc 100644
 +StringRef program_name_stem(StringRef path) {
 +  StringRef fname = llvm::sys::path::filename(path);
 +  size_t pos = StringRef::npos;
-+  if (fname.endswith_insensitive(".exe")) {
++  if (fname.ends_with_insensitive(".exe")) {
 +    pos = fname.find_last_of('.');
 +  }
 +  if (pos == StringRef::npos)

recipe/patches/0004-Set-VERSION-in-osx-as-well.patch

@@ -1,4 +1,4 @@
-From 7b341a2fa1318de4d5e7b8276eb294e704e74a77 Mon Sep 17 00:00:00 2001
+From 1a27f84c79925f6ec21821c1e51556383642a64a Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <[email protected]>
 Date: Sat, 27 Jul 2019 11:55:23 -0500
 Subject: [PATCH 4/8] Set VERSION in osx as well
@@ -8,10 +8,10 @@ Subject: [PATCH 4/8] Set VERSION in osx as well
  1 file changed, 5 insertions(+)
 
 diff --git a/clang/tools/libclang/CMakeLists.txt b/clang/tools/libclang/CMakeLists.txt
-index 4f23065a2472..da8a9740fab0 100644
+index b5b6d2807d71..3faabda0ea2a 100644
 --- a/clang/tools/libclang/CMakeLists.txt
 +++ b/clang/tools/libclang/CMakeLists.txt
-@@ -172,6 +172,11 @@ if(ENABLE_SHARED)
+@@ -173,6 +173,11 @@ if(ENABLE_SHARED)
 
      set_property(TARGET libclang APPEND_STRING PROPERTY
                   LINK_FLAGS ${LIBCLANG_LINK_FLAGS})

recipe/patches/0005-Fix-crosscompiling-LLVM-tools.patch

@@ -1,4 +1,4 @@
-From ef7243e085ad067f7e5ad93ea080a8ec61cb69e9 Mon Sep 17 00:00:00 2001
+From e596167b3ff0ee9d6ab3e6a34d197272df1c82c2 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <[email protected]>
 Date: Tue, 11 May 2021 15:08:13 +0200
 Subject: [PATCH 5/8] Fix crosscompiling LLVM tools
@@ -8,7 +8,7 @@ Subject: [PATCH 5/8] Fix crosscompiling LLVM tools
  1 file changed, 10 insertions(+)
 
 diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt
-index f7936d72e088..758f517f4d36 100644
+index 5f2b7f064da4..e7b4fe212d97 100644
 --- a/clang/CMakeLists.txt
 +++ b/clang/CMakeLists.txt
 @@ -60,6 +60,16 @@ if(CLANG_BUILT_STANDALONE)

recipe/patches/0006-Only-error-on-undefined-TARGET_OS_OSX.patch

@@ -1,4 +1,4 @@
-From 151949fe6cc4930d480c0c7cdc27397b51575601 Mon Sep 17 00:00:00 2001
+From 8198ad10b33a39e70afac4f5e103ed1fb4242c38 Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <[email protected]>
 Date: Tue, 11 May 2021 15:09:51 +0200
 Subject: [PATCH 6/8] Only error on undefined TARGET_OS_OSX
@@ -8,10 +8,10 @@ Subject: [PATCH 6/8] Only error on undefined TARGET_OS_OSX
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp
-index 65bd6c6a7eb3..3276f9948e8e 100644
+index fae8ad1a958a..9e7510d12dc4 100644
 --- a/clang/lib/Driver/ToolChains/Darwin.cpp
 +++ b/clang/lib/Driver/ToolChains/Darwin.cpp
-@@ -1136,7 +1136,7 @@ DarwinClang::DarwinClang(const Driver &D, const llvm::Triple &Triple,
+@@ -1149,7 +1149,7 @@ DarwinClang::DarwinClang(const Driver &D, const llvm::Triple &Triple,
 
  void DarwinClang::addClangWarningOptions(ArgStringList &CC1Args) const {
    // Always error about undefined 'TARGET_OS_*' macros.

recipe/patches/0007-set-libclang-SOVERSION-unconditionally.patch

@@ -1,4 +1,4 @@
-From f750bf6ea57c194e271925363489524f16178593 Mon Sep 17 00:00:00 2001
+From 664d3912fa7c4b93316df450929e7c0442f91fb7 Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <[email protected]>
 Date: Thu, 14 Apr 2022 11:57:00 +1100
 Subject: [PATCH 7/8] set libclang SOVERSION unconditionally
@@ -9,7 +9,7 @@ and avoid creating libclang with full version suffix
  1 file changed, 10 insertions(+), 6 deletions(-)
 
 diff --git a/clang/tools/libclang/CMakeLists.txt b/clang/tools/libclang/CMakeLists.txt
-index da8a9740fab0..dd4d43c56b43 100644
+index 3faabda0ea2a..53924bd65579 100644
 --- a/clang/tools/libclang/CMakeLists.txt
 +++ b/clang/tools/libclang/CMakeLists.txt
 @@ -9,10 +9,7 @@
@@ -24,7 +24,7 @@ index da8a9740fab0..dd4d43c56b43 100644
 
  # TODO: harmonize usage of LIBCLANG_SOVERSION / LIBCLANG_LIBARY_VERSION
  #       below; this was added under time-pressure to avoid reverting the
-@@ -199,10 +196,17 @@ if(ENABLE_SHARED)
+@@ -211,10 +208,17 @@ if(ENABLE_SHARED)
      # Ensure that libclang.so gets rebuilt when the linker script changes.
      set_property(SOURCE ARCMigrate.cpp APPEND PROPERTY
                   OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libclang.map)

recipe/patches/0008-Make-PIE-default-on-macOS-too.patch

@@ -1,4 +1,4 @@
-From 024ac6cc93022e9f63f8b8a9971b20110b96eeb0 Mon Sep 17 00:00:00 2001
+From a2d6babd5f4ecde654c1b1117c031f4915c4f36b Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <[email protected]>
 Date: Thu, 28 Dec 2023 19:32:19 +0530
 Subject: [PATCH 8/8] Make PIE default on macOS too.
@@ -9,10 +9,10 @@ This is the default for Linux from LLVM-15
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp
-index 3276f9948e8e..509866f19052 100644
+index 9e7510d12dc4..6e62efd1fe42 100644
 --- a/clang/lib/Driver/ToolChains/Darwin.cpp
 +++ b/clang/lib/Driver/ToolChains/Darwin.cpp
-@@ -3017,7 +3017,7 @@ bool Darwin::SupportsEmbeddedBitcode() const {
+@@ -3127,7 +3127,7 @@ bool Darwin::SupportsEmbeddedBitcode() const {
 
  bool MachO::isPICDefault() const { return true; }