From 4dc538da0eb5c6fa2627f1d666f6cfaeac583e58 Mon Sep 17 00:00:00 2001 From: Andrew Kaster Date: Sun, 2 Jan 2022 21:57:02 -0700 Subject: [PATCH] Ports: Remove build-crt patch from llvm This patch has been integrated into the toolchain.patch file. --- Ports/llvm/patches/ReadMe.md | 10 ---------- Ports/llvm/patches/build-crt.patch | 13 ------------- 2 files changed, 23 deletions(-) delete mode 100644 Ports/llvm/patches/build-crt.patch diff --git a/Ports/llvm/patches/ReadMe.md b/Ports/llvm/patches/ReadMe.md index 7192608b293..1f207130047 100644 --- a/Ports/llvm/patches/ReadMe.md +++ b/Ports/llvm/patches/ReadMe.md @@ -1,15 +1,5 @@ # Patches for LLVM on SerenityOS -## `build-crt.patch` - -This patch lets us use LLVM's `crtbegin.o`/`crtend.o` implementation. - -### Status -- [ ] Local? -- [x] Should be merged to upstream? -- [ ] Resolves issue(s) with our side of things -- [ ] Hack - ## `insert-ifdef-serenity.patch` This patch adds several defines in order to omit things not supported by SerenityOS. diff --git a/Ports/llvm/patches/build-crt.patch b/Ports/llvm/patches/build-crt.patch deleted file mode 100644 index e589ffca639..00000000000 --- a/Ports/llvm/patches/build-crt.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake -index 39b9120f0..1a49ac3e5 100644 ---- a/compiler-rt/cmake/config-ix.cmake -+++ b/compiler-rt/cmake/config-ix.cmake -@@ -684,7 +684,7 @@ endif() - - # TODO: Add builtins support. - --if (CRT_SUPPORTED_ARCH AND OS_NAME MATCHES "Linux" AND NOT LLVM_USE_SANITIZER) -+if (CRT_SUPPORTED_ARCH AND OS_NAME MATCHES "Linux|SerenityOS" AND NOT LLVM_USE_SANITIZER) - set(COMPILER_RT_HAS_CRT TRUE) - else() - set(COMPILER_RT_HAS_CRT FALSE)