diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-03-14 23:44:49 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-03-15 09:38:45 +0100 |
| commit | 739fcd1b8c65a05112af02d0780c8930e3e8c42c (patch) | |
| tree | 6bde31b6f05d0611e4bc98c944b90b7a8f6dcfd4 /thirdparty/pcre2/patches/sljit-macos11-conditional.patch | |
| parent | 0175be8948d68cf90c55ce08e8e5bf46ea29ce40 (diff) | |
| download | redot-engine-739fcd1b8c65a05112af02d0780c8930e3e8c42c.tar.gz | |
pcre2: Remove unused sjlit files after last update
Follow-up to #89371.
Diffstat (limited to 'thirdparty/pcre2/patches/sljit-macos11-conditional.patch')
| -rw-r--r-- | thirdparty/pcre2/patches/sljit-macos11-conditional.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/thirdparty/pcre2/patches/sljit-macos11-conditional.patch b/thirdparty/pcre2/patches/sljit-macos11-conditional.patch deleted file mode 100644 index b92c8f9e09..0000000000 --- a/thirdparty/pcre2/patches/sljit-macos11-conditional.patch +++ /dev/null @@ -1,31 +0,0 @@ -From de8fc816bc6698ab97316ed954e133e7e5098262 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= <carenas@gmail.com> -Date: Thu, 21 Apr 2022 21:01:12 -0700 -Subject: [PATCH] macos: somehow allow building with a target below 11.0 - -While building for macOS older than 11 in Apple Silicon makes no -sense, some build systems lack the flexibility to set a target per -architecture while aiming to support multi architecture binaries. - -Allow an option in those cases by using the slower runtime checks -if the toolchain allows it. - -Fixes: PCRE2Project/pcre2#109 ---- - thirdparty/pcre2/src/sljit/sljitExecAllocator.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/thirdparty/pcre2/src/sljit/sljitExecAllocator.c b/thirdparty/pcre2/src/sljit/sljitExecAllocator.c -index 92d940ddc2..6359848cd5 100644 ---- a/thirdparty/pcre2/src/sljit/sljitExecAllocator.c -+++ b/thirdparty/pcre2/src/sljit/sljitExecAllocator.c -@@ -152,6 +152,9 @@ static SLJIT_INLINE void apple_update_wx_flags(sljit_s32 enable_exec) - { - #if MAC_OS_X_VERSION_MIN_REQUIRED >= 110000 - pthread_jit_write_protect_np(enable_exec); -+#elif defined(__clang__) -+ if (__builtin_available(macOS 11.0, *)) -+ pthread_jit_write_protect_np(enable_exec); - #else - #error "Must target Big Sur or newer" - #endif /* BigSur */ |