@@ -325,7 +325,7 @@ index ebe3711827..ea00c3176d 100644
325
325
return f"{osname}-{release}-{machine}"
326
326
327
327
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
328
- index 39b3530905..ef1fa18624 100644
328
+ index 46087a98a2..ea8c228f65 100644
329
329
--- a/Lib/test/support/__init__.py
330
330
+++ b/Lib/test/support/__init__.py
331
331
@@ -47,7 +47,7 @@
@@ -459,7 +459,7 @@ index 05d9107b28..6df2bcf163 100644
459
459
proto = MyProto(loop=self.loop)
460
460
server, path = self._make_ssl_unix_server(
461
461
diff --git a/Lib/test/test_asyncio/test_streams.py b/Lib/test/test_asyncio/test_streams.py
462
- index 098a0da344..65aa7abe7c 100644
462
+ index 0c49099bc4..c972bade4b 100644
463
463
--- a/Lib/test/test_asyncio/test_streams.py
464
464
+++ b/Lib/test/test_asyncio/test_streams.py
465
465
@@ -17,6 +17,7 @@
@@ -587,7 +587,7 @@ index daccbae5b4..607e40eb66 100644
587
587
'largefile',
588
588
'test requires %s bytes and a long time to run' % self.LARGE)
589
589
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
590
- index 71926a5432..0ef83b9f51 100644
590
+ index 350f4a57e2..54ef53a4c1 100644
591
591
--- a/Lib/test/test_logging.py
592
592
+++ b/Lib/test/test_logging.py
593
593
@@ -43,6 +43,7 @@
@@ -797,7 +797,7 @@ index a2c4ab5081..45927b3163 100644
797
797
'need os.get_terminal_size()')
798
798
def test_stty_match(self):
799
799
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
800
- index 72e3394df2..832ee517f6 100644
800
+ index b07954989f..ac634d421c 100644
801
801
--- a/Lib/test/test_socket.py
802
802
+++ b/Lib/test/test_socket.py
803
803
@@ -1,5 +1,6 @@
@@ -816,7 +816,7 @@ index 72e3394df2..832ee517f6 100644
816
816
# avoid the 'echo' service on this platform, as there is an
817
817
# assumption breaking non-standard port/protocol entry
818
818
services = ('daytime', 'qotd', 'domain')
819
- @@ -3552 ,7 +3553 ,7 @@
819
+ @@ -3563 ,7 +3564 ,7 @@
820
820
def _testFDPassCMSG_LEN(self):
821
821
self.createAndSendFDs(1)
822
822
@@ -825,7 +825,7 @@ index 72e3394df2..832ee517f6 100644
825
825
@unittest.skipIf(AIX, "skipping, see issue #22397")
826
826
@requireAttrs(socket, "CMSG_SPACE")
827
827
def testFDPassSeparate(self):
828
- @@ -3563 ,7 +3564 ,7 @@
828
+ @@ -3574 ,7 +3575 ,7 @@
829
829
maxcmsgs=2)
830
830
831
831
@testFDPassSeparate.client_skip
@@ -834,7 +834,7 @@ index 72e3394df2..832ee517f6 100644
834
834
@unittest.skipIf(AIX, "skipping, see issue #22397")
835
835
def _testFDPassSeparate(self):
836
836
fd0, fd1 = self.newFDs(2)
837
- @@ -3576 ,7 +3577 ,7 @@
837
+ @@ -3587 ,7 +3588 ,7 @@
838
838
array.array("i", [fd1]))]),
839
839
len(MSG))
840
840
@@ -843,7 +843,7 @@ index 72e3394df2..832ee517f6 100644
843
843
@unittest.skipIf(AIX, "skipping, see issue #22397")
844
844
@requireAttrs(socket, "CMSG_SPACE")
845
845
def testFDPassSeparateMinSpace(self):
846
- @@ -3590 ,7 +3591 ,7 @@
846
+ @@ -3601 ,7 +3602 ,7 @@
847
847
maxcmsgs=2, ignoreflags=socket.MSG_CTRUNC)
848
848
849
849
@testFDPassSeparateMinSpace.client_skip
@@ -852,7 +852,7 @@ index 72e3394df2..832ee517f6 100644
852
852
@unittest.skipIf(AIX, "skipping, see issue #22397")
853
853
def _testFDPassSeparateMinSpace(self):
854
854
fd0, fd1 = self.newFDs(2)
855
- @@ -3614 ,7 +3615 ,7 @@
855
+ @@ -3625 ,7 +3626 ,7 @@
856
856
nbytes = self.sendmsgToServer([msg])
857
857
self.assertEqual(nbytes, len(msg))
858
858
@@ -861,7 +861,7 @@ index 72e3394df2..832ee517f6 100644
861
861
def testFDPassEmpty(self):
862
862
# Try to pass an empty FD array. Can receive either no array
863
863
# or an empty array.
864
- @@ -4434 ,28 +4435 ,33 @@
864
+ @@ -4445 ,28 +4446 ,33 @@
865
865
pass
866
866
867
867
@requireAttrs(socket.socket, "sendmsg")
@@ -1239,7 +1239,7 @@ index 9132f13e81..36e00f7bfd 100644
1239
1239
1240
1240
1241
1241
diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c
1242
- index 3026bb6a34..42f503abe6 100644
1242
+ index 4847c1cb87..4a4c890846 100644
1243
1243
--- a/Modules/faulthandler.c
1244
1244
+++ b/Modules/faulthandler.c
1245
1245
@@ -1,3 +1,7 @@
@@ -1742,7 +1742,7 @@ index d74fb6deac..a30f74f03d 100755
1742
1742
# Blank kernel with real OS is always fine.
1743
1743
;;
1744
1744
diff --git a/configure b/configure
1745
- index 91227f00be..d75c8c48fc 100755
1745
+ index 784f8d3060..2ca708e27b 100755
1746
1746
--- a/configure
1747
1747
+++ b/configure
1748
1748
@@ -836,6 +836,8 @@
@@ -2316,7 +2316,7 @@ index 91227f00be..d75c8c48fc 100755
2316
2316
2317
2317
2318
2318
diff --git a/configure.ac b/configure.ac
2319
- index 77fb609b74..72acc6e054 100644
2319
+ index ab5e1de6fa..99d3147959 100644
2320
2320
--- a/configure.ac
2321
2321
+++ b/configure.ac
2322
2322
@@ -545,6 +545,15 @@
@@ -2452,15 +2452,6 @@ index 77fb609b74..72acc6e054 100644
2452
2452
fi
2453
2453
AC_SUBST(READELF)
2454
2454
2455
- @@ -2066,7 +2138,7 @@
2456
- dnl build with WASM debug info if either Py_DEBUG is set or the target is
2457
- dnl node-debug or browser-debug.
2458
- AS_VAR_IF([Py_DEBUG], [yes], [wasm_debug=yes], [wasm_debug=no])
2459
- -
2460
- +
2461
- dnl Start with 20 MB and allow to grow
2462
- AS_VAR_APPEND([LDFLAGS_NODIST], [" -sALLOW_MEMORY_GROWTH -sTOTAL_MEMORY=20971520"])
2463
-
2464
2455
@@ -3129,6 +3201,9 @@
2465
2456
BLDSHARED="$LDSHARED"
2466
2457
fi
0 commit comments