<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e6290f04ddc0ed740127985bde4498ff9d36b6bd">https://github.com/macports/macports-ports/commit/e6290f04ddc0ed740127985bde4498ff9d36b6bd</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e6290f04ddc0ed740127985bde4498ff9d36b6bd
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Wed Feb 28 22:40:53 2024 -0800
<span style='display:block; white-space:pre;color:#404040;'> libffi: Fix build on 10.4, 10.5
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This makes three changes to the patches for 10.4 and 10.5:
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> 1) In the G3 patch, it removes the ppc7400 reference that was never
</span><span style='display:block; white-space:pre;color:#404040;'> actually used, rather than updating it. It still fixes the case that
</span><span style='display:block; white-space:pre;color:#404040;'> is actually used.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> 2) It removes the patch for i386 assembler that has been
</span><span style='display:block; white-space:pre;color:#404040;'> (approximately) incorporated upstream since v3.4.5. The collision
</span><span style='display:block; white-space:pre;color:#404040;'> with this patch was the reason for the patch failure.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> 3) For the gcc 4.2 test-build fix, it replaces the conditionally
</span><span style='display:block; white-space:pre;color:#404040;'> applied patchfile with an unconditional patch controlled by an
</span><span style='display:block; white-space:pre;color:#404040;'> environment variable, thereby keeping the source code consistent
</span><span style='display:block; white-space:pre;color:#404040;'> across OS versions. This new environment variable is now defined by
</span><span style='display:block; white-space:pre;color:#404040;'> the Portfile when the compiler is gcc 4.2.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The patches for #1 and #3 are now in a single unified patchfile.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/69380
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> TESTED:
</span><span style='display:block; white-space:pre;color:#404040;'> Tested on 10.4-10.5 ppc, 10.5-10.6 ppc (x86_64 Rosetta), 10.4-10.6
</span><span style='display:block; white-space:pre;color:#404040;'> i386, 10.4-12.x x86_64, and 11.x-14.x arm64.
</span><span style='display:block; white-space:pre;color:#404040;'> Now builds and passes at least some tests on all tested platforms,
</span><span style='display:block; white-space:pre;color:#404040;'> except 10.4 ppc +universal.
</span><span style='display:block; white-space:pre;color:#404040;'> Test behavior on 10.6+ is essentially unchanged. Tests on 10.4 and
</span><span style='display:block; white-space:pre;color:#404040;'> 10.5 have a few additional failures since v3.4.4 (the last version
</span><span style='display:block; white-space:pre;color:#404040;'> that built successfully) due to new tests having been added.
</span>---
devel/libffi/Portfile | 13 +++---
.../files/patch-libffi-intel-leopard-sysv.diff | 39 -----------------
devel/libffi/files/patch-libffi-tests-gcc42.diff | 27 ------------
devel/libffi/files/patch-pre-snowleopard.diff | 50 ++++++++++++++++++++++
devel/libffi/files/powerpc-g3.patch | 24 -----------
5 files changed, 56 insertions(+), 97 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libffi/Portfile b/devel/libffi/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 539196fa806..f995e2ad417 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libffi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libffi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,13 +25,7 @@ long_description The libffi library provides a portable, high level \
</span>
homepage https://www.sourceware.org/libffi/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles powerpc-g3.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} < 10 && ![string match *clang* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/61170
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-libffi-intel-leopard-sysv.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-libffi-tests-gcc42.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-pre-snowleopard.diff
</span>
# Don't use macports gcc or clang toolchains to build this due to dependency cycles
compiler.blacklist-append macports-*
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,4 +61,9 @@ depends_test-append port:expect port:dejagnu
</span> test.run yes
test.target check
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Some warnings need to be disabled when building tests with gcc-4.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match *gcc-4.2 ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.env-append LIBFFI_TEST_OLDGCC=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> github.livecheck.regex {(\d+(?:\.\d+)+)}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libffi/files/patch-libffi-intel-leopard-sysv.diff b/devel/libffi/files/patch-libffi-intel-leopard-sysv.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b1acb19c593..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libffi/files/patch-libffi-intel-leopard-sysv.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,39 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This i386 code in libffi has been written now to assume a current darwin assembler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-and .cfi directives. Bootstrapping with gcc-4.2 and the default "gas" assembler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-no longer works. This patch re-enables the build of libffi by reverting the asm change
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-and disabling the unsupported features.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-If important to someone, it might be possible to rebuild libffi with these features
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-re-enabled once a newer toolchain has been installed (clang/ld64/cctools).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://trac.macports.org/ticket/61170
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./src/x86/sysv.S.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/x86/sysv.S
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -792,7 +792,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef X86_DARWIN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define COMDAT(X) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- .section __TEXT,__text,coalesced,pure_instructions; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ .section __TEXT,__textcoal_nt,coalesced,pure_instructions; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .weak_definition X; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FFI_HIDDEN(X)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined __ELF__ && !(defined(__sun__) && defined(__svr4__))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -820,7 +820,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* __PIC__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Sadly, OSX cctools-as doesn't understand .cfi directives at all. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .section __TEXT,__eh_frame,coalesced,no_toc+strip_static_syms+live_support
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EHFrame0:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1120,7 +1120,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .long 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .long 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* __APPLE__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* if 0 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* ifndef _MSC_VER */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* ifdef __i386__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libffi/files/patch-libffi-tests-gcc42.diff b/devel/libffi/files/patch-libffi-tests-gcc42.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fbffd2b0001..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libffi/files/patch-libffi-tests-gcc42.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,27 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Needed to run the test suite with the default toolchain on older darwin systems.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Removes flags unsupported by gcc-4.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://trac.macports.org/ticket/61170
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./testsuite/lib/libffi.exp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./testsuite/lib/libffi.exp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -488,7 +488,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "gnu" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set common "-W -Wall -Wno-psabi"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set common "-W -Wall"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [info exists env(LIBFFI_TEST_OPTIMIZATION)] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set optimizations [ list $env(LIBFFI_TEST_OPTIMIZATION) ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./testsuite/libffi.bhaible/bhaible.exp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./testsuite/libffi.bhaible/bhaible.exp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,7 +24,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # was done in a pretty lazy fashion, and requires the use of compiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # flags to disable warnings for now.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [string match $compiler_vendor "gnu"] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set warning_options "-Wno-unused-variable -Wno-unused-parameter -Wno-unused-but-set-variable -Wno-uninitialized";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set warning_options "-Wno-unused-variable -Wno-unused-parameter -Wno-uninitialized";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [string match $compiler_vendor "microsoft"] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # -wd4996 suggest use of vsprintf_s instead of vsprintf
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libffi/files/patch-pre-snowleopard.diff b/devel/libffi/files/patch-pre-snowleopard.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ba78eb9a4d9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libffi/files/patch-pre-snowleopard.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,50 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/powerpc/darwin.S.orig 2023-03-15 07:19:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/powerpc/darwin.S 2024-02-26 18:37:38.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,8 +31,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define MODE_CHOICE(x, y) x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define machine_choice MODE_CHOICE(ppc7400,ppc64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ; Define some pseudo-opcodes for size-independent load & store of GPRs ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define lgu MODE_CHOICE(lwzu, ldu)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define lg MODE_CHOICE(lwz,ld)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/powerpc/darwin_closure.S.orig 2023-03-15 07:19:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/powerpc/darwin_closure.S 2024-02-26 18:37:38.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,7 +34,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define MODE_CHOICE(x, y) x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define machine_choice MODE_CHOICE(ppc7400,ppc64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define machine_choice MODE_CHOICE(ppc,ppc64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ; Define some pseudo-opcodes for size-independent load & store of GPRs ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define lgu MODE_CHOICE(lwzu, ldu)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- testsuite/lib/libffi.exp.orig 2023-03-15 07:19:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ testsuite/lib/libffi.exp 2024-02-26 18:37:38.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -516,7 +516,10 @@ proc run-many-tests { testcases extra_fl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "gnu" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set common "-W -Wall -Wno-psabi"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set common "-W -Wall"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ![info exists env(LIBFFI_TEST_OLDGCC)] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set common "$common -Wno-psabi"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [info exists env(LIBFFI_TEST_OPTIMIZATION)] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set optimizations [ list $env(LIBFFI_TEST_OPTIMIZATION) ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- testsuite/libffi.bhaible/bhaible.exp.orig 2023-03-15 07:19:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ testsuite/libffi.bhaible/bhaible.exp 2024-02-26 18:37:38.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,7 +24,10 @@ global compiler_vendor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # was done in a pretty lazy fashion, and requires the use of compiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # flags to disable warnings for now.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [string match $compiler_vendor "gnu"] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set warning_options "-Wno-unused-variable -Wno-unused-parameter -Wno-unused-but-set-variable -Wno-uninitialized";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set warning_options "-Wno-unused-variable -Wno-unused-parameter -Wno-uninitialized";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ![info exists env(LIBFFI_TEST_OLDGCC)] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set common "$warning_options -Wno-unused-but-set-variable"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [string match $compiler_vendor "microsoft"] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -wd4996 suggest use of vsprintf_s instead of vsprintf
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libffi/files/powerpc-g3.patch b/devel/libffi/files/powerpc-g3.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f92b852e7f6..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libffi/files/powerpc-g3.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Build for PowerPC G3 not G4 since Tiger still supports G3s.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://sourceware.org/legacy-ml/libffi-discuss/2015/msg00084.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/powerpc/darwin.S.orig 2019-10-31 09:49:54.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/powerpc/darwin.S 2021-05-10 13:04:38.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,7 +31,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define MODE_CHOICE(x, y) x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define machine_choice MODE_CHOICE(ppc7400,ppc64)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define machine_choice MODE_CHOICE(ppc,ppc64)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ; Define some pseudo-opcodes for size-independent load & store of GPRs ...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define lgu MODE_CHOICE(lwzu, ldu)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/powerpc/darwin_closure.S.orig 2019-10-31 09:49:54.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/powerpc/darwin_closure.S 2021-05-10 13:04:34.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,7 +34,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define MODE_CHOICE(x, y) x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define machine_choice MODE_CHOICE(ppc7400,ppc64)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define machine_choice MODE_CHOICE(ppc,ppc64)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ; Define some pseudo-opcodes for size-independent load & store of GPRs ...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define lgu MODE_CHOICE(lwzu, ldu)
</span></pre><pre style='margin:0'>
</pre>