@@ -12,7 +12,7 @@ index 823a3692fd1..00639dd8488 100644
1212 # binary.
1313 if name.endswith(".fwork"):
1414diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
15- index 99504911a3d..527c2f36dd0 100644
15+ index 378f12167c6..9f6d1dfa8cd 100644
1616--- a/Lib/ctypes/util.py
1717+++ b/Lib/ctypes/util.py
1818@@ -126,7 +126,7 @@
@@ -24,7 +24,7 @@ index 99504911a3d..527c2f36dd0 100644
2424 from ctypes.macholib.dyld import dyld_find as _dyld_find
2525 def find_library(name):
2626 possible = ['lib%s.dylib' % name,
27- @@ -425 ,7 +425 ,7 @@
27+ @@ -444 ,7 +444 ,7 @@
2828 # https://man.openbsd.org/dl_iterate_phdr
2929 # https://docs.oracle.com/cd/E88353_01/html/E37843/dl-iterate-phdr-3c.html
3030 if (os.name == "posix" and
@@ -56,10 +56,10 @@ index 8bcd741c446..d8a6f28edba 100644
5656 suffix.replace(".so", ".fwork")
5757 for suffix in _imp.extension_suffixes()
5858diff --git a/Lib/platform.py b/Lib/platform.py
59- index 7dd64de6025..a7e3c77f803 100644
59+ index 86141f072d2..04ce94fe577 100644
6060--- a/Lib/platform.py
6161+++ b/Lib/platform.py
62- @@ -528 ,6 +528 ,78 @@
62+ @@ -534 ,6 +534 ,78 @@
6363 return IOSVersionInfo(system, release, model, is_simulator)
6464
6565
@@ -138,7 +138,7 @@ index 7dd64de6025..a7e3c77f803 100644
138138 def _java_getprop(name, default):
139139 """This private helper is deprecated in 3.13 and will be removed in 3.15"""
140140 from java.lang import System
141- @@ -727 ,7 +799 ,7 @@
141+ @@ -733 ,7 +805 ,7 @@
142142 default in case the command should fail.
143143
144144 """
@@ -147,7 +147,7 @@ index 7dd64de6025..a7e3c77f803 100644
147147 # XXX Others too ?
148148 return default
149149
150- @@ -891 ,14 +963 ,30 @@
150+ @@ -897 ,14 +969 ,30 @@
151151 csid, cpu_number = vms_lib.getsyi('SYI$_CPU', 0)
152152 return 'Alpha' if cpu_number >= 128 else 'VAX'
153153
@@ -181,7 +181,7 @@ index 7dd64de6025..a7e3c77f803 100644
181181 def from_subprocess():
182182 """
183183 Fall back to `uname -p`
184- @@ -1058 ,9 +1146 ,15 @@
184+ @@ -1064 ,9 +1152 ,15 @@
185185 system = 'Android'
186186 release = android_ver().release
187187
@@ -198,7 +198,7 @@ index 7dd64de6025..a7e3c77f803 100644
198198
199199 vals = system, node, release, version, machine
200200 # Replace 'unknown' values with the more portable ''
201- @@ -1350 ,6 +1444 ,12 @@
201+ @@ -1356 ,6 +1450 ,12 @@
202202 # macOS and iOS both report as a "Darwin" kernel
203203 if sys.platform == "ios":
204204 system, release, _, _ = ios_ver()
@@ -298,10 +298,10 @@ index 1c1cbd03d02..1378985de4a 100644
298298 else:
299299 extension_loader = "ExtensionFileLoader"
300300diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
301- index 001ecec4dcd..e46a5661fe8 100644
301+ index a719e49ef37..368c1ebc9ad 100644
302302--- a/Lib/test/support/__init__.py
303303+++ b/Lib/test/support/__init__.py
304- @@ -559 ,7 +559 ,7 @@
304+ @@ -563 ,7 +563 ,7 @@
305305 sys.platform == "android", f"Android blocks {name} with SELinux"
306306 )
307307
@@ -310,7 +310,7 @@ index 001ecec4dcd..e46a5661fe8 100644
310310 unix_shell = '/system/bin/sh' if is_android else '/bin/sh'
311311 else:
312312 unix_shell = None
313- @@ -575 ,7 +575 ,7 @@
313+ @@ -582 ,7 +582 ,7 @@
314314 def skip_wasi_stack_overflow():
315315 return unittest.skipIf(is_wasi, "Exhausts stack on WASI")
316316
@@ -333,7 +333,7 @@ index 15603dc3d77..bff6c0fb95f 100644
333333 if WINDOWS:
334334 KNOWN_LIBRARIES = ["KERNEL32.DLL"]
335335diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py
336- index 719c4feace6..92a831a9148 100644
336+ index 6224c989e65..c5ccf225662 100644
337337--- a/Lib/test/test_platform.py
338338+++ b/Lib/test/test_platform.py
339339@@ -271,13 +271,21 @@
@@ -403,7 +403,7 @@ index f2e2394089d..2efbbfb0014 100644
403403 if objc:
404404 # If objc exists, we know ctypes is also importable.
405405diff --git a/Makefile.pre.in b/Makefile.pre.in
406- index 01e10d1ab20..ddc430beb80 100644
406+ index 764eef5be3e..235e829a891 100644
407407--- a/Makefile.pre.in
408408+++ b/Makefile.pre.in
409409@@ -209,6 +209,12 @@
@@ -533,7 +533,7 @@ index 1bb6a05dc11..49febd56a37 100755
533533 none--*)
534534 # None (no kernel, i.e. freestanding / bare metal),
535535diff --git a/configure b/configure
536- index 345822a6c6d..11acfe0ac9f 100755
536+ index 6383271b477..d5f4603f2fb 100755
537537--- a/configure
538538+++ b/configure
539539@@ -982,6 +982,10 @@
@@ -1229,7 +1229,7 @@ index 345822a6c6d..11acfe0ac9f 100755
12291229 "Misc/python.pc") CONFIG_FILES="$CONFIG_FILES Misc/python.pc" ;;
12301230 "Misc/python-embed.pc") CONFIG_FILES="$CONFIG_FILES Misc/python-embed.pc" ;;
12311231diff --git a/configure.ac b/configure.ac
1232- index d6059471771..7e1a5ffe604 100644
1232+ index 42d94776cc7..e86578c9660 100644
12331233--- a/configure.ac
12341234+++ b/configure.ac
12351235@@ -330,6 +330,15 @@
0 commit comments