From 2443c418344f5e9d6a4d42826ba088cbde80145c Mon Sep 17 00:00:00 2001
From: no92 <leo@managarm.org>
Date: Mon, 18 Nov 2024 13:37:51 +0100
Subject: [PATCH] llvm: drop old patch

---
 bootstrap.d/managarm-build.y4.yml             |  2 +-
 bootstrap.d/sys-devel.y4.yml                  |  2 +-
 .../llvm/0005-fix-ld-target-emulation.patch   | 41 -------------------
 3 files changed, 2 insertions(+), 43 deletions(-)
 delete mode 100644 patches/llvm/0005-fix-ld-target-emulation.patch

diff --git a/bootstrap.d/managarm-build.y4.yml b/bootstrap.d/managarm-build.y4.yml
index 32d8a6645..9c4c905ff 100644
--- a/bootstrap.d/managarm-build.y4.yml
+++ b/bootstrap.d/managarm-build.y4.yml
@@ -197,7 +197,7 @@ tools:
       - binutils
     tools_required:
       - host-cmake
-    revision: 3
+    revision: 4
     configure:
       - args:
         - 'cmake'
diff --git a/bootstrap.d/sys-devel.y4.yml b/bootstrap.d/sys-devel.y4.yml
index 9e547c7d9..0a73bc450 100644
--- a/bootstrap.d/sys-devel.y4.yml
+++ b/bootstrap.d/sys-devel.y4.yml
@@ -365,7 +365,7 @@ packages:
     pkgs_required:
       - mlibc
       - zlib
-    revision: 3
+    revision: 4
     configure:
       - args:
         - 'cmake'
diff --git a/patches/llvm/0005-fix-ld-target-emulation.patch b/patches/llvm/0005-fix-ld-target-emulation.patch
deleted file mode 100644
index 73c501397..000000000
--- a/patches/llvm/0005-fix-ld-target-emulation.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From f2614883d26393aad3a6ff7928807c41c22e5b5b Mon Sep 17 00:00:00 2001
-From: no92 <no92.mail@gmail.com>
-Date: Thu, 7 Nov 2024 00:15:32 +0100
-Subject: [PATCH 5/5] fix ld target emulation
-
----
- clang/lib/Driver/ToolChains/Gnu.cpp     | 2 ++
- llvm/include/llvm/TargetParser/Triple.h | 4 ++++
- 2 files changed, 6 insertions(+)
-
-diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
-index 8397f1121e..53b326f6e7 100644
---- a/clang/lib/Driver/ToolChains/Gnu.cpp
-+++ b/clang/lib/Driver/ToolChains/Gnu.cpp
-@@ -228,6 +228,8 @@ static const char *getLDMOption(const llvm::Triple &T, const ArgList &Args) {
-       return "elf_iamcu";
-     return "elf_i386";
-   case llvm::Triple::aarch64:
-+    if (T.isOSManagarm())
-+      return "aarch64managarm";
-     return "aarch64linux";
-   case llvm::Triple::aarch64_be:
-     return "aarch64linuxb";
-diff --git a/llvm/include/llvm/TargetParser/Triple.h b/llvm/include/llvm/TargetParser/Triple.h
-index aba538520a..82824b9eee 100644
---- a/llvm/include/llvm/TargetParser/Triple.h
-+++ b/llvm/include/llvm/TargetParser/Triple.h
-@@ -824,6 +824,10 @@ public:
- 
-   bool isVulkanOS() const { return getOS() == Triple::Vulkan; }
- 
-+  bool isOSManagarm() const {
-+    return getOS() == Triple::Managarm;
-+  }
-+
-   bool isShaderStageEnvironment() const {
-     EnvironmentType Env = getEnvironment();
-     return Env == Triple::Pixel || Env == Triple::Vertex ||
--- 
-2.47.0
-