<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d81a6ff020f927e5edc67c7a868fadcf4e1627c4">https://github.com/macports/macports-ports/commit/d81a6ff020f927e5edc67c7a868fadcf4e1627c4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d81a6ff020f927e5edc67c7a868fadcf4e1627c4
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Sat Jul 29 22:13:37 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> sbcl: update to 2.3.7
</span>---
lang/sbcl/Portfile | 18 ++++++------
...g-when-root-directory-contain-non-ASCII-c.patch | 4 +--
.../files/0002-add-MacPorts-XDG_DATA_DIRS.patch | 2 +-
...ONOTONIC-when-CLOCK_PROCESS_CPUTIME_ID-un.patch | 10 +++----
.../1001-x86-Darwin-Revert-x86-darwin-files.patch | 6 ++--
...Revert-Perform-darwin-related-housekeepin.patch | 10 +++----
...-x86-Darwin-Remove-mach-exception-handler.patch | 2 +-
...use-libc-nanosleep-before-10.6-and-on-PPC.patch | 10 +++----
...-recovery-support-non-dispatch-semaphores.patch | 33 +++++++++-------------
...rwin-mask-out-O_LARGEFILE-in-fcntl.1-test.patch | 4 +--
.../1007-x86-Darwin-revert-OS_THREAD_STACK.patch | 2 +-
...-x86-Darwin-fix-build-by-old-preprocessor.patch | 2 +-
...86-Darwin-disable-failing-stat-mode-tests.patch | 4 +--
.../1010-x86-Darwin-add-missed-OS_CONTEXT_PC.patch | 2 +-
.../files/1011-x86-Darwin-fix-syntax-typos.patch | 2 +-
...-Revert-Delete-support-for-and-darwin-ppc.patch | 30 ++++++++++----------
...3-ppc-Darwin-Config.ppc-follow-up-changes.patch | 2 +-
...ppc-assem.S-fix-wrong-assembler-code-chun.patch | 6 ++--
.../files/1015-ppc-Darwin-Misc-fixes-for-PPC.patch | 6 ++--
...ppc-assem-a-minor-fix-to-assembler-syntax.patch | 6 ++--
...-building-by-lisp-without-endian-features.patch | 2 +-
.../1018-ppc-Darwin-fix-threads-support.patch | 10 +++----
22 files changed, 84 insertions(+), 89 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/sbcl/Portfile b/lang/sbcl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5643475dcdf..bb71015c7a1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/sbcl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/sbcl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@ name sbcl
</span> #
# Please bump the revision of math/maxima (and when it exists
# math/maxima-devel) and fricas when this port changes.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.3.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.3.7
</span> revision 0
categories lang
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,9 +38,9 @@ use_bzip2 yes
</span> patchfiles 0001-fix-building-when-root-directory-contain-non-ASCII-c.patch \
0002-add-MacPorts-XDG_DATA_DIRS.patch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b816fbf6e6557d7d347fe2334125b2f4c92fa0db \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b4414ca4d9a7474e8d884d7d63237e2f29ef459dfd5a848424a9c3fa551d19b9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7483612
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f1e3e5b83233cd41704b0d4cdd09f5fdf8a74c81 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 698144fb805a31919a610de999ab98391d52eb698adaa8ca19b28fc6ed0d99f7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7495739
</span>
# NOTE: Historically, the last version to support x86/Darwin and ppc/Darwin was
# 2.2.5 and 2.2.2. Here, we have backported it to nearly the latest version. On
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,15 +48,15 @@ checksums rmd160 b816fbf6e6557d7d347fe2334125b2f4c92fa0db \
</span> #
# Please do not update it without testing.
if {${os.platform} eq "darwin" && ${configure.build_arch} in [list ppc i386]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 2.3.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 2.3.7
</span> revision 0
epoch [ expr ${epoch} + 1 ]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 b816fbf6e6557d7d347fe2334125b2f4c92fa0db \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b4414ca4d9a7474e8d884d7d63237e2f29ef459dfd5a848424a9c3fa551d19b9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7483612
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 f1e3e5b83233cd41704b0d4cdd09f5fdf8a74c81 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 698144fb805a31919a610de999ab98391d52eb698adaa8ca19b28fc6ed0d99f7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7495739
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # See: https://github.com/catap/sbcl/tree/macports-legacy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See: https://github.com/sbcl/sbcl/pull/54
</span> patchfiles-append \
1001-x86-Darwin-Revert-x86-darwin-files.patch \
1002-x86-Darwin-Revert-Perform-darwin-related-housekeepin.patch \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/sbcl/files/0001-fix-building-when-root-directory-contain-non-ASCII-c.patch b/lang/sbcl/files/0001-fix-building-when-root-directory-contain-non-ASCII-c.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 41076c7d629..59bed501e4e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/sbcl/files/0001-fix-building-when-root-directory-contain-non-ASCII-c.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/sbcl/files/0001-fix-building-when-root-directory-contain-non-ASCII-c.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From e15ff18d708f21060c0559acabd0c94907e5cc4b Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 6d5f1698cb50493ee34486d70fe4a16a4afff129 Mon Sep 17 00:00:00 2001
</span> From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Mon, 5 Jun 2023 12:39:43 +0200
Subject: [PATCH] fix building when root directory contain non-ASCII characters
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ Subject: [PATCH] fix building when root directory contain non-ASCII characters
</span> 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git contrib/sb-posix/posix-tests.lisp contrib/sb-posix/posix-tests.lisp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index b7fc49e47..d32b3abde 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0bb8f0bd0..33b1f2119 100644
</span> --- contrib/sb-posix/posix-tests.lisp
+++ contrib/sb-posix/posix-tests.lisp
@@ -511,7 +511,8 @@
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/sbcl/files/0002-add-MacPorts-XDG_DATA_DIRS.patch b/lang/sbcl/files/0002-add-MacPorts-XDG_DATA_DIRS.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index c507ee2ae86..ef5f3ec02a0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/sbcl/files/0002-add-MacPorts-XDG_DATA_DIRS.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/sbcl/files/0002-add-MacPorts-XDG_DATA_DIRS.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From aff729128386a61ac89cf545ddf1b96df0282787 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 179deadffc277b44ae68a503b93ece2f4e3ba524 Mon Sep 17 00:00:00 2001
</span> From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Tue, 6 Jun 2023 10:19:10 +0200
Subject: [PATCH] add MacPorts' XDG_DATA_DIRS
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/sbcl/files/0003-Use-CLOCK_MONOTONIC-when-CLOCK_PROCESS_CPUTIME_ID-un.patch b/lang/sbcl/files/0003-Use-CLOCK_MONOTONIC-when-CLOCK_PROCESS_CPUTIME_ID-un.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index d8e8ce06177..0eb1f593ed5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/sbcl/files/0003-Use-CLOCK_MONOTONIC-when-CLOCK_PROCESS_CPUTIME_ID-un.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/sbcl/files/0003-Use-CLOCK_MONOTONIC-when-CLOCK_PROCESS_CPUTIME_ID-un.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From d773dffdf6f03d4168ae8febbd8468ca8bdda8fa Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 5acc365e399a21f033657e2acc7d00a8274fce89 Mon Sep 17 00:00:00 2001
</span> From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Tue, 6 Jun 2023 12:08:08 +0200
Subject: [PATCH] Use CLOCK_MONOTONIC when CLOCK_PROCESS_CPUTIME_ID unavailable
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,12 +8,12 @@ Subject: [PATCH] Use CLOCK_MONOTONIC when CLOCK_PROCESS_CPUTIME_ID unavailable
</span> 1 file changed, 4 insertions(+)
diff --git src/runtime/runtime.h src/runtime/runtime.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index d18d68e4c..34707a04a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e92fb7501..947abc30a 100644
</span> --- src/runtime/runtime.h
+++ src/runtime/runtime.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -416,4 +416,8 @@ extern struct lisp_startup_options lisp_startup_options;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define TINY_BOXED_NWORDS(obj) ((HeaderValue(obj) & 0xFF) | 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -171,4 +171,8 @@ void *os_dlsym_default(char *name); // Why not in 'os.h' ?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define NO_SANITIZE_MEMORY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span>
+#ifndef CLOCK_PROCESS_CPUTIME_ID
+#define CLOCK_PROCESS_CPUTIME_ID CLOCK_MONOTONIC
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/sbcl/files/1001-x86-Darwin-Revert-x86-darwin-files.patch b/lang/sbcl/files/1001-x86-Darwin-Revert-x86-darwin-files.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index f3f9702ea85..81a65de6aee 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/sbcl/files/1001-x86-Darwin-Revert-x86-darwin-files.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/sbcl/files/1001-x86-Darwin-Revert-x86-darwin-files.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 2884cc7821f9d2f869f475a0679c35723e8260da Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From d13634d98f2f25bfcb6eced970f75791d6f7412e Mon Sep 17 00:00:00 2001
</span> From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Tue, 6 Jun 2023 23:04:18 +0200
Subject: [PATCH] x86/Darwin: Revert x86-darwin files
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,10 +17,10 @@ See:
</span> create mode 100644 src/runtime/x86-darwin-os.h
diff --git make-config.sh make-config.sh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0be42f451..fde800457 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index bdb5fc5d4..1a0bfe41b 100755
</span> --- make-config.sh
+++ make-config.sh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -700,10 +700,6 @@ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -696,10 +696,6 @@ fi
</span>
case "$sbcl_arch" in
x86)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/sbcl/files/1002-x86-Darwin-Revert-Perform-darwin-related-housekeepin.patch b/lang/sbcl/files/1002-x86-Darwin-Revert-Perform-darwin-related-housekeepin.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index b8fb5ce59dc..db36bc0eec1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/sbcl/files/1002-x86-Darwin-Revert-Perform-darwin-related-housekeepin.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/sbcl/files/1002-x86-Darwin-Revert-Perform-darwin-related-housekeepin.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From d945a4daf584cb65ef0c460eb4e7d589e9c1a330 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From b8860bed397a8b760190a8b2f2f54f039aea1187 Mon Sep 17 00:00:00 2001
</span> From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Tue, 6 Jun 2023 23:40:14 +0200
Subject: [PATCH] x86/Darwin: Revert "Perform darwin-related housekeeping"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,10 +12,10 @@ This reverts commit f5386462b3ad5548763bc7de21d71cb723352af7.
</span> 4 files changed, 85 insertions(+), 3 deletions(-)
diff --git src/runtime/interrupt.c src/runtime/interrupt.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index d4b21f8af..5eb492302 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 87394c4f9..0bd898756 100644
</span> --- src/runtime/interrupt.c
+++ src/runtime/interrupt.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1571,6 +1571,7 @@ extern int *os_context_flags_addr(os_context_t *context);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1552,6 +1552,7 @@ extern int *os_context_flags_addr(os_context_t *context);
</span>
extern lispobj call_into_lisp(lispobj fun, lispobj *args, int nargs);
extern void post_signal_tramp(void);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,7 @@ index d4b21f8af..5eb492302 100644
</span>
void
arrange_return_to_c_function(os_context_t *context,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1759,7 +1760,13 @@ arrange_return_to_c_function(os_context_t *context,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1738,7 +1739,13 @@ arrange_return_to_c_function(os_context_t *context,
</span> void
arrange_return_to_lisp_function(os_context_t *context, lispobj function)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,7 +38,7 @@ index d4b21f8af..5eb492302 100644
</span>
// These have undefined_alien_function tramp in x-assem.S
diff --git src/runtime/x86-arch.c src/runtime/x86-arch.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index c6dfcc33d..3b7bcd015 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0ffd9e43c..da3791753 100644
</span> --- src/runtime/x86-arch.c
+++ src/runtime/x86-arch.c
@@ -80,6 +80,8 @@ os_context_flags_addr(os_context_t *context)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/sbcl/files/1003-x86-Darwin-Remove-mach-exception-handler.patch b/lang/sbcl/files/1003-x86-Darwin-Remove-mach-exception-handler.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 224def218d3..33c2e0d959e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/sbcl/files/1003-x86-Darwin-Remove-mach-exception-handler.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/sbcl/files/1003-x86-Darwin-Remove-mach-exception-handler.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 9689b5101a687c1f624adcb2fc57c86aaba09854 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a84e0bc1e9bd9997d1590357012ce6c3184c3982 Mon Sep 17 00:00:00 2001
</span> From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Tue, 6 Jun 2023 23:32:13 +0200
Subject: [PATCH] x86/Darwin: Remove mach-exception-handler
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/sbcl/files/1004-Darwin-use-libc-nanosleep-before-10.6-and-on-PPC.patch b/lang/sbcl/files/1004-Darwin-use-libc-nanosleep-before-10.6-and-on-PPC.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 75b8727bb6f..eac396c6af5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/sbcl/files/1004-Darwin-use-libc-nanosleep-before-10.6-and-on-PPC.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/sbcl/files/1004-Darwin-use-libc-nanosleep-before-10.6-and-on-PPC.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From ccdf10be2c4f3b64b56b1e7cd3013e901c994a8f Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 04d589d2ce490a05344393af9ad85b991762550b Mon Sep 17 00:00:00 2001
</span> From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Tue, 13 Jun 2023 23:04:30 +0200
Subject: [PATCH] Darwin: use libc nanosleep before 10.6 and on PPC
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@ See: https://github.com/sbcl/sbcl/commit/6d28b641b659b2be6ad7b329ae09cb592c1162a
</span> 4 files changed, 12 insertions(+), 4 deletions(-)
diff --git make-config.sh make-config.sh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index fde800457..eb673a302 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1a0bfe41b..b56da3dc7 100755
</span> --- make-config.sh
+++ make-config.sh
@@ -628,10 +628,12 @@ case "$sbcl_os" in
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +45,7 @@ index 0a10c6f67..c3a71bfed 100644
</span> :OS-PROVIDES-BLKSIZE-T
;; only for src/runtime/run-program.c
diff --git src/runtime/darwin-os.c src/runtime/darwin-os.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6a1b29247..22acca519 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f00c26d0f..ea248f462 100644
</span> --- src/runtime/darwin-os.c
+++ src/runtime/darwin-os.c
@@ -165,6 +165,8 @@ futex_wake(int *lock_word, int n)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,10 +64,10 @@ index 6a1b29247..22acca519 100644
</span> +
+#endif
diff --git src/runtime/wrap.c src/runtime/wrap.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8f8999e8a..52a0a40d3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7cdd0c801..dfad11869 100644
</span> --- src/runtime/wrap.c
+++ src/runtime/wrap.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -524,7 +524,7 @@ int s_issock(mode_t mode)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -529,7 +529,7 @@ int s_issock(mode_t mode)
</span> #endif /* !LISP_FEATURE_WIN32 */
#ifdef LISP_FEATURE_UNIX
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/sbcl/files/1005-Darwin-recovery-support-non-dispatch-semaphores.patch b/lang/sbcl/files/1005-Darwin-recovery-support-non-dispatch-semaphores.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 9fe6be0d845..0b060a5cf78 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/sbcl/files/1005-Darwin-recovery-support-non-dispatch-semaphores.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/sbcl/files/1005-Darwin-recovery-support-non-dispatch-semaphores.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 08f927b1e63e0cb672ed49508059a3cb08774db5 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 02977d6ff1441840fa0143ec509acd9bd3076e89 Mon Sep 17 00:00:00 2001
</span> From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Tue, 13 Jun 2023 23:05:33 +0200
Subject: [PATCH] Darwin: recovery support non dispatch semaphores
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,14 +7,14 @@ See: https://github.com/sbcl/sbcl/commit/160448fd0485daf69e81f9fe9eeb8515ed01db4
</span> ---
make-config.sh | 2 +-
make-target-2-load.lisp | 2 ++
<span style='display:block; white-space:pre;background:#ffe0e0;'>- src/runtime/darwin-os.c | 56 ++++++++++++++++++++++++++++++++++++++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/runtime/darwin-os.c | 51 ++++++++++++++++++++++++++++++++++++++++-
</span> src/runtime/darwin-os.h | 6 ++++-
src/runtime/os-common.c | 2 +-
src/runtime/os.h | 2 +-
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 6 files changed, 65 insertions(+), 5 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6 files changed, 60 insertions(+), 5 deletions(-)
</span>
diff --git make-config.sh make-config.sh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index eb673a302..58b1fc759 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b56da3dc7..e1ba149be 100755
</span> --- make-config.sh
+++ make-config.sh
@@ -631,7 +631,7 @@ case "$sbcl_os" in
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +40,7 @@ index c3a71bfed..629c701b6 100644
</span> :OS-PROVIDES-BLKSIZE-T
;; only for src/runtime/run-program.c
diff --git src/runtime/darwin-os.c src/runtime/darwin-os.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 22acca519..182f01807 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ea248f462..2fc2bd69e 100644
</span> --- src/runtime/darwin-os.c
+++ src/runtime/darwin-os.c
@@ -77,7 +77,7 @@ void darwin_init(void)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,7 +52,7 @@ index 22acca519..182f01807 100644
</span>
inline void
os_sem_init(os_sem_t *sem, unsigned int value)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -163,6 +163,60 @@ futex_wake(int *lock_word, int n)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -163,6 +163,55 @@ futex_wake(int *lock_word, int n)
</span> return 0;
}
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,14 +67,11 @@ index 22acca519..182f01807 100644
</span> +}
+
+inline void
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+os_sem_wait(os_sem_t *sem, char *what)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++os_sem_wait(os_sem_t *sem)
</span> +{
+ kern_return_t ret;
+ restart:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FSHOW((stderr, "%s: os_sem_wait(%p)\n", what, sem));
</span> + ret = semaphore_wait(*sem);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FSHOW((stderr, "%s: os_sem_wait(%p) => %s\n", what, sem,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ KERN_SUCCESS==ret ? "ok" : strerror(errno)));
</span> + switch (ret) {
+ case KERN_SUCCESS:
+ return;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,22 +82,20 @@ index 22acca519..182f01807 100644
</span> + * GC, so we complain before retrying.
+ */
+ case KERN_OPERATION_TIMED_OUT:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fprintf(stderr, "%s: os_sem_wait(%p): %s", what, sem, strerror(errno));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fprintf(stderr, "os_sem_wait(%p): %s", sem, strerror(errno));
</span> + /* This is analogous to POSIX EINTR. */
+ case KERN_ABORTED:
+ goto restart;
+ default:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ lose("%s: os_sem_wait(%p): %lu, %s",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ what, sem, (long unsigned)ret, strerror(errno));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ lose("os_sem_wait(%p): %lu, %s", sem, (long unsigned)ret, strerror(errno));
</span> + }
+}
+
+void
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+os_sem_post(os_sem_t *sem, char *what)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++os_sem_post(os_sem_t *sem)
</span> +{
+ if (KERN_SUCCESS!=semaphore_signal(*sem))
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ lose("%s: os_sem_post(%p): %s", what, sem, strerror(errno));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FSHOW((stderr, "%s: os_sem_post(%p) ok\n", what, sem));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ lose("os_sem_post(%p): %s", sem, strerror(errno));
</span> +}
+
+void
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,7 +129,7 @@ index f13669fb0..dfcc9e8ea 100644
</span>
#endif /* _DARWIN_OS_H */
diff --git src/runtime/os-common.c src/runtime/os-common.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index afc3ede69..36fe6406b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0833bd931..020729835 100644
</span> --- src/runtime/os-common.c
+++ src/runtime/os-common.c
@@ -117,7 +117,7 @@ os_get_errno(void)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -147,10 +142,10 @@ index afc3ede69..36fe6406b 100644
</span> os_sem_init(os_sem_t *sem, unsigned int value)
{
diff --git src/runtime/os.h src/runtime/os.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index e29222d11..649f90256 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6fb3a6c8d..d5d140d2f 100644
</span> --- src/runtime/os.h
+++ src/runtime/os.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -221,7 +221,7 @@ extern char *os_get_runtime_executable_path();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -222,7 +222,7 @@ extern char *os_get_runtime_executable_path();
</span> #define OS_VM_SIZE_FMTX PRIxPTR
#if defined LISP_FEATURE_SB_THREAD && defined LISP_FEATURE_UNIX
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/sbcl/files/1006-x86-Darwin-mask-out-O_LARGEFILE-in-fcntl.1-test.patch b/lang/sbcl/files/1006-x86-Darwin-mask-out-O_LARGEFILE-in-fcntl.1-test.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index fabfe0c450e..91b8ed0b146 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/sbcl/files/1006-x86-Darwin-mask-out-O_LARGEFILE-in-fcntl.1-test.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/sbcl/files/1006-x86-Darwin-mask-out-O_LARGEFILE-in-fcntl.1-test.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From b10732cf23a0616157f5b61961ceb3623552a06e Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 7fbc7051b5ffd04d0841fc432ae86cb46723c2e7 Mon Sep 17 00:00:00 2001
</span> From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Tue, 6 Jun 2023 10:27:10 +0200
Subject: [PATCH] x86/Darwin: mask out O_LARGEFILE in fcntl.1 test
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@ See:
</span> 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git contrib/sb-posix/posix-tests.lisp contrib/sb-posix/posix-tests.lisp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index b7fc49e47..4482f6941 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0bb8f0bd0..3d4239211 100644
</span> --- contrib/sb-posix/posix-tests.lisp
+++ contrib/sb-posix/posix-tests.lisp
@@ -410,7 +410,7 @@
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/sbcl/files/1007-x86-Darwin-revert-OS_THREAD_STACK.patch b/lang/sbcl/files/1007-x86-Darwin-revert-OS_THREAD_STACK.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index da4c2a647ee..183183b951a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/sbcl/files/1007-x86-Darwin-revert-OS_THREAD_STACK.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/sbcl/files/1007-x86-Darwin-revert-OS_THREAD_STACK.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 8a6e0cedc0eb0a731de0e2ef453b2222610d1d66 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From cd612dce6aee6e4b608012bed2f75c04cfcbe7d0 Mon Sep 17 00:00:00 2001
</span> From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Tue, 6 Jun 2023 10:29:33 +0200
Subject: [PATCH] x86/Darwin: revert OS_THREAD_STACK
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/sbcl/files/1008-x86-Darwin-fix-build-by-old-preprocessor.patch b/lang/sbcl/files/1008-x86-Darwin-fix-build-by-old-preprocessor.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index c7270ccb24b..b4752e21dab 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/sbcl/files/1008-x86-Darwin-fix-build-by-old-preprocessor.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/sbcl/files/1008-x86-Darwin-fix-build-by-old-preprocessor.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 64b9150c380a7bea5b335c726cf04fd938e2e3ac Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From db3f6b9074281003f057693155684098b814bf26 Mon Sep 17 00:00:00 2001
</span> From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Tue, 6 Jun 2023 10:30:39 +0200
Subject: [PATCH] x86/Darwin: fix build by old preprocessor
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/sbcl/files/1009-x86-Darwin-disable-failing-stat-mode-tests.patch b/lang/sbcl/files/1009-x86-Darwin-disable-failing-stat-mode-tests.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 8bdb036a923..67942e14b15 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/sbcl/files/1009-x86-Darwin-disable-failing-stat-mode-tests.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/sbcl/files/1009-x86-Darwin-disable-failing-stat-mode-tests.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 0ed40de50d2bbd0616fac2783d291ebae1d9ea67 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a89cbe3a00909c47f106deea0a56dc801fd0fe32 Mon Sep 17 00:00:00 2001
</span> From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Tue, 6 Jun 2023 10:31:20 +0200
Subject: [PATCH] x86/Darwin: disable failing stat-mode tests
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ Subject: [PATCH] x86/Darwin: disable failing stat-mode tests
</span> 1 file changed, 2 insertions(+)
diff --git contrib/sb-posix/posix-tests.lisp contrib/sb-posix/posix-tests.lisp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4482f6941..557ad08a7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3d4239211..190033f4f 100644
</span> --- contrib/sb-posix/posix-tests.lisp
+++ contrib/sb-posix/posix-tests.lisp
@@ -316,6 +316,7 @@
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/sbcl/files/1010-x86-Darwin-add-missed-OS_CONTEXT_PC.patch b/lang/sbcl/files/1010-x86-Darwin-add-missed-OS_CONTEXT_PC.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index d414b554d58..d024a126863 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/sbcl/files/1010-x86-Darwin-add-missed-OS_CONTEXT_PC.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/sbcl/files/1010-x86-Darwin-add-missed-OS_CONTEXT_PC.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 696a80bc5cb0dee30009cd8d7ee328200eca82b0 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 1015074084bc3fed3e2c0567ad36cce92b523019 Mon Sep 17 00:00:00 2001
</span> From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Tue, 6 Jun 2023 10:31:51 +0200
Subject: [PATCH] x86/Darwin: add missed OS_CONTEXT_PC
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/sbcl/files/1011-x86-Darwin-fix-syntax-typos.patch b/lang/sbcl/files/1011-x86-Darwin-fix-syntax-typos.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 5d1d9643735..3f6c95cc5ae 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/sbcl/files/1011-x86-Darwin-fix-syntax-typos.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/sbcl/files/1011-x86-Darwin-fix-syntax-typos.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 004820f9723bbbd9837a799229275f9440b70677 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From be74b02c24671bba52a2ccc67ba8b85d0ffd9619 Mon Sep 17 00:00:00 2001
</span> From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Tue, 6 Jun 2023 10:32:35 +0200
Subject: [PATCH] x86/Darwin: fix syntax typos
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/sbcl/files/1012-ppc-Darwin-Revert-Delete-support-for-and-darwin-ppc.patch b/lang/sbcl/files/1012-ppc-Darwin-Revert-Delete-support-for-and-darwin-ppc.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index eeb9a677e07..e09b552175a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/sbcl/files/1012-ppc-Darwin-Revert-Delete-support-for-and-darwin-ppc.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/sbcl/files/1012-ppc-Darwin-Revert-Delete-support-for-and-darwin-ppc.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 60e00e7f1829411311e896706997bb912501975e Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a80eb3d1b5097d9b428f0dc67bd5ff849087a3e3 Mon Sep 17 00:00:00 2001
</span> From: Sergey Fedorov <vital.had@gmail.com>
Date: Mon, 5 Jun 2023 22:03:43 +0800
Subject: [PATCH] ppc/Darwin: Revert "Delete support for #+(and darwin ppc)"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -499,7 +499,7 @@ index 28a6d2e90..91ddfab72 100644
</span> + (tn-byte-offset bits))))))))
+
diff --git src/compiler/ppc/parms.lisp src/compiler/ppc/parms.lisp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index d2881fd5a..916c6e345 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 77538c922..aac3ff93d 100644
</span> --- src/compiler/ppc/parms.lisp
+++ src/compiler/ppc/parms.lisp
@@ -90,7 +90,8 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -590,10 +590,10 @@ index 000000000..b34a07236
</span> +# Nothing to do.
+after-grovel-headers:
diff --git src/runtime/monitor.c src/runtime/monitor.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 28fa9aa70..486521c4d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 61adeff5e..0a80db4b3 100644
</span> --- src/runtime/monitor.c
+++ src/runtime/monitor.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -640,6 +640,10 @@ print_context(os_context_t *context)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -703,6 +703,10 @@ print_context(os_context_t *context)
</span> brief_print((lispobj)(*os_context_register_addr(context,i)));
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -605,10 +605,10 @@ index 28fa9aa70..486521c4d 100644
</span> printf("PC:\t\t 0x%08lx\n", (unsigned long)os_context_pc(context));
#endif
diff --git src/runtime/ppc-arch.c src/runtime/ppc-arch.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 9cb7c4369..d74d85648 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 94d73c343..b0b48bb48 100644
</span> --- src/runtime/ppc-arch.c
+++ src/runtime/ppc-arch.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -46,8 +46,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,8 +38,10 @@
</span>
Caveat callers. */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -620,10 +620,10 @@ index 9cb7c4369..d74d85648 100644
</span> #ifndef PT_DSISR
#define PT_DSISR 42
diff --git src/runtime/ppc-assem.S src/runtime/ppc-assem.S
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 342952dc0..982c4e7e9 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ebea02ae7..addcb5f26 100644
</span> --- src/runtime/ppc-assem.S
+++ src/runtime/ppc-assem.S
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -16,8 +16,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,8 +15,20 @@
</span> #include "genesis/static-symbols.h"
#include "genesis/thread.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -644,7 +644,7 @@ index 342952dc0..982c4e7e9 100644
</span> #define FUNCDEF(x) .text ; \
.align 3 ; \
.type x,@function ; \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,23 +37,52 @@ x:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,23 +36,52 @@ x:
</span>
#define GFUNCDEF(x) .globl x ; \
FUNCDEF(x)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -697,7 +697,7 @@ index 342952dc0..982c4e7e9 100644
</span> #define FRAME_SIZE(first_g,first_f,out_arg_words,savecr) \
(NFPR_SAVE_BYTES(first_f)+ NGPR_SAVE_BYTES(first_g)+ FRAME_ARG_BYTES(out_arg_words+savecr))
#define SAVE_FPR(n) stfd n,-8*(32-(n))(11)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -50,6 +91,105 @@ x:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -49,6 +90,105 @@ x:
</span>
#define RESTORE_FPR(n) lfd n,-8*(32-(n))(11)
#define RESTORE_GPR(n) lwz n,-4*(32-(n))(11)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -803,7 +803,7 @@ index 342952dc0..982c4e7e9 100644
</span>
#define C_FULL_PROLOG \
mflr 0 ; \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -141,6 +281,8 @@ x:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -140,6 +280,8 @@ x:
</span> lwz 0,4(1) ; \
mtlr 0 ; \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -812,7 +812,7 @@ index 342952dc0..982c4e7e9 100644
</span> #define BEGIN_PSEUDO_ATOMIC stb reg_NULL,THREAD_PSEUDO_ATOMIC_BITS_OFFSET(reg_THREAD)
#define END_PSEUDO_ATOMIC \
stb reg_THREAD, THREAD_PSEUDO_ATOMIC_BITS_OFFSET(reg_THREAD) ; \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -198,6 +340,9 @@ x:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -197,6 +339,9 @@ x:
</span>
/* Call out to obtain our TLS block. */
load(reg_NL0,CSYMBOL(current_thread))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -822,7 +822,7 @@ index 342952dc0..982c4e7e9 100644
</span> lis reg_CFUNC,CSYMBOL(pthread_getspecific)@h
ori reg_CFUNC,reg_CFUNC,CSYMBOL(pthread_getspecific)@l
mtctr reg_CFUNC
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -228,8 +373,13 @@ x:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -227,8 +372,13 @@ x:
</span> li reg_L1,0
li reg_L2,0
li reg_LIP,0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -836,7 +836,7 @@ index 342952dc0..982c4e7e9 100644
</span> /* Turn on pseudo-atomic */
BEGIN_PSEUDO_ATOMIC
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -258,8 +408,13 @@ x:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -257,8 +407,13 @@ x:
</span> lwz reg_A3,12(reg_CFP)
/* Calculate LRA */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -850,7 +850,7 @@ index 342952dc0..982c4e7e9 100644
</span> addi reg_LRA,reg_LRA,OTHER_POINTER_LOWTAG
/* Function is an indirect closure */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -364,12 +519,22 @@ lra:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -363,12 +518,22 @@ lra:
</span>
mr reg_NL3,reg_NARGS
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/sbcl/files/1013-ppc-Darwin-Config.ppc-follow-up-changes.patch b/lang/sbcl/files/1013-ppc-Darwin-Config.ppc-follow-up-changes.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 7c054917d31..647f1eec3cb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/sbcl/files/1013-ppc-Darwin-Config.ppc-follow-up-changes.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/sbcl/files/1013-ppc-Darwin-Config.ppc-follow-up-changes.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From bf2c0c8c92ba486ee96eaf35c566461a566324fa Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 7f98f71e2337857ae237a8a52b6812f75196c105 Mon Sep 17 00:00:00 2001
</span> From: barracuda156 <vital.had@gmail.com>
Date: Mon, 5 Jun 2023 22:29:05 +0800
Subject: [PATCH] ppc/Darwin: Config.ppc: follow up changes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/sbcl/files/1014-ppc-Darwin-ppc-assem.S-fix-wrong-assembler-code-chun.patch b/lang/sbcl/files/1014-ppc-Darwin-ppc-assem.S-fix-wrong-assembler-code-chun.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index a5ba359c0ed..2863d888891 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/sbcl/files/1014-ppc-Darwin-ppc-assem.S-fix-wrong-assembler-code-chun.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/sbcl/files/1014-ppc-Darwin-ppc-assem.S-fix-wrong-assembler-code-chun.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 3f88a7fadbb1300bfd547ac028f5ade73a5d3814 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From f8f4e714cb95c859c80ba98a491a81adcc92c315 Mon Sep 17 00:00:00 2001
</span> From: barracuda156 <vital.had@gmail.com>
Date: Mon, 5 Jun 2023 22:30:34 +0800
Subject: [PATCH] ppc/Darwin: ppc-assem.S: fix wrong assembler code chunk
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,10 +8,10 @@ Subject: [PATCH] ppc/Darwin: ppc-assem.S: fix wrong assembler code chunk
</span> 1 file changed, 7 insertions(+), 5 deletions(-)
diff --git src/runtime/ppc-assem.S src/runtime/ppc-assem.S
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 982c4e7e9..200e5d2d7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index addcb5f26..b6ea7e7ab 100644
</span> --- src/runtime/ppc-assem.S
+++ src/runtime/ppc-assem.S
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -340,11 +340,13 @@ x:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -339,11 +339,13 @@ x:
</span>
/* Call out to obtain our TLS block. */
load(reg_NL0,CSYMBOL(current_thread))
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/sbcl/files/1015-ppc-Darwin-Misc-fixes-for-PPC.patch b/lang/sbcl/files/1015-ppc-Darwin-Misc-fixes-for-PPC.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index a4a46d12589..c1fc9018ad3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/sbcl/files/1015-ppc-Darwin-Misc-fixes-for-PPC.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/sbcl/files/1015-ppc-Darwin-Misc-fixes-for-PPC.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 87237363de6eea4990ce60c99622a430546819a3 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 1f5a963d585377e73eb0ba831195b680a039c16d Mon Sep 17 00:00:00 2001
</span> From: Sergey Fedorov <vital.had@gmail.com>
Date: Mon, 5 Jun 2023 22:51:40 +0800
Subject: [PATCH] ppc/Darwin: Misc fixes for PPC
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,10 +27,10 @@ index e556c133a..fc84afe4a 100644
</span> (list "-o" (namestring exefile) (namestring sourcefile)))
:search t
diff --git make-config.sh make-config.sh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 58b1fc759..c08d99f97 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e1ba149be..82329cd5e 100755
</span> --- make-config.sh
+++ make-config.sh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -741,8 +741,15 @@ case "$sbcl_arch" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -737,8 +737,15 @@ case "$sbcl_arch" in
</span> $GNUMAKE -C tools-for-build where-is-mcontext -I ../src/runtime
tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h || (echo "error running where-is-mcontext"; exit 1)
elif [ "$sbcl_os" = "darwin" ]; then
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/sbcl/files/1016-ppc-Darwin-ppc-assem-a-minor-fix-to-assembler-syntax.patch b/lang/sbcl/files/1016-ppc-Darwin-ppc-assem-a-minor-fix-to-assembler-syntax.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index a4dbbb1f37b..cb1af010146 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/sbcl/files/1016-ppc-Darwin-ppc-assem-a-minor-fix-to-assembler-syntax.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/sbcl/files/1016-ppc-Darwin-ppc-assem-a-minor-fix-to-assembler-syntax.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 051d46a18a7a0d08c39d7fefdd0b02a1d2705635 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 9cd2ef8c401ed31f7c81a52e8179b5659fbd6c08 Mon Sep 17 00:00:00 2001
</span> From: barracuda156 <vital.had@gmail.com>
Date: Tue, 6 Jun 2023 16:37:08 +0800
Subject: [PATCH] ppc/Darwin: ppc-assem: a minor fix to assembler syntax
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,10 +8,10 @@ Subject: [PATCH] ppc/Darwin: ppc-assem: a minor fix to assembler syntax
</span> 1 file changed, 7 insertions(+)
diff --git src/runtime/ppc-assem.S src/runtime/ppc-assem.S
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 200e5d2d7..d902d6e86 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b6ea7e7ab..f4799a56e 100644
</span> --- src/runtime/ppc-assem.S
+++ src/runtime/ppc-assem.S
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -302,9 +302,16 @@ x:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -301,9 +301,16 @@ x:
</span>
/* store old SP and switch to new stack */
lwz REG(10),THREAD_ALIEN_STACK_START_OFFSET(REG(3))
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/sbcl/files/1017-Fix-building-by-lisp-without-endian-features.patch b/lang/sbcl/files/1017-Fix-building-by-lisp-without-endian-features.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 78fe6f76e65..3b298f0b01f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/sbcl/files/1017-Fix-building-by-lisp-without-endian-features.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/sbcl/files/1017-Fix-building-by-lisp-without-endian-features.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 95716f150819432bcdae7b21b875a78478bac218 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 020a0fe3e2feb171405187bbd5864b32fb0b2882 Mon Sep 17 00:00:00 2001
</span> From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Thu, 8 Jun 2023 20:43:29 +0200
Subject: [PATCH] Fix building by lisp without endian features
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/sbcl/files/1018-ppc-Darwin-fix-threads-support.patch b/lang/sbcl/files/1018-ppc-Darwin-fix-threads-support.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index a35874c6c3a..40d18a4c68d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/sbcl/files/1018-ppc-Darwin-fix-threads-support.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/sbcl/files/1018-ppc-Darwin-fix-threads-support.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From fb4f79e18df14d95881f43c6c3470427c4eafa20 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From ef1377041be522069752cc5ebf74068ca9590508 Mon Sep 17 00:00:00 2001
</span> From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Sun, 11 Jun 2023 12:14:51 +0200
Subject: [PATCH] ppc/Darwin: fix threads support
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,10 +24,10 @@ index 683a93bb3..c8128cea0 100644
</span> (when (target-featurep '(:and :x86 :int4-breakpoints))
;; 0xCE is a perfectly good 32-bit instruction,
diff --git src/runtime/arch.h src/runtime/arch.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index ea1dc0a2e..ef7530c8c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f659d1248..753914c6a 100644
</span> --- src/runtime/arch.h
+++ src/runtime/arch.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -41,6 +41,10 @@ extern int arch_os_thread_init(struct thread *thread);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,6 +42,10 @@ extern int arch_os_thread_init(struct thread *thread);
</span> #if defined(LISP_FEATURE_X86) && defined(LISP_FEATURE_SB_THREAD)
extern void arch_os_load_ldt(struct thread *thread);
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,10 +39,10 @@ index ea1dc0a2e..ef7530c8c 100644
</span>
extern lispobj funcall0(lispobj function);
diff --git src/runtime/ppc-assem.S src/runtime/ppc-assem.S
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index d902d6e86..58106058c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f4799a56e..e29b7a835 100644
</span> --- src/runtime/ppc-assem.S
+++ src/runtime/ppc-assem.S
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -347,9 +347,9 @@ x:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -346,9 +346,9 @@ x:
</span>
/* Call out to obtain our TLS block. */
load(reg_NL0,CSYMBOL(current_thread))
</pre><pre style='margin:0'>
</pre>