internal/rosa/package/llvm: 22.1.8 to 23.1.0

libclc is removed from the LLVM package and will be re-added as a separate package.

Signed-off-by: Ophestra <cat@gensokyo.uk>

4 files changed, 26 insertions, 34 deletions

diff --git a/internal/rosa/package/llvm/add-rosa-vendor.patch b/internal/rosa/package/llvm/add-rosa-vendor.patch
index 919403a3..cef7fd80 100644
--- a/internal/rosa/package/llvm/add-rosa-vendor.patch
+++ b/internal/rosa/package/llvm/add-rosa-vendor.patch
@@ -1,8 +1,8 @@
 diff --git a/llvm/include/llvm/TargetParser/Triple.h b/llvm/include/llvm/TargetParser/Triple.h
-index 9c83abeeb3b1..5acfe5836a23 100644
+index d819c4975b13..d634c4a21173 100644
 --- a/llvm/include/llvm/TargetParser/Triple.h
 +++ b/llvm/include/llvm/TargetParser/Triple.h
-@@ -190,6 +190,7 @@ public:
+@@ -280,6 +280,7 @@ public:
  
      Apple,
      PC,
@@ -10,23 +10,15 @@ index 9c83abeeb3b1..5acfe5836a23 100644
      SCEI,
      Freescale,
      IBM,
-diff --git a/llvm/lib/TargetParser/Triple.cpp b/llvm/lib/TargetParser/Triple.cpp
-index a4f9dd42c0fe..cb5a12387034 100644
---- a/llvm/lib/TargetParser/Triple.cpp
-+++ b/llvm/lib/TargetParser/Triple.cpp
-@@ -279,6 +279,7 @@ StringRef Triple::getVendorTypeName(VendorType Kind) {
-   case NVIDIA: return "nvidia";
-   case OpenEmbedded: return "oe";
-   case PC: return "pc";
-+  case Rosa: return "rosa";
-   case SCEI: return "scei";
-   case SUSE: return "suse";
-   case Meta:
-@@ -689,6 +690,7 @@ static Triple::VendorType parseVendor(StringRef VendorName) {
-   return StringSwitch<Triple::VendorType>(VendorName)
-       .Case("apple", Triple::Apple)
-       .Case("pc", Triple::PC)
-+      .Case("rosa", Triple::Rosa)
-       .Case("scei", Triple::SCEI)
-       .Case("sie", Triple::SCEI)
-       .Case("fsl", Triple::Freescale)
+diff --git a/llvm/include/llvm/TargetParser/TripleName.def b/llvm/include/llvm/TargetParser/TripleName.def
+index bbc03b318801..4daed1da68cc 100644
+--- a/llvm/include/llvm/TargetParser/TripleName.def
++++ b/llvm/include/llvm/TargetParser/TripleName.def
+@@ -189,6 +189,7 @@ TRIPLE_VENDOR(MipsTechnologies, "mti")
+ TRIPLE_VENDOR(NVIDIA, "nvidia")
+ TRIPLE_VENDOR(OpenEmbedded, "oe")
+ TRIPLE_VENDOR(PC, "pc")
++TRIPLE_VENDOR(Rosa, "rosa")
+ TRIPLE_VENDOR(SCEI, "scei")
+ TRIPLE_VENDOR_ALIAS(SCEI, "sie")
+ TRIPLE_VENDOR(SUSE, "suse")
diff --git a/internal/rosa/package/llvm/package.az b/internal/rosa/package/llvm/package.az
index 39b6947a..11210563 100644
--- a/internal/rosa/package/llvm/package.az
+++ b/internal/rosa/package/llvm/package.az
@@ -2,11 +2,11 @@ package llvm-project {
 	description = "LLVM monorepo with Rosa OS patches";
 	anitya = 1830;
 
-	version# = "22.1.8";
+	version# = "23.1.0";
 	output = remoteGitHub {
 		suffix = "llvm/llvm-project";
 		tag = "llvmorg-"+version;
-		checksum = "_QzoDE0W6cv0vfIWeLPDvqG_vKhz6IGWl1nqUUvhlKWiRzf5dMGqeC3tyS2XgI6j";
+		checksum = "wgirRNAhU9451qsZn4FXcaIButgRNZWb4kb8pQwERyF1PGc-iJQVewr6xGk7ctNj";
 	};
 	patches = [
 		"increase-stack-size-unconditional.patch",
diff --git a/internal/rosa/package/llvm/path-system-include.patch b/internal/rosa/package/llvm/path-system-include.patch
index c442d641..f51e7a55 100644
--- a/internal/rosa/package/llvm/path-system-include.patch
+++ b/internal/rosa/package/llvm/path-system-include.patch
@@ -1,8 +1,8 @@
 diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
-index 8ac8d4eb9181..e46b04a898ca 100644
+index 8d30a5ead3bb..e0682dc76ae8 100644
 --- a/clang/lib/Driver/ToolChains/Linux.cpp
 +++ b/clang/lib/Driver/ToolChains/Linux.cpp
-@@ -671,6 +671,12 @@ void Linux::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
+@@ -820,6 +820,12 @@ void Linux::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
      addExternCSystemInclude(
          DriverArgs, CC1Args,
          concat(SysRoot, "/usr/include", MultiarchIncludeDir));
@@ -15,7 +15,7 @@ index 8ac8d4eb9181..e46b04a898ca 100644
  
    if (getTriple().getOS() == llvm::Triple::RTEMS)
      return;
-@@ -681,6 +687,7 @@ void Linux::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
+@@ -830,6 +836,7 @@ void Linux::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
    addExternCSystemInclude(DriverArgs, CC1Args, concat(SysRoot, "/include"));
  
    addExternCSystemInclude(DriverArgs, CC1Args, concat(SysRoot, "/usr/include"));
diff --git a/internal/rosa/package/llvm/path-system-libraries.patch b/internal/rosa/package/llvm/path-system-libraries.patch
index fbe46def..a8eb8d4e 100644
--- a/internal/rosa/package/llvm/path-system-libraries.patch
+++ b/internal/rosa/package/llvm/path-system-libraries.patch
@@ -1,8 +1,8 @@
 diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
-index cb6a9b242421..b8d31690d1af 100644
+index 24076d881432..75a3a4735451 100644
 --- a/clang/lib/Driver/ToolChains/Gnu.cpp
 +++ b/clang/lib/Driver/ToolChains/Gnu.cpp
-@@ -2314,6 +2314,10 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
+@@ -2315,6 +2315,10 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
      Prefixes.push_back("/opt/rh/devtoolset-2/root/usr");
    }
  
@@ -14,10 +14,10 @@ index cb6a9b242421..b8d31690d1af 100644
    Prefixes.push_back(concat(SysRoot, "/usr"));
  }
 diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
-index d525b417b4ea..2b93f401733e 100644
+index 8d30a5ead3bb..e33f2de64543 100644
 --- a/clang/lib/Driver/ToolChains/Linux.cpp
 +++ b/clang/lib/Driver/ToolChains/Linux.cpp
-@@ -302,6 +302,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
+@@ -306,6 +306,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
    const bool IsHexagon = Arch == llvm::Triple::hexagon;
    const bool IsRISCV = Triple.isRISCV();
    const bool IsCSKY = Triple.isCSKY();
@@ -25,7 +25,7 @@ index d525b417b4ea..2b93f401733e 100644
  
    if (IsCSKY && !SelectedMultilibs.empty())
      SysRoot = SysRoot + SelectedMultilibs.back().osSuffix();
-@@ -341,8 +342,12 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
+@@ -345,8 +346,12 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
    // used. We need add both libo32 and /lib.
    if (Arch == llvm::Triple::mips || Arch == llvm::Triple::mipsel) {
      Generic_GCC::AddMultilibPaths(D, SysRoot, "libo32", MultiarchTriple, Paths);
@@ -40,7 +40,7 @@ index d525b417b4ea..2b93f401733e 100644
    }
    Generic_GCC::AddMultilibPaths(D, SysRoot, OSLibDir, MultiarchTriple, Paths);
  
-@@ -360,18 +365,30 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
+@@ -364,18 +369,30 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
          Paths);
    }
  
@@ -76,7 +76,7 @@ index d525b417b4ea..2b93f401733e 100644
  }
  
  ToolChain::RuntimeLibType Linux::GetDefaultRuntimeLibType() const {
-@@ -572,6 +589,9 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
+@@ -579,6 +596,9 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
      return Triple.isArch64Bit() ? "/system/bin/linker64" : "/system/bin/linker";
    }
    if (Triple.isMusl()) {