@@ -12,7 +12,7 @@ index 823a3692fd1..00639dd8488 100644
12
12
# binary.
13
13
if name.endswith(".fwork"):
14
14
diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
15
- index 99504911a3d..527c2f36dd0 100644
15
+ index 378f12167c6..9f6d1dfa8cd 100644
16
16
--- a/Lib/ctypes/util.py
17
17
+++ b/Lib/ctypes/util.py
18
18
@@ -126,7 +126,7 @@
@@ -24,7 +24,7 @@ index 99504911a3d..527c2f36dd0 100644
24
24
from ctypes.macholib.dyld import dyld_find as _dyld_find
25
25
def find_library(name):
26
26
possible = ['lib%s.dylib' % name,
27
- @@ -425 ,7 +425 ,7 @@
27
+ @@ -444 ,7 +444 ,7 @@
28
28
# https://man.openbsd.org/dl_iterate_phdr
29
29
# https://docs.oracle.com/cd/E88353_01/html/E37843/dl-iterate-phdr-3c.html
30
30
if (os.name == "posix" and
@@ -56,10 +56,10 @@ index 8bcd741c446..d8a6f28edba 100644
56
56
suffix.replace(".so", ".fwork")
57
57
for suffix in _imp.extension_suffixes()
58
58
diff --git a/Lib/platform.py b/Lib/platform.py
59
- index 7dd64de6025..a7e3c77f803 100644
59
+ index 86141f072d2..04ce94fe577 100644
60
60
--- a/Lib/platform.py
61
61
+++ b/Lib/platform.py
62
- @@ -528 ,6 +528 ,78 @@
62
+ @@ -534 ,6 +534 ,78 @@
63
63
return IOSVersionInfo(system, release, model, is_simulator)
64
64
65
65
@@ -138,7 +138,7 @@ index 7dd64de6025..a7e3c77f803 100644
138
138
def _java_getprop(name, default):
139
139
"""This private helper is deprecated in 3.13 and will be removed in 3.15"""
140
140
from java.lang import System
141
- @@ -727 ,7 +799 ,7 @@
141
+ @@ -733 ,7 +805 ,7 @@
142
142
default in case the command should fail.
143
143
144
144
"""
@@ -147,7 +147,7 @@ index 7dd64de6025..a7e3c77f803 100644
147
147
# XXX Others too ?
148
148
return default
149
149
150
- @@ -891 ,14 +963 ,30 @@
150
+ @@ -897 ,14 +969 ,30 @@
151
151
csid, cpu_number = vms_lib.getsyi('SYI$_CPU', 0)
152
152
return 'Alpha' if cpu_number >= 128 else 'VAX'
153
153
@@ -181,7 +181,7 @@ index 7dd64de6025..a7e3c77f803 100644
181
181
def from_subprocess():
182
182
"""
183
183
Fall back to `uname -p`
184
- @@ -1058 ,9 +1146 ,15 @@
184
+ @@ -1064 ,9 +1152 ,15 @@
185
185
system = 'Android'
186
186
release = android_ver().release
187
187
@@ -198,7 +198,7 @@ index 7dd64de6025..a7e3c77f803 100644
198
198
199
199
vals = system, node, release, version, machine
200
200
# Replace 'unknown' values with the more portable ''
201
- @@ -1350 ,6 +1444 ,12 @@
201
+ @@ -1356 ,6 +1450 ,12 @@
202
202
# macOS and iOS both report as a "Darwin" kernel
203
203
if sys.platform == "ios":
204
204
system, release, _, _ = ios_ver()
@@ -298,10 +298,10 @@ index 1c1cbd03d02..1378985de4a 100644
298
298
else:
299
299
extension_loader = "ExtensionFileLoader"
300
300
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
301
- index 001ecec4dcd..e46a5661fe8 100644
301
+ index a719e49ef37..368c1ebc9ad 100644
302
302
--- a/Lib/test/support/__init__.py
303
303
+++ b/Lib/test/support/__init__.py
304
- @@ -559 ,7 +559 ,7 @@
304
+ @@ -563 ,7 +563 ,7 @@
305
305
sys.platform == "android", f"Android blocks {name} with SELinux"
306
306
)
307
307
@@ -310,7 +310,7 @@ index 001ecec4dcd..e46a5661fe8 100644
310
310
unix_shell = '/system/bin/sh' if is_android else '/bin/sh'
311
311
else:
312
312
unix_shell = None
313
- @@ -575 ,7 +575 ,7 @@
313
+ @@ -582 ,7 +582 ,7 @@
314
314
def skip_wasi_stack_overflow():
315
315
return unittest.skipIf(is_wasi, "Exhausts stack on WASI")
316
316
@@ -333,7 +333,7 @@ index 15603dc3d77..bff6c0fb95f 100644
333
333
if WINDOWS:
334
334
KNOWN_LIBRARIES = ["KERNEL32.DLL"]
335
335
diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py
336
- index 719c4feace6..92a831a9148 100644
336
+ index 6224c989e65..c5ccf225662 100644
337
337
--- a/Lib/test/test_platform.py
338
338
+++ b/Lib/test/test_platform.py
339
339
@@ -271,13 +271,21 @@
@@ -403,7 +403,7 @@ index f2e2394089d..2efbbfb0014 100644
403
403
if objc:
404
404
# If objc exists, we know ctypes is also importable.
405
405
diff --git a/Makefile.pre.in b/Makefile.pre.in
406
- index 01e10d1ab20..ddc430beb80 100644
406
+ index 764eef5be3e..235e829a891 100644
407
407
--- a/Makefile.pre.in
408
408
+++ b/Makefile.pre.in
409
409
@@ -209,6 +209,12 @@
@@ -533,7 +533,7 @@ index 1bb6a05dc11..49febd56a37 100755
533
533
none--*)
534
534
# None (no kernel, i.e. freestanding / bare metal),
535
535
diff --git a/configure b/configure
536
- index 345822a6c6d..11acfe0ac9f 100755
536
+ index 6383271b477..d5f4603f2fb 100755
537
537
--- a/configure
538
538
+++ b/configure
539
539
@@ -982,6 +982,10 @@
@@ -1229,7 +1229,7 @@ index 345822a6c6d..11acfe0ac9f 100755
1229
1229
"Misc/python.pc") CONFIG_FILES="$CONFIG_FILES Misc/python.pc" ;;
1230
1230
"Misc/python-embed.pc") CONFIG_FILES="$CONFIG_FILES Misc/python-embed.pc" ;;
1231
1231
diff --git a/configure.ac b/configure.ac
1232
- index d6059471771..7e1a5ffe604 100644
1232
+ index 42d94776cc7..e86578c9660 100644
1233
1233
--- a/configure.ac
1234
1234
+++ b/configure.ac
1235
1235
@@ -330,6 +330,15 @@
0 commit comments