From b4e26c987ed048764c100a733366167d0e6c99a8 Mon Sep 17 00:00:00 2001 From: Ian Butterworth Date: Tue, 23 Sep 2025 20:35:59 -0400 Subject: [PATCH] unwind: remove upstreamed patch --- .../libunwind-missing-parameter-names.patch | 28 ------------------- deps/unwind.mk | 6 +--- 2 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 deps/patches/libunwind-missing-parameter-names.patch diff --git a/deps/patches/libunwind-missing-parameter-names.patch b/deps/patches/libunwind-missing-parameter-names.patch deleted file mode 100644 index 59a33f1a56880..0000000000000 --- a/deps/patches/libunwind-missing-parameter-names.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 9ebe5e12b8a0063953f9ef196b2433eca9933559 Mon Sep 17 00:00:00 2001 -From: Stephen Webb -Date: Tue, 15 Apr 2025 10:48:20 -0400 -Subject: [PATCH] Fix FTBFS in src/ptrace/_UPT_ptrauth_insn_mask.c - -Added missing parameter names to make C code comply to ISO/IEC 9899. ---- - src/ptrace/_UPT_ptrauth_insn_mask.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/ptrace/_UPT_ptrauth_insn_mask.c b/src/ptrace/_UPT_ptrauth_insn_mask.c -index dcc512370..e7b3a514b 100644 ---- a/src/ptrace/_UPT_ptrauth_insn_mask.c -+++ b/src/ptrace/_UPT_ptrauth_insn_mask.c -@@ -49,9 +49,10 @@ unw_word_t _UPT_ptrauth_insn_mask (UNUSED unw_addr_space_t as, void *arg) - - #else - --unw_word_t _UPT_ptrauth_insn_mask (unw_addr_space_t, void *) -+unw_word_t _UPT_ptrauth_insn_mask (UNUSED unw_addr_space_t as, UNUSED void *arg) - { - return 0; - } - --#endif -\ No newline at end of file -+#endif -+ diff --git a/deps/unwind.mk b/deps/unwind.mk index 2b49b3cf0973a..83cd8a8633c84 100644 --- a/deps/unwind.mk +++ b/deps/unwind.mk @@ -39,14 +39,10 @@ $(SRCCACHE)/libunwind-$(UNWIND_VER)/libunwind-disable-initial-exec-tls.patch-app cd $(SRCCACHE)/libunwind-$(UNWIND_VER) && patch -p1 -f -u -l < $(SRCDIR)/patches/libunwind-disable-initial-exec-tls.patch echo 1 > $@ -$(SRCCACHE)/libunwind-$(UNWIND_VER)/libunwind-missing-parameter-names.patch-applied: $(SRCCACHE)/libunwind-$(UNWIND_VER)/libunwind-disable-initial-exec-tls.patch-applied - cd $(SRCCACHE)/libunwind-$(UNWIND_VER) && patch -p1 -f -u -l < $(SRCDIR)/patches/libunwind-missing-parameter-names.patch - echo 1 > $@ - # note minidebuginfo requires liblzma, which we do not have a source build for # (it will be enabled in BinaryBuilder-based downloads however) # since https://github.com/JuliaPackaging/Yggdrasil/commit/0149e021be9badcb331007c62442a4f554f3003c -$(BUILDDIR)/libunwind-$(UNWIND_VER)/build-configured: $(SRCCACHE)/libunwind-$(UNWIND_VER)/source-extracted $(SRCCACHE)/libunwind-$(UNWIND_VER)/libunwind-missing-parameter-names.patch-applied +$(BUILDDIR)/libunwind-$(UNWIND_VER)/build-configured: $(SRCCACHE)/libunwind-$(UNWIND_VER)/source-extracted $(SRCCACHE)/libunwind-$(UNWIND_VER)/libunwind-disable-initial-exec-tls.patch-applied mkdir -p $(dir $@) cd $(dir $@) && \ $(dir $<)/configure $(CONFIGURE_COMMON) CPPFLAGS="$(CPPFLAGS) $(LIBUNWIND_CPPFLAGS)" CFLAGS="$(CFLAGS) $(LIBUNWIND_CFLAGS)" LDFLAGS="$(LDFLAGS) $(LIBUNWIND_LDFLAGS)" --enable-shared --disable-minidebuginfo --disable-tests --enable-debug_frame --enable-zlibdebuginfo --disable-conservative-checks --enable-per-thread-cache