<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/5c3f6e73788d611d28d00c723da075ce799c852e">https://github.com/macports/macports-ports/commit/5c3f6e73788d611d28d00c723da075ce799c852e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5c3f6e73788d611d28d00c723da075ce799c852e
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Mon Aug 28 15:09:21 2023 +0200

<span style='display:block; white-space:pre;color:#404040;'>    sbcl: update to 2.3.8
</span>---
 lang/sbcl/Portfile                                 |  55 +++---
 ...ONOTONIC-when-CLOCK_PROCESS_CPUTIME_ID-un.patch |  25 ---
 .../1001-x86-Darwin-Revert-x86-darwin-files.patch  |  12 +-
 ...Revert-Perform-darwin-related-housekeepin.patch |  12 +-
 ...-x86-Darwin-Remove-mach-exception-handler.patch |   6 +-
 ...recovery-support-non-dispatch-semaphores.patch} |  55 +++---
 ...use-libc-nanosleep-before-10.6-and-on-PPC.patch |  81 --------
 ...win-mask-out-O_LARGEFILE-in-fcntl.1-test.patch} |   4 +-
 ...> 1006-x86-Darwin-revert-OS_THREAD_STACK.patch} |   8 +-
 ...x86-Darwin-fix-build-by-old-preprocessor.patch} |   4 +-
 ...6-Darwin-disable-failing-stat-mode-tests.patch} |   4 +-
 ...1009-x86-Darwin-add-missed-OS_CONTEXT_PC.patch} |   4 +-
 ...atch => 1010-x86-Darwin-fix-syntax-typos.patch} |   6 +-
 ...Revert-Delete-support-for-and-darwin-ppc.patch} |  30 +--
 ...-ppc-Darwin-Config.ppc-follow-up-changes.patch} |   4 +-
 ...pc-assem.S-fix-wrong-assembler-code-chun.patch} |   8 +-
 ...ch => 1014-ppc-Darwin-Misc-fixes-for-PPC.patch} |   8 +-
 ...pc-assem-a-minor-fix-to-assembler-syntax.patch} |   8 +-
 ...building-by-lisp-without-endian-features.patch} |   4 +-
 ...h => 1017-ppc-Darwin-fix-threads-support.patch} |  12 +-
 ...-fix-build-without-legacy-support-library.patch | 218 +++++++++++++++++++++
 21 files changed, 341 insertions(+), 227 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 1cfd79fd10c..5e690d4299a 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,8 +11,8 @@ 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.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision        1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version         2.3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision        0
</span> 
 categories      lang
 license         BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,13 +34,13 @@ master_sites    sourceforge
</span> 
 use_bzip2       yes
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# See: https://github.com/catap/sbcl/tree/macports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://bugs.launchpad.net/sbcl/+bug/2033284
</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  f1e3e5b83233cd41704b0d4cdd09f5fdf8a74c81 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                sha256  698144fb805a31919a610de999ab98391d52eb698adaa8ca19b28fc6ed0d99f7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                size    7495739
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums       rmd160  03daa7508f3e99af0515b748ee644ef47000a0af \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                sha256  421571b2ac916e58be8ebcea5ef4abf8d7902863db6a1d0a5efa9500adca0d29 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                size    7562146
</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,34 +48,34 @@ checksums       rmd160  f1e3e5b83233cd41704b0d4cdd09f5fdf8a74c81 \
</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.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    version     2.3.8
</span>     revision    0
     epoch       [ expr ${epoch} + 1 ]
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    checksums   rmd160  f1e3e5b83233cd41704b0d4cdd09f5fdf8a74c81 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                sha256  698144fb805a31919a610de999ab98391d52eb698adaa8ca19b28fc6ed0d99f7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                size    7495739
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    checksums   rmd160  03daa7508f3e99af0515b748ee644ef47000a0af \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                sha256  421571b2ac916e58be8ebcea5ef4abf8d7902863db6a1d0a5efa9500adca0d29 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                size    7562146
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # See: https://github.com/sbcl/sbcl/pull/54
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # See: https://bugs.launchpad.net/sbcl/+bug/2033287
</span>     patchfiles-append \
                 1001-x86-Darwin-Revert-x86-darwin-files.patch \
                 1002-x86-Darwin-Revert-Perform-darwin-related-housekeepin.patch \
                 1003-x86-Darwin-Remove-mach-exception-handler.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                1004-Darwin-use-libc-nanosleep-before-10.6-and-on-PPC.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                1005-Darwin-recovery-support-non-dispatch-semaphores.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                1006-x86-Darwin-mask-out-O_LARGEFILE-in-fcntl.1-test.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                1007-x86-Darwin-revert-OS_THREAD_STACK.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                1008-x86-Darwin-fix-build-by-old-preprocessor.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                1009-x86-Darwin-disable-failing-stat-mode-tests.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                1010-x86-Darwin-add-missed-OS_CONTEXT_PC.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                1011-x86-Darwin-fix-syntax-typos.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                1012-ppc-Darwin-Revert-Delete-support-for-and-darwin-ppc.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                1013-ppc-Darwin-Config.ppc-follow-up-changes.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                1014-ppc-Darwin-ppc-assem.S-fix-wrong-assembler-code-chun.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                1015-ppc-Darwin-Misc-fixes-for-PPC.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                1016-ppc-Darwin-ppc-assem-a-minor-fix-to-assembler-syntax.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                1017-Fix-building-by-lisp-without-endian-features.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                1018-ppc-Darwin-fix-threads-support.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                1004-Darwin-recovery-support-non-dispatch-semaphores.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                1005-x86-Darwin-mask-out-O_LARGEFILE-in-fcntl.1-test.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                1006-x86-Darwin-revert-OS_THREAD_STACK.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                1007-x86-Darwin-fix-build-by-old-preprocessor.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                1008-x86-Darwin-disable-failing-stat-mode-tests.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                1009-x86-Darwin-add-missed-OS_CONTEXT_PC.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                1010-x86-Darwin-fix-syntax-typos.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                1011-ppc-Darwin-Revert-Delete-support-for-and-darwin-ppc.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                1012-ppc-Darwin-Config.ppc-follow-up-changes.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                1013-ppc-Darwin-ppc-assem.S-fix-wrong-assembler-code-chun.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                1014-ppc-Darwin-Misc-fixes-for-PPC.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                1015-ppc-Darwin-ppc-assem-a-minor-fix-to-assembler-syntax.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                1016-Fix-building-by-lisp-without-endian-features.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                1017-ppc-Darwin-fix-threads-support.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                1018-Darwin-fix-build-without-legacy-support-library.patch
</span> }
 
 distfiles       ${name}-${version}-source${extract.suffix}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,9 +88,6 @@ depends_skip_archcheck-append \
</span> 
 # clock_gettime
 legacysupport.newest_darwin_requires_legacy 15
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# NOTE: check that it can be removed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                0003-Use-CLOCK_MONOTONIC-when-CLOCK_PROCESS_CPUTIME_ID-un.patch
</span> 
 # Uses: __attribute__((aligned(8)))
 # See: https://bugs.launchpad.net/sbcl/+bug/1991485
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0eb1f593ed5..00000000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,25 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 5acc365e399a21f033657e2acc7d00a8274fce89 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: "Kirill A. Korinsky" <kirill@korins.ky>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 6 Jun 2023 12:08:08 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Use CLOCK_MONOTONIC when CLOCK_PROCESS_CPUTIME_ID unavailable
</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;'>- src/runtime/runtime.h | 4 ++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 4 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/runtime/runtime.h src/runtime/runtime.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e92fb7501..947abc30a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/runtime/runtime.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/runtime/runtime.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -171,4 +171,8 @@ void *os_dlsym_default(char *name); // Why not in 'os.h' ?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define NO_SANITIZE_MEMORY
</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;'>-+#ifndef CLOCK_PROCESS_CPUTIME_ID
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define CLOCK_PROCESS_CPUTIME_ID CLOCK_MONOTONIC
</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;'>- #endif /* _SBCL_RUNTIME_H_ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.41.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><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 81a65de6aee..7ec4b9ac75b 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 d13634d98f2f25bfcb6eced970f75791d6f7412e Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 4682b3e9848dab6a918f43ab866dc06f54dba071 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 bdb5fc5d4..1a0bfe41b 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 789015bd2..3820b73c0 100755
</span> --- make-config.sh
 +++ make-config.sh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -696,10 +696,6 @@ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -697,10 +697,6 @@ fi
</span>  
  case "$sbcl_arch" in
    x86)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,7 +84,7 @@ index 000000000..ffc8e2d94
</span> +GC_SRC = fullcgc.c gencgc.c traceroot.c
 diff --git src/runtime/x86-darwin-os.c src/runtime/x86-darwin-os.c
 new file mode 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 000000000..d7ab566ea
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 000000000..8605bf0b2
</span> --- /dev/null
 +++ src/runtime/x86-darwin-os.c
 @@ -0,0 +1,529 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,7 +100,7 @@ index 000000000..d7ab566ea
</span> +#include "interrupt.h"
 +#include "x86-darwin-os.h"
 +#include "genesis/fdefn.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "gc-internal.h" // for gencgc_handle_wp_violation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "gc.h" // for gencgc_handle_wp_violation
</span> +
 +#include <mach/mach.h>
 +#include <mach/mach_error.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -693,5 +693,5 @@ index 000000000..7ff303b96
</span> +
 +#endif /* _X86_DARWIN_OS_H */
 -- 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.41.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.42.0
</span> 
<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 db36bc0eec1..7b5a03e2d26 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 b8860bed397a8b760190a8b2f2f54f039aea1187 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From f053ac8ab288056da6ef6f6f178c362d074d9abd 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 87394c4f9..0bd898756 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 38fc3bf21..1d24a39aa 100644
</span> --- src/runtime/interrupt.c
 +++ src/runtime/interrupt.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1552,6 +1552,7 @@ extern int *os_context_flags_addr(os_context_t *context);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1551,6 +1551,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 87394c4f9..0bd898756 100644
</span>  
  void
  arrange_return_to_c_function(os_context_t *context,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1738,7 +1739,13 @@ arrange_return_to_c_function(os_context_t *context,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1737,7 +1738,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 87394c4f9..0bd898756 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 0ffd9e43c..da3791753 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 706c149c5..64764a272 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;background:#e0e0e0;'>@@ -203,5 +203,5 @@ index a41ded7b5..aa51fd0ba 100644
</span>  #if defined(LISP_FEATURE_FREEBSD)
  #if defined(LISP_FEATURE_RESTORE_TLS_SEGMENT_REGISTER_FROM_CONTEXT)
 -- 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.41.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.42.0
</span> 
<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 33c2e0d959e..34061d309e3 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 a84e0bc1e9bd9997d1590357012ce6c3184c3982 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 5cbbb69eb6574252804b712bf9e202fa85860ee6 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;background:#e0e0e0;'>@@ -9,7 +9,7 @@ See https://github.com/sbcl/sbcl/commit/7026bb841aa63c4d43339afb49d837a4497c468a
</span>  1 file changed, 1 insertion(+), 405 deletions(-)
 
 diff --git src/runtime/x86-darwin-os.c src/runtime/x86-darwin-os.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index d7ab566ea..133843238 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8605bf0b2..012302856 100644
</span> --- src/runtime/x86-darwin-os.c
 +++ src/runtime/x86-darwin-os.c
 @@ -81,9 +81,7 @@ int arch_os_thread_init(struct thread *thread) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -433,5 +433,5 @@ index d7ab566ea..133843238 100644
</span>  os_restore_fp_control(os_context_t *context)
  {
 -- 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.41.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.42.0
</span> 
<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/1004-Darwin-recovery-support-non-dispatch-semaphores.patch
</span>similarity index 77%
rename from lang/sbcl/files/1005-Darwin-recovery-support-non-dispatch-semaphores.patch
rename to lang/sbcl/files/1004-Darwin-recovery-support-non-dispatch-semaphores.patch
<span style='display:block; white-space:pre;color:#808080;'>index 0b060a5cf78..a8411a12169 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/1004-Darwin-recovery-support-non-dispatch-semaphores.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,49 +1,56 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 02977d6ff1441840fa0143ec509acd9bd3076e89 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From e999b5e713d94c764ada74020cbd3ce2e7162fff 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
 
 See: https://github.com/sbcl/sbcl/commit/160448fd0485daf69e81f9fe9eeb8515ed01db49
 ---
<span style='display:block; white-space:pre;background:#ffe0e0;'>- make-config.sh          |  2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ make-config.sh          |  8 ++++---
</span>  make-target-2-load.lisp |  2 ++
  src/runtime/darwin-os.c | 51 ++++++++++++++++++++++++++++++++++++++++-
  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, 60 insertions(+), 5 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6 files changed, 64 insertions(+), 7 deletions(-)
</span> 
 diff --git make-config.sh make-config.sh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index b56da3dc7..e1ba149be 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3820b73c0..40fff6c79 100755
</span> --- make-config.sh
 +++ make-config.sh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -631,7 +631,7 @@ case "$sbcl_os" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         darwin_version=`uname -r`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         darwin_version_major=${DARWIN_VERSION_MAJOR:-${darwin_version%%.*}}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         if (( 10 > $darwin_version_major )) || [ $sbcl_arch = "ppc" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            printf ' :use-darwin-nanosleep' >> $ltf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            printf ' :use-darwin-nanosleep :use-darwin-posix-semaphores' >> $ltf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -629,10 +629,12 @@ case "$sbcl_os" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         printf ' :unix :bsd :darwin :mach-o' >> $ltf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        darwin_version=`uname -r`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        darwin_version_major=${DARWIN_VERSION_MAJOR:-${darwin_version%%.*}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        if (( 10 > $darwin_version_major )) || [ $sbcl_arch = "ppc" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            printf ' :use-darwin-posix-semaphores' >> $ltf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        fi
</span>          if [ $sbcl_arch = "x86-64" ]; then
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-            darwin_version=`uname -r`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            darwin_version_major=${DARWIN_VERSION_MAJOR:-${darwin_version%%.*}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span>              if (( 8 < $darwin_version_major )); then
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                printf ' :inode64' >> $ltf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             fi
</span> diff --git make-target-2-load.lisp make-target-2-load.lisp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index c3a71bfed..629c701b6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0a10c6f67..be188f5e3 100644
</span> --- make-target-2-load.lisp
 +++ make-target-2-load.lisp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -57,6 +57,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -55,6 +55,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           ;; The final batch of symbols is strictly for C. The LISP_FEATURE_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           ;; prefix on the corresponding #define is unfortunate.
</span>            :GCC-TLS :USE-SYS-MMAP
<span style='display:block; white-space:pre;background:#ffe0e0;'>-           ;;; Enforce using of libc nanosleep on Darwin.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           :USE-DARWIN-NANOSLEEP
</span> +          ;;; Enforce using of posix semaphores on Darwin instead of dispatch.
 +          :USE-DARWIN-POSIX-SEMAPHORES
            ;; only for 'src/runtime/wrap.h'
            :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 ea248f462..2fc2bd69e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f417c8dd7..804dd9b9f 100644
</span> --- src/runtime/darwin-os.c
 +++ src/runtime/darwin-os.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -77,7 +77,7 @@ void darwin_init(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -55,7 +55,7 @@ void darwin_init(void)
</span>  }
  
  
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,7 +59,7 @@ index ea248f462..2fc2bd69e 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,55 @@ futex_wake(int *lock_word, int n)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -141,4 +141,53 @@ futex_wake(int *lock_word, int n)
</span>      return 0;
  }
  #endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,8 +113,6 @@ index ea248f462..2fc2bd69e 100644
</span> +}
 +
  #endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if !defined(LISP_FEATURE_USE_DARWIN_NANOSLEEP)
</span> diff --git src/runtime/darwin-os.h src/runtime/darwin-os.h
 index f13669fb0..dfcc9e8ea 100644
 --- src/runtime/darwin-os.h
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -129,10 +134,10 @@ 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 0833bd931..020729835 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8de5e89aa..b08f1ccc1 100644
</span> --- src/runtime/os-common.c
 +++ src/runtime/os-common.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -117,7 +117,7 @@ os_get_errno(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -120,7 +120,7 @@ os_get_errno(void)
</span>      return errno;
  }
  
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -142,10 +147,10 @@ index 0833bd931..020729835 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 6fb3a6c8d..d5d140d2f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 262896562..55c5296ca 100644
</span> --- src/runtime/os.h
 +++ src/runtime/os.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -222,7 +222,7 @@ extern char *os_get_runtime_executable_path();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -237,7 +237,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;background:#e0e0e0;'>@@ -155,5 +160,5 @@ index 6fb3a6c8d..d5d140d2f 100644
</span>       typedef sem_t os_sem_t;
  #  endif
 -- 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.41.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.42.0
</span> 
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index eac396c6af5..00000000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,81 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 04d589d2ce490a05344393af9ad85b991762550b Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: "Kirill A. Korinsky" <kirill@korins.ky>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 13 Jun 2023 23:04:30 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Darwin: use libc nanosleep before 10.6 and on PPC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-See: https://github.com/sbcl/sbcl/commit/6d28b641b659b2be6ad7b329ae09cb592c1162a1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- make-config.sh          | 8 +++++---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- make-target-2-load.lisp | 2 ++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/runtime/darwin-os.c | 4 ++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/runtime/wrap.c      | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4 files changed, 12 insertions(+), 4 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git make-config.sh make-config.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 1a0bfe41b..b56da3dc7 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- make-config.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ make-config.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -628,10 +628,12 @@ case "$sbcl_os" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     darwin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         printf ' :unix :bsd :darwin :mach-o' >> $ltf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        darwin_version=`uname -r`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        darwin_version_major=${DARWIN_VERSION_MAJOR:-${darwin_version%%.*}}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        if (( 10 > $darwin_version_major )) || [ $sbcl_arch = "ppc" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            printf ' :use-darwin-nanosleep' >> $ltf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         if [ $sbcl_arch = "x86-64" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            darwin_version=`uname -r`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            darwin_version_major=${DARWIN_VERSION_MAJOR:-${darwin_version%%.*}}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             if (( 8 < $darwin_version_major )); then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           printf ' :inode64' >> $ltf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git make-target-2-load.lisp make-target-2-load.lisp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0a10c6f67..c3a71bfed 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- make-target-2-load.lisp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ make-target-2-load.lisp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -55,6 +55,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           ;; The final batch of symbols is strictly for C. The LISP_FEATURE_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           ;; prefix on the corresponding #define is unfortunate.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           :GCC-TLS :USE-SYS-MMAP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+          ;;; Enforce using of libc nanosleep on Darwin.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+          :USE-DARWIN-NANOSLEEP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           ;; only for 'src/runtime/wrap.h'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           :OS-PROVIDES-BLKSIZE-T
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           ;; only for src/runtime/run-program.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/runtime/darwin-os.c src/runtime/darwin-os.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f00c26d0f..ea248f462 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/runtime/darwin-os.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/runtime/darwin-os.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -165,6 +165,8 @@ futex_wake(int *lock_word, int n)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</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;'>-+#if !defined(LISP_FEATURE_USE_DARWIN_NANOSLEEP)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* nanosleep() is not re-entrant on some versions of Darwin,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-  * reimplement it using the underlying syscalls. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -222,3 +224,5 @@ sb_nanosleep(time_t sec, int nsec) {
</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;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/runtime/wrap.c src/runtime/wrap.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7cdd0c801..dfad11869 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/runtime/wrap.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/runtime/wrap.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -529,7 +529,7 @@ int s_issock(mode_t mode)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* !LISP_FEATURE_WIN32 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef LISP_FEATURE_UNIX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef LISP_FEATURE_DARWIN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(LISP_FEATURE_DARWIN) && !defined(LISP_FEATURE_USE_DARWIN_NANOSLEEP)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* nanosleep() is not re-entrant on some versions of Darwin and is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-  * reimplemented using the underlying syscalls.
</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;'>-2.41.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><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/1005-x86-Darwin-mask-out-O_LARGEFILE-in-fcntl.1-test.patch
</span>similarity index 93%
rename from lang/sbcl/files/1006-x86-Darwin-mask-out-O_LARGEFILE-in-fcntl.1-test.patch
rename to lang/sbcl/files/1005-x86-Darwin-mask-out-O_LARGEFILE-in-fcntl.1-test.patch
<span style='display:block; white-space:pre;color:#808080;'>index 91b8ed0b146..1fab5ab9fcc 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/1005-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 7fbc7051b5ffd04d0841fc432ae86cb46723c2e7 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 2e4bee0f34ef4b6960935ecf05d423ebf1011d33 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;'>@@ -25,5 +25,5 @@ index 0bb8f0bd0..3d4239211 100644
</span>      (let ((fd (sb-posix:open "/dev/null" sb-posix::o-nonblock)))
        (logtest (sb-posix:fcntl fd sb-posix::f-getfl)
 -- 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.41.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.42.0
</span> 
<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/1006-x86-Darwin-revert-OS_THREAD_STACK.patch
</span>similarity index 88%
rename from lang/sbcl/files/1007-x86-Darwin-revert-OS_THREAD_STACK.patch
rename to lang/sbcl/files/1006-x86-Darwin-revert-OS_THREAD_STACK.patch
<span style='display:block; white-space:pre;color:#808080;'>index 183183b951a..feaf9b2a389 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/1006-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 cd612dce6aee6e4b608012bed2f75c04cfcbe7d0 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 98677e0daab24f4cfffcfaa1516304aaea796afa 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;background:#e0e0e0;'>@@ -11,10 +11,10 @@ See:
</span>  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git src/cold/shared.lisp src/cold/shared.lisp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4f62c6b93..683a93bb3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e8545789d..884d39dba 100644
</span> --- src/cold/shared.lisp
 +++ src/cold/shared.lisp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -302,7 +302,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -310,7 +310,7 @@
</span>            (pushnew :immobile-code sb-xc:*features*))
          (when (target-featurep :64-bit)
            (push :compact-symbol sb-xc:*features*))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,5 +24,5 @@ index 4f62c6b93..683a93bb3 100644
</span>          (when (target-featurep '(:and :x86 :int4-breakpoints))
            ;; 0xCE is a perfectly good 32-bit instruction,
 -- 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.41.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.42.0
</span> 
<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/1007-x86-Darwin-fix-build-by-old-preprocessor.patch
</span>similarity index 91%
rename from lang/sbcl/files/1008-x86-Darwin-fix-build-by-old-preprocessor.patch
rename to lang/sbcl/files/1007-x86-Darwin-fix-build-by-old-preprocessor.patch
<span style='display:block; white-space:pre;color:#808080;'>index b4752e21dab..704a8eb43b2 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/1007-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 db3f6b9074281003f057693155684098b814bf26 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From b93ef257e7e0507d18361de0f8ff89435b365d73 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;background:#e0e0e0;'>@@ -22,5 +22,5 @@ index f92bde899..0ae81e321 100644
</span>   add     8(%esp), %ecx
        add     12(%esp), %edx
 -- 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.41.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.42.0
</span> 
<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/1008-x86-Darwin-disable-failing-stat-mode-tests.patch
</span>similarity index 91%
rename from lang/sbcl/files/1009-x86-Darwin-disable-failing-stat-mode-tests.patch
rename to lang/sbcl/files/1008-x86-Darwin-disable-failing-stat-mode-tests.patch
<span style='display:block; white-space:pre;color:#808080;'>index 67942e14b15..52f6a1d7449 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/1008-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 a89cbe3a00909c47f106deea0a56dc801fd0fe32 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 2d72626e7467937cc7710cf4b549535b4d8a667b 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;'>@@ -28,5 +28,5 @@ index 3d4239211..190033f4f 100644
</span>    (with-stat-mode (mode *test-directory*)
      (sb-posix:s-isblk mode))
 -- 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.41.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.42.0
</span> 
<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/1009-x86-Darwin-add-missed-OS_CONTEXT_PC.patch
</span>similarity index 94%
rename from lang/sbcl/files/1010-x86-Darwin-add-missed-OS_CONTEXT_PC.patch
rename to lang/sbcl/files/1009-x86-Darwin-add-missed-OS_CONTEXT_PC.patch
<span style='display:block; white-space:pre;color:#808080;'>index d024a126863..4b3cf96d594 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/1009-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 1015074084bc3fed3e2c0567ad36cce92b523019 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 6215f1f8675b399ab562e7a8725f1669b637ffa3 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;background:#e0e0e0;'>@@ -33,5 +33,5 @@ index 7ff303b96..cf6487815 100644
</span>  #define ESP esp
  #define EBP ebp
 -- 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.41.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.42.0
</span> 
<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/1010-x86-Darwin-fix-syntax-typos.patch
</span>similarity index 89%
rename from lang/sbcl/files/1011-x86-Darwin-fix-syntax-typos.patch
rename to lang/sbcl/files/1010-x86-Darwin-fix-syntax-typos.patch
<span style='display:block; white-space:pre;color:#808080;'>index 3f6c95cc5ae..e50242a51cf 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/1010-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 be74b02c24671bba52a2ccc67ba8b85d0ffd9619 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 1f0a1d56721a85779e22b0b5d3aff43a62f5277f 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;background:#e0e0e0;'>@@ -8,7 +8,7 @@ Subject: [PATCH] x86/Darwin: fix syntax typos
</span>  1 file changed, 1 insertion(+), 3 deletions(-)
 
 diff --git src/runtime/x86-darwin-os.c src/runtime/x86-darwin-os.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 133843238..2527ff808 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 012302856..69585b179 100644
</span> --- src/runtime/x86-darwin-os.c
 +++ src/runtime/x86-darwin-os.c
 @@ -89,7 +89,7 @@ int arch_os_thread_init(struct thread *thread) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,5 +27,5 @@ index 133843238..2527ff808 100644
</span> -
 -#endif
 -- 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.41.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.42.0
</span> 
<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/1011-ppc-Darwin-Revert-Delete-support-for-and-darwin-ppc.patch
</span>similarity index 98%
rename from lang/sbcl/files/1012-ppc-Darwin-Revert-Delete-support-for-and-darwin-ppc.patch
rename to lang/sbcl/files/1011-ppc-Darwin-Revert-Delete-support-for-and-darwin-ppc.patch
<span style='display:block; white-space:pre;color:#808080;'>index e09b552175a..80f39156fef 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/1011-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 a80eb3d1b5097d9b428f0dc67bd5ff849087a3e3 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From f48e5f95c9410c8220b8812da88752e2210b8d39 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;'>@@ -29,7 +29,7 @@ This reverts commit 217791a738a5960092e38106e9931c424cd4ee98.
</span>  create mode 100644 src/runtime/ppc-darwin-os.h
 
 diff --git src/code/alieneval.lisp src/code/alieneval.lisp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4946312c4..3df3c6ac9 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ec19db814..cdccf5235 100644
</span> --- src/code/alieneval.lisp
 +++ src/code/alieneval.lisp
 @@ -25,7 +25,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,7 +42,7 @@ index 4946312c4..3df3c6ac9 100644
</span>          ((> bits 8) 16)
          ((> bits 1) 8)
 diff --git src/code/float-trap.lisp src/code/float-trap.lisp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 1a634d9f6..95355c0df 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 13970875d..042ea7e7e 100644
</span> --- src/code/float-trap.lisp
 +++ src/code/float-trap.lisp
 @@ -117,6 +117,8 @@ in effect."
<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 61adeff5e..0a80db4b3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5362fff5f..c350284a0 100644
</span> --- src/runtime/monitor.c
 +++ src/runtime/monitor.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -703,6 +703,10 @@ print_context(os_context_t *context)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -708,6 +708,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;'>@@ -620,10 +620,10 @@ index 94d73c343..b0b48bb48 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 ebea02ae7..addcb5f26 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ee1b891f7..0c18afe4a 100644
</span> --- src/runtime/ppc-assem.S
 +++ src/runtime/ppc-assem.S
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,8 +15,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,8 +9,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 ebea02ae7..addcb5f26 100644
</span>  #define FUNCDEF(x)       .text ; \
                        .align 3 ; \
                        .type x,@function ; \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,23 +36,52 @@ x:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,23 +30,52 @@ x:
</span>  
  #define GFUNCDEF(x)   .globl x ; \
        FUNCDEF(x)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -697,7 +697,7 @@ index ebea02ae7..addcb5f26 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;'>-@@ -49,6 +90,105 @@ x:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -43,6 +84,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 ebea02ae7..addcb5f26 100644
</span>  
  #define C_FULL_PROLOG \
        mflr 0 ; \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -140,6 +280,8 @@ x:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -134,6 +274,8 @@ x:
</span>   lwz 0,4(1) ; \
        mtlr 0 ; \
  
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -812,7 +812,7 @@ index ebea02ae7..addcb5f26 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;'>-@@ -197,6 +339,9 @@ x:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -191,6 +333,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 ebea02ae7..addcb5f26 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;'>-@@ -227,8 +372,13 @@ x:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -221,8 +366,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 ebea02ae7..addcb5f26 100644
</span>   /* Turn on pseudo-atomic */
  
        BEGIN_PSEUDO_ATOMIC
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -257,8 +407,13 @@ x:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -251,8 +401,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 ebea02ae7..addcb5f26 100644
</span>   addi reg_LRA,reg_LRA,OTHER_POINTER_LOWTAG
  
        /* Function is an indirect closure */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -363,12 +518,22 @@ lra:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -357,12 +512,22 @@ lra:
</span>  
        mr reg_NL3,reg_NARGS
  
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1158,5 +1158,5 @@ index 784c7815a..6bb6f7d0c 100644
</span>                                             '(:no-float-traps))
                                           sb-impl:+internal-features+)))
 -- 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.41.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.42.0
</span> 
<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/1012-ppc-Darwin-Config.ppc-follow-up-changes.patch
</span>similarity index 96%
rename from lang/sbcl/files/1013-ppc-Darwin-Config.ppc-follow-up-changes.patch
rename to lang/sbcl/files/1012-ppc-Darwin-Config.ppc-follow-up-changes.patch
<span style='display:block; white-space:pre;color:#808080;'>index 647f1eec3cb..8befee6dbe3 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/1012-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 7f98f71e2337857ae237a8a52b6812f75196c105 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 63b3fbb8970c10c818566784f0ad52a69a808a0d 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;background:#e0e0e0;'>@@ -64,5 +64,5 @@ index b34a07236..cb068de0c 100644
</span> -# Nothing to do.
 -after-grovel-headers:
 -- 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.41.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.42.0
</span> 
<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/1013-ppc-Darwin-ppc-assem.S-fix-wrong-assembler-code-chun.patch
</span>similarity index 89%
rename from lang/sbcl/files/1014-ppc-Darwin-ppc-assem.S-fix-wrong-assembler-code-chun.patch
rename to lang/sbcl/files/1013-ppc-Darwin-ppc-assem.S-fix-wrong-assembler-code-chun.patch
<span style='display:block; white-space:pre;color:#808080;'>index 2863d888891..cab52329ada 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/1013-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 f8f4e714cb95c859c80ba98a491a81adcc92c315 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From ea2dcfbfb3903b5bcee2dfd8839d7ffbeeed0499 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 addcb5f26..b6ea7e7ab 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0c18afe4a..24bb70657 100644
</span> --- src/runtime/ppc-assem.S
 +++ src/runtime/ppc-assem.S
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -339,11 +339,13 @@ x:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -333,11 +333,13 @@ x:
</span>  
        /* Call out to obtain our TLS block. */
        load(reg_NL0,CSYMBOL(current_thread))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,5 +31,5 @@ index addcb5f26..b6ea7e7ab 100644
</span>   bctrl
        mr reg_THREAD, reg_NL0
 -- 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.41.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.42.0
</span> 
<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/1014-ppc-Darwin-Misc-fixes-for-PPC.patch
</span>similarity index 94%
rename from lang/sbcl/files/1015-ppc-Darwin-Misc-fixes-for-PPC.patch
rename to lang/sbcl/files/1014-ppc-Darwin-Misc-fixes-for-PPC.patch
<span style='display:block; white-space:pre;color:#808080;'>index c1fc9018ad3..93a9ac07c27 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/1014-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 1f5a963d585377e73eb0ba831195b680a039c16d Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From eba446863d983e7615312882945885dafd16c762 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 e1ba149be..82329cd5e 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 40fff6c79..0d177b93a 100755
</span> --- make-config.sh
 +++ make-config.sh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -737,8 +737,15 @@ case "$sbcl_arch" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -738,8 +738,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;background:#e0e0e0;'>@@ -73,5 +73,5 @@ index 913e2c8a7..d157f6206 100755
</span>      Linux-X86)     args="-m32" ;;
      Linux-PowerPC) args="-m32" ;;
 -- 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.41.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.42.0
</span> 
<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/1015-ppc-Darwin-ppc-assem-a-minor-fix-to-assembler-syntax.patch
</span>similarity index 87%
rename from lang/sbcl/files/1016-ppc-Darwin-ppc-assem-a-minor-fix-to-assembler-syntax.patch
rename to lang/sbcl/files/1015-ppc-Darwin-ppc-assem-a-minor-fix-to-assembler-syntax.patch
<span style='display:block; white-space:pre;color:#808080;'>index cb1af010146..a65bf7c6f8d 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/1015-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 9cd2ef8c401ed31f7c81a52e8179b5659fbd6c08 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From d62a80a75ded1892db99fa93e5334c6599f560af 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 b6ea7e7ab..f4799a56e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 24bb70657..54e65aa5b 100644
</span> --- src/runtime/ppc-assem.S
 +++ src/runtime/ppc-assem.S
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -301,9 +301,16 @@ x:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -295,9 +295,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;background:#e0e0e0;'>@@ -29,5 +29,5 @@ index b6ea7e7ab..f4799a56e 100644
</span>   stwu    REG(1),-16(REG(10))
        mr      REG(1),REG(10)
 -- 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.41.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.42.0
</span> 
<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/1016-Fix-building-by-lisp-without-endian-features.patch
</span>similarity index 94%
rename from lang/sbcl/files/1017-Fix-building-by-lisp-without-endian-features.patch
rename to lang/sbcl/files/1016-Fix-building-by-lisp-without-endian-features.patch
<span style='display:block; white-space:pre;color:#808080;'>index 3b298f0b01f..f4a3cfacc6a 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/1016-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 020a0fe3e2feb171405187bbd5864b32fb0b2882 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From da3a5bce2c0aa3b2c7589390641b0ed01731c084 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;background:#e0e0e0;'>@@ -29,5 +29,5 @@ index 4edafcbf8..313036fc5 100644
</span>           (wordsize (features)
             (if (member :64-bit features) 64 32)))
 -- 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.41.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.42.0
</span> 
<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/1017-ppc-Darwin-fix-threads-support.patch
</span>similarity index 94%
rename from lang/sbcl/files/1018-ppc-Darwin-fix-threads-support.patch
rename to lang/sbcl/files/1017-ppc-Darwin-fix-threads-support.patch
<span style='display:block; white-space:pre;color:#808080;'>index 40d18a4c68d..1d0bf91a710 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/1017-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 ef1377041be522069752cc5ebf74068ca9590508 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From e195abc4dd857526921b23ce35d1fbfe90a31524 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;'>@@ -11,10 +11,10 @@ Subject: [PATCH] ppc/Darwin: fix threads support
</span>  4 files changed, 16 insertions(+), 8 deletions(-)
 
 diff --git src/cold/shared.lisp src/cold/shared.lisp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 683a93bb3..c8128cea0 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 884d39dba..f8cdfbacf 100644
</span> --- src/cold/shared.lisp
 +++ src/cold/shared.lisp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -302,7 +302,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -310,7 +310,7 @@
</span>            (pushnew :immobile-code sb-xc:*features*))
          (when (target-featurep :64-bit)
            (push :compact-symbol sb-xc:*features*))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,10 +39,10 @@ index f659d1248..753914c6a 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 f4799a56e..e29b7a835 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 54e65aa5b..93fb16425 100644
</span> --- src/runtime/ppc-assem.S
 +++ src/runtime/ppc-assem.S
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -346,9 +346,9 @@ x:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -340,9 +340,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;'>@@ -85,5 +85,5 @@ index 9258e273b..781e65250 100644
</span>  os_context_register_t   *
  os_context_register_addr(os_context_t *context, int offset)
 -- 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.41.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.42.0
</span> 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/sbcl/files/1018-Darwin-fix-build-without-legacy-support-library.patch b/lang/sbcl/files/1018-Darwin-fix-build-without-legacy-support-library.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d6696c44746
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/sbcl/files/1018-Darwin-fix-build-without-legacy-support-library.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,218 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 833b9d33bcf33b1ef4575ebc50448757feae7d6b Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: "Kirill A. Korinsky" <kirill@korins.ky>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 30 Jul 2023 11:47:32 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Darwin: fix build without legacy support library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+SBCL can be build on macOS 10.5 by avoiding two things:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+`pthread_setname_np` which is useless, and `clock_gettime` which
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+requires some works to be emulated on the right way.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ make-config.sh                   |  5 ++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/code/sunos-os.lisp           | 17 -----------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/code/unix.lisp               | 26 ++++++++++++++++++++++++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/cold/exports.lisp            |  4 ++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/runtime/runtime.c            |  7 +++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/runtime/thread.c             |  2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tests/brothertree.impure.lisp    |  4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tools-for-build/grovel-headers.c |  2 ++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8 files changed, 44 insertions(+), 23 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git make-config.sh make-config.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0d177b93a..6bf2c7ed9 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- make-config.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ make-config.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -632,7 +632,10 @@ case "$sbcl_os" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         darwin_version=`uname -r`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         darwin_version_major=${DARWIN_VERSION_MAJOR:-${darwin_version%%.*}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         if (( 10 > $darwin_version_major )) || [ $sbcl_arch = "ppc" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            printf ' :use-darwin-posix-semaphores' >> $ltf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            printf ' :use-darwin-posix-semaphores :avoid-pthread-setname-np' >> $ltf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        if (( 15 > $darwin_version_major )); then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            printf ' :avoid-clock-gettime' >> $ltf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         if [ $sbcl_arch = "x86-64" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             if (( 8 < $darwin_version_major )); then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/code/sunos-os.lisp src/code/sunos-os.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index bc096c0e6..96e0b4044 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/code/sunos-os.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/code/sunos-os.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,20 +32,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;; support for CL:MACHINE-VERSION defined OAOO elsewhere
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (defun get-machine-version ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   nil)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-(in-package "SB-UNIX")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-;; SunOS defines CLOCK_PROCESS_CPUTIME_ID but you get EINVAL if you try to use it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-(defun system-internal-run-time ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  (multiple-value-bind (utime-sec utime-usec stime-sec stime-usec)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-      (with-alien ((usage (struct sb-unix::rusage)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        (syscall* ("sb_getrusage" int (* (struct sb-unix::rusage)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                  (values (slot (slot usage 'sb-unix::ru-utime) 'sb-unix::tv-sec)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                          (slot (slot usage 'sb-unix::ru-utime) 'sb-unix::tv-usec)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                          (slot (slot usage 'sb-unix::ru-stime) 'sb-unix::tv-sec)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                          (slot (slot usage 'sb-unix::ru-stime) 'sb-unix::tv-usec))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                  rusage_self (addr usage)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    (+ (* (+ utime-sec stime-sec) internal-time-units-per-second)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-       (floor (+ utime-usec stime-usec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                 (floor microseconds-per-internal-time-unit 2))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-              microseconds-per-internal-time-unit))))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/code/unix.lisp src/code/unix.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 49777b896..3bbcd213f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/code/unix.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/code/unix.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -987,7 +987,9 @@ avoiding atexit(3) hooks, etc. Otherwise exit(2) is called."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #-win32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (progn
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  #-avoid-clock-gettime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   (declaim (inline clock-gettime))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  #-avoid-clock-gettime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   (defun clock-gettime (clockid)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     (declare (type (signed-byte 32) clockid))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     (with-alien ((ts (struct timespec)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1022,7 +1024,10 @@ the UNIX epoch (January 1st 1970.)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           ;; By scaling down we end up with far less resolution than clock-realtime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           ;; offers, and COARSE is about twice as fast, so use that, but only for linux.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           ;; BSD has something similar.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++          #-avoid-clock-gettime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           (clock-gettime #+linux clock-monotonic-coarse #-linux clock-monotonic)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++          #+avoid-clock-gettime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++          (multiple-value-bind (c-sec c-usec) (get-time-of-day) (values c-sec (* c-usec 1000)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         #+64-bit ;; I know that my math is valid for 64-bit.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         (declare (optimize (sb-c::type-check 0)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1071,12 +1076,29 @@ the UNIX epoch (January 1st 1970.)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   current)))))))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   (declaim (inline system-internal-run-time))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  #-sunos ; defined in sunos-os
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  ;; SunOS defines CLOCK_PROCESS_CPUTIME_ID but you get EINVAL if you try to use it,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  ;; also use the same trick when clock_gettime should be avoided.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  #-(or sunos avoid-clock-gettime)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   (defun system-internal-run-time ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     (multiple-value-bind (sec nsec) (clock-gettime clock-process-cputime-id)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       (+ (* sec internal-time-units-per-second)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+          (floor (+ nsec (floor nanoseconds-per-internal-time-unit 2))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                nanoseconds-per-internal-time-unit)))))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                nanoseconds-per-internal-time-unit))))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  #+(or sunos avoid-clock-gettime)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  (defun system-internal-run-time ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    (multiple-value-bind (utime-sec utime-usec stime-sec stime-usec)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        (with-alien ((usage (struct sb-unix::rusage)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++          (syscall* ("sb_getrusage" int (* (struct sb-unix::rusage)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                    (values (slot (slot usage 'sb-unix::ru-utime) 'sb-unix::tv-sec)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                            (slot (slot usage 'sb-unix::ru-utime) 'sb-unix::tv-usec)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                            (slot (slot usage 'sb-unix::ru-stime) 'sb-unix::tv-sec)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                            (slot (slot usage 'sb-unix::ru-stime) 'sb-unix::tv-usec))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                    rusage_self (addr usage)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      (+ (* (+ utime-sec stime-sec) internal-time-units-per-second)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++         (floor (+ utime-usec stime-usec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                   (floor microseconds-per-internal-time-unit 2))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                microseconds-per-internal-time-unit)))))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;; FIXME, KLUDGE: GET-TIME-OF-DAY used to be UNIX-GETTIMEOFDAY, and had a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;; primary return value indicating sucess, and also returned timezone
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/cold/exports.lisp src/cold/exports.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index efc5e9c70..906fb5710 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/cold/exports.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/cold/exports.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -86,6 +86,7 @@ interface stability.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    "ST-RDEV" "ST-SIZE" "ST-UID" "STAT" "TIME-T"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    "TIMEVAL" "TIMEZONE"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    "TIOCGPGRP"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++   #-avoid-clock-gettime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    "CLOCK-GETTIME" "TV-SEC" "TV-USEC"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    "TZ-DSTTIME" "TZ-MINUTESWEST" "UID-T" "UNIX-CLOSE"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    "UNIX-CLOSEDIR" "UNIX-DIRENT-NAME" "UNIX-DUP"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -104,8 +105,11 @@ interface stability.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    "W_OK" "X_OK"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    "SC-NPROCESSORS-ONLN"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    "VOID-SYSCALL"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++   #-avoid-clock-gettime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    "CLOCK-THREAD-CPUTIME-ID"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++   #-avoid-clock-gettime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    "CLOCK-PROCESS-CPUTIME-ID"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++   #-avoid-clock-gettime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    "CLOCK-REALTIME"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    ;; signals
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/runtime/runtime.c src/runtime/runtime.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 83cc284ee..e462a5aef 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/runtime/runtime.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/runtime/runtime.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -613,6 +613,12 @@ initialize_lisp(int argc, char *argv[], char *envp[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     struct lisp_exception_frame exception_frame;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef LISP_FEATURE_UNIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef LISP_FEATURE_AVOID_CLOCK_GETTIME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    struct timeval tv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    gettimeofday(&tv, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    lisp_init_time.tv_sec = tv.tv_sec;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    lisp_init_time.tv_nsec = tv.tv_usec * 1000;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     clock_gettime(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef LISP_FEATURE_LINUX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         CLOCK_MONOTONIC_COARSE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -620,6 +626,7 @@ initialize_lisp(int argc, char *argv[], char *envp[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         CLOCK_MONOTONIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         , &lisp_init_time);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</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;'>+     /* the name of the core file we're to execute. Note that this is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/runtime/thread.c src/runtime/thread.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d262656a8..f99022600 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/runtime/thread.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/runtime/thread.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -608,7 +608,7 @@ void sb_set_os_thread_name(char* name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+      * but my testing showed that 12.1 seems to accept any length */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     pthread_set_name_np(pthread_self(), name);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef LISP_FEATURE_DARWIN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined LISP_FEATURE_DARWIN && !defined LISP_FEATURE_AVOID_PTHREAD_SETNAME_NP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if (vector_len(v) < 64) pthread_setname_np(name);
</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;'>+diff --git tests/brothertree.impure.lisp tests/brothertree.impure.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e163b7b13..13946a908 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tests/brothertree.impure.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tests/brothertree.impure.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -158,9 +158,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         (assert (zerop n-unary-nodes)))))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (defmacro microseconds-elapsed (form)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  #+win32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  #+(or win32 avoid-clock-gettime)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   `(values 0 ,form)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  #-win32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  #-(or win32 avoid-clock-gettime)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   `(multiple-value-bind (sec0 nsec0) (sb-unix:clock-gettime sb-unix:clock-realtime)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+      (let ((result ,form))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        (multiple-value-bind (sec1 nsec1) (sb-unix:clock-gettime sb-unix:clock-realtime)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git tools-for-build/grovel-headers.c tools-for-build/grovel-headers.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 472a5bc88..bacc90dc7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools-for-build/grovel-headers.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools-for-build/grovel-headers.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -351,6 +351,7 @@ main(int argc, char __attribute__((unused)) *argv[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif // !WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     printf("\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(LISP_FEATURE_AVOID_CLOCK_GETTIME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef LISP_FEATURE_UNIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     DEFCONSTANT("clock-realtime", CLOCK_REALTIME);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     DEFCONSTANT("clock-monotonic", CLOCK_MONOTONIC);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -373,6 +374,7 @@ main(int argc, char __attribute__((unused)) *argv[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     defconstant("clock-boottime-alarn", CLOCK_BOOTTIME_ALARM);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     DEFCONSTANT("clock-thread-cputime-id", CLOCK_THREAD_CPUTIME_ID);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     printf(";;; structures\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     DEFSTRUCT(timeval, struct timeval,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-- 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.42.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>

</pre>