From 3d14f0c84ba9f9c25b063d4fa414a7c57f1b004e Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 19 Oct 2025 20:32:00 -0400 Subject: [PATCH] darwin.libffi: 39 -> 40 https://github.com/apple-oss-distributions/libffi/compare/libffi-39...libffi-40 --- .../apple-source-releases/libffi/package.nix | 2 -- .../patches/llvm-18-compatibility.patch | 34 ------------------- .../apple-source-releases/versions.json | 4 +-- 3 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 pkgs/os-specific/darwin/apple-source-releases/libffi/patches/llvm-18-compatibility.patch diff --git a/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix b/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix index 942f0a26da43..7aefb636900e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix @@ -23,8 +23,6 @@ mkAppleDerivation (finalAttrs: { ]; patches = [ - # Clang 18 requires that no non-private symbols by defined after cfi_startproc. Apply the upstream libffi fix. - ./patches/llvm-18-compatibility.patch # Fix a memory leak when using the trampoline dylib. See https://github.com/libffi/libffi/pull/621#discussion_r955298301. ./patches/fix-tramponline-memory-leak.patch # Fix automake-18.18 compatibility, https://github.com/libffi/libffi/issues/853#issuecomment-2909994482 diff --git a/pkgs/os-specific/darwin/apple-source-releases/libffi/patches/llvm-18-compatibility.patch b/pkgs/os-specific/darwin/apple-source-releases/libffi/patches/llvm-18-compatibility.patch deleted file mode 100644 index a264d7b76d1b..000000000000 --- a/pkgs/os-specific/darwin/apple-source-releases/libffi/patches/llvm-18-compatibility.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/src/aarch64/sysv.S b/src/aarch64/sysv.S -index eeaf3f8..329889c 100644 ---- a/src/aarch64/sysv.S -+++ b/src/aarch64/sysv.S -@@ -76,8 +76,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - x5 closure - */ - -- cfi_startproc - CNAME(ffi_call_SYSV): -+ cfi_startproc - /* Sign the lr with x1 since that is where it will be stored */ - SIGN_LR_WITH_REG(x1) - -@@ -268,8 +268,8 @@ CNAME(ffi_closure_SYSV_V): - #endif - - .align 4 -- cfi_startproc - CNAME(ffi_closure_SYSV): -+ cfi_startproc - SIGN_LR - stp x29, x30, [sp, #-ffi_closure_SYSV_FS]! - cfi_adjust_cfa_offset (ffi_closure_SYSV_FS) -@@ -500,8 +500,8 @@ CNAME(ffi_go_closure_SYSV_V): - #endif - - .align 4 -- cfi_startproc - CNAME(ffi_go_closure_SYSV): -+ cfi_startproc - stp x29, x30, [sp, #-ffi_closure_SYSV_FS]! - cfi_adjust_cfa_offset (ffi_closure_SYSV_FS) - cfi_rel_offset (x29, 0) diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index 5e9ff091b017..1d1040bad87b 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -56,8 +56,8 @@ "version": "457.140.3" }, "libffi": { - "hash": "sha256-YjRMS3H3hIEfQm5MVSxGNTBtFc/9al7iQGDeZy6m/0U=", - "version": "39" + "hash": "sha256-xHefZVsZg9kUXV0t/HLdjPkkD/hn/4bvdRVJ4PsQLeM=", + "version": "40" }, "libiconv": { "hash": "sha256-eaUp0z7HqX0AW2C90gDVFeiJnmGRxPDuzyb1Jlm1pNc=",