Files
macports-ports/devel/libffi/files/patch-sources.diff
Fred WrightandRenee Otten 313ed2317d libffi: update to 3.4.8
As usual, the patchfile is derived from git differences, which no
longer include the now-upstream fix for the build problem on Sequoia.

As usual, there are many test failures, but 3.4.8 is roughly
comparable to 3.4.6 in this regard.

TESTED:
Tested -/+universal on 10.4-10.5 ppc, 10.5-10.6 ppc (i386 Rosetta),
10.4-10.6 i386, 10.4-12.x x86_64, and 11.x-15.x arm64.
2025-04-17 22:00:52 -04:00

51 lines
2.1 KiB
Diff

--- src/powerpc/darwin.S.orig 2024-06-01 10:42:02.000000000 -0700
+++ src/powerpc/darwin.S 2025-04-17 11:40:54.000000000 -0700
@@ -31,8 +31,6 @@
#define MODE_CHOICE(x, y) x
#endif
-#define machine_choice MODE_CHOICE(ppc7400,ppc64)
-
; Define some pseudo-opcodes for size-independent load & store of GPRs ...
#define lgu MODE_CHOICE(lwzu, ldu)
#define lg MODE_CHOICE(lwz,ld)
--- src/powerpc/darwin_closure.S.orig 2024-06-01 10:42:02.000000000 -0700
+++ src/powerpc/darwin_closure.S 2025-04-17 11:40:54.000000000 -0700
@@ -34,7 +34,7 @@
#define MODE_CHOICE(x, y) x
#endif
-#define machine_choice MODE_CHOICE(ppc7400,ppc64)
+#define machine_choice MODE_CHOICE(ppc,ppc64)
; Define some pseudo-opcodes for size-independent load & store of GPRs ...
#define lgu MODE_CHOICE(lwzu, ldu)
--- testsuite/lib/libffi.exp.orig 2024-06-01 10:42:02.000000000 -0700
+++ testsuite/lib/libffi.exp 2025-04-17 11:40:54.000000000 -0700
@@ -516,7 +516,10 @@ proc run-many-tests { testcases extra_fl
}
}
"gnu" {
- set common "-W -Wall -Wno-psabi"
+ set common "-W -Wall"
+ if ![info exists env(LIBFFI_TEST_OLDGCC)] {
+ set common "$common -Wno-psabi"
+ }
if [info exists env(LIBFFI_TEST_OPTIMIZATION)] {
set optimizations [ list $env(LIBFFI_TEST_OPTIMIZATION) ]
} else {
--- testsuite/libffi.bhaible/bhaible.exp.orig 2024-06-01 10:42:02.000000000 -0700
+++ testsuite/libffi.bhaible/bhaible.exp 2025-04-17 11:40:54.000000000 -0700
@@ -24,7 +24,10 @@ global compiler_vendor
# was done in a pretty lazy fashion, and requires the use of compiler
# flags to disable warnings for now.
if { [string match $compiler_vendor "gnu"] } {
- set warning_options "-Wno-unused-variable -Wno-unused-parameter -Wno-unused-but-set-variable -Wno-uninitialized";
+ set warning_options "-Wno-unused-variable -Wno-unused-parameter -Wno-uninitialized";
+ if ![info exists env(LIBFFI_TEST_OLDGCC)] {
+ set common "$warning_options -Wno-unused-but-set-variable"
+ }
}
if { [string match $compiler_vendor "microsoft"] } {
# -wd4996 suggest use of vsprintf_s instead of vsprintf