wip 3.14

Author: pmp-p

emsdk-cc

@@ -229,7 +229,7 @@ else:
 
         if arg.lower() in ("-fpic", "-latomic"):
             continue
-
+        # cpython use at least: -msse -msse2 -msse3 -msse4.1 -msse4.2 for HACL
         if arg.lower() in ("-msse", "-msse2", "-msse3", "-mssse3", "-msse4.1", "-msse4.2", "-msse4", "-mavx", "-mfpu=neon"):
             continue
 

scripts/cpython-build-emsdk.sh

@@ -171,13 +171,15 @@ ac_cv_func_dlopen=yes
 ac_cv_lib_ffi_ffi_call=yes
 py_cv_module__ctypes=yes
 py_cv_module__ctypes_test=yes
-ax_cv_c_float_words_bigendian=no
 ac_cv_func_sem_clockwait=no
 
 ac_cv_file__dev_ptmx=no
 ac_cv_file__dev_ptc=no
-END
+ac_cv_func_memfd_create=no
 
+ax_cv_c_float_words_bigendian=no
+# ax_cv_check_cflags__Werror__msse__msse2__msse3__msse4_1__msse4_2=no
+END
 
 
 #_ctypes _ctypes/_ctypes.c _ctypes/callbacks.c _ctypes/callproc.c _ctypes/stgdict.c _ctypes/cfield.c -ldl -lffi -DHAVE_FFI_PREP_CIF_VAR -DHAVE_FFI_PREP_CLOSURE_LOC -DHAVE_FFI_CLOSURE_ALLOC
@@ -222,11 +224,14 @@ END
 
     if [ ${PYMINOR} -ge 14 ]
     then
-
         cp Tools/wasm/config.host-wasm32-emscripten Tools/wasm/config.site-wasm32-emscripten
 
         sed -i 's|wasm32-unknown-emscripten|wasm32-bi-emscripten|g' Makefile.pre.in
         EXTRA_PYOPTS="$EXTRA_PYOPTS --disable-ipv6"
+        # no PY_CALL_TRAMPOLINE
+        sed -i 's|,__PyEM_EMSCRIPTEN_COUNT_ARGS_OFFSET||g' configure
+        sed -i 's|,__PyEM_EMSCRIPTEN_COUNT_ARGS_OFFSET||g' configure.ac
+
     else
         EXTRA_PYOPTS="$EXTRA_PYOPTS --with-emscripten-target=browser"
     fi
@@ -258,7 +263,7 @@ END
     sed -i 's|-lpthread|-lcrypto|g' Makefile
 
 
-    echo "=========== cpython build ================" 1>&2
+    echo "=========== cpython${PYMAJOR}.${PYMINOR} build ================" 1>&2
     if  emmake make -j$(nproc) WASM_ASSETS_DIR=$(realpath ${PYTHONPYCACHEPREFIX}/empty)@/
     then
         echo -n
@@ -274,22 +279,36 @@ END
     fi
     #emmake make -j1 Modules/_ctypes/_ctypes.o
 
-    echo "=========== cpython install ================" 1>&2
-    if emmake make WASM_ASSETS_DIR=$(realpath ${PYTHONPYCACHEPREFIX}/empty)@/ install
+    echo "================ cpython${PYMAJOR}.${PYMINOR} install ================" 1>&2
+    if [ ${PYMINOR} -ge 14 ]
+    then
+        if emmake make WASM_ASSETS_DIR=$(realpath ${PYTHONPYCACHEPREFIX}/empty)@/ build-details.json install
+        then
+            pushd Modules/_hacl
+            $SDKROOT/emsdk/upstream/emscripten/emar rcs ${SDKROOT}/prebuilt/emsdk/lib_hacl${PYBUILD}.a *.o
+            popd
+            touch $PREFIX/python${PYMAJOR}.${PYMINOR}
+        fi
+    else
+        if emmake make WASM_ASSETS_DIR=$(realpath ${PYTHONPYCACHEPREFIX}/empty)@/ install
+        then
+            touch $PREFIX/python${PYMAJOR}.${PYMINOR}
+        fi
+    fi
+
+
+    if [ -f $PREFIX/python${PYMAJOR}.${PYMINOR} ]
     then
-        echo "ok"
-        #cp -rf ${PREFIX}/usr/lib/python${PYMAJOR}.${PYMINOR}/* ${ROOT}/devices/$(arch)/usr/lib/python${PYMAJOR}.${PYMINOR}/
-        #rm -rf ${PREFIX}/lib/python${PYMAJOR}.${PYMINOR}
-        #ln -sf ${ROOT}/devices/$(arch)/usr/lib/python${PYMAJOR}.${PYMINOR} ${PREFIX}/lib/python${PYMAJOR}.${PYMINOR}
+        echo "cpython${PYMAJOR}.${PYMINOR} install success"
     else
         echo "
 
-     **** cpython wasm install failed ***
+     **** cpython${PYMAJOR}.${PYMINOR}-wasm install failed ***
 
-    emmake make WASM_ASSETS_DIR=$(realpath ${PYTHONPYCACHEPREFIX}/empty)@/ install
+    emmake make WASM_ASSETS_DIR=$(realpath ${PYTHONPYCACHEPREFIX}/empty)@/ build-details.json install
 
         " 1>&2
-        exit 263
+        exit 308
 
     fi
 
@@ -353,7 +372,7 @@ MODSYSCONFIG="${SDKROOT}/prebuilt/emsdk/${PYBUILD}/_sysconfigdata__emscripten_de
 cp $PREFIX/lib/python${PYBUILD}/_sysconfigdata__emscripten_wasm32-emscripten.py \
  ${MODSYSCONFIG}
 
-sed -i 's|-Os|-O0|g' ${MODSYSCONFIG}
+sed -i 's|-Os|-O2|g' ${MODSYSCONFIG}
 sed -i 's|-g0|-g3|g' ${MODSYSCONFIG}
 
 # this one is required for `python3-wasm -mbuild` venv

scripts/cpython-fetch.sh

@@ -59,6 +59,80 @@ then
 
     pushd cpython${PYBUILD}
 
+
+        patch -p1 <<END
+
+--- Python-3.14.0rc1/Python/emscripten_syscalls.c
++++ Python-3.14.0rc1-mvpbi/Python/emscripten_syscalls.c
+@@ -139,7 +139,7 @@
+                "Unexpected __wasi_iovec_t layout");
+ _Static_assert(sizeof(__wasi_iovec_t) == IOVEC_T_SIZE,
+                "Unexpected __wasi_iovec_t layout");
+-
++#ifdef __wasm_reference_types__
+ // If the stream has a readAsync handler, read to buffer defined in iovs, write
+ // number of bytes read to *nread, and return a promise that resolves to the
+ // errno. Otherwise, return null.
+@@ -285,7 +285,7 @@
+     }
+     return __block_for_int(p);
+ }
+-
++#endif // __wasm_reference_types__
+ #include <sys/ioctl.h>
+
+ int syscall_ioctl_orig(int fd, int request, void* varargs)
+END
+
+        patch -p1 <<END
+--- Python-3.14.0rc1/Modules/_hacl/include/krml/lowstar_endianness.h
++++ Python-3.14.0rc1-mvpbi/Modules/_hacl/include/krml/lowstar_endianness.h
+@@ -12,7 +12,7 @@
+ /******************************************************************************/
+
+ /* ... for Linux */
+-#if defined(__linux__) || defined(__CYGWIN__) || defined (__USE_SYSTEM_ENDIAN_H__) || defined(__GLIBC__)
++#if defined(__linux__) || defined(__CYGWIN__) || defined (__USE_SYSTEM_ENDIAN_H__) || defined(__GLIBC__) || defined(__EMSCRIPTEN__)
+ #  include <endian.h>
+
+ /* ... for OSX */
+END
+        patch -p1 <<END
+--- Python-3.14.0rc1/Modules/_hacl/libintvector.h
++++ Python-3.14.0rc1-mvpbi/Modules/_hacl/libintvector.h
+@@ -21,13 +21,28 @@
+
+ #define Lib_IntVector_Intrinsics_bit_mask64(x) -((x) & 1)
+
+-#if defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || defined(_M_IX86)
++#if defined(__wasm__) && !defined(__wasm_simd128__)
++    #define SIMDE_ENABLE_NATIVE_ALIASES
++    #define SIMDE_NO_NATIVE
++//    typedef void* Lib_IntVector_Intrinsics_vec128;
++    #define WASM_SIMD
++#endif
++
++#if defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || defined(_M_IX86) || defined(WASM_SIMD)
+
+ #if defined(HACL_CAN_COMPILE_VEC128)
+
++#if !defined(WASM_SIMD)
+ #include <emmintrin.h>
+ #include <tmmintrin.h>
+ #include <smmintrin.h>
++#else
++    #warning "Modules/_hacl: using SIMDE emulation for wasm"
++//    #include <simde/wasm/simd128.h>
++    #include <simde/x86/sse4.1.h>
++    #include <simde/x86/sse4.2.h>
++#endif
++
+
+ typedef __m128i Lib_IntVector_Intrinsics_vec128;
+
+END
+
+
         patch -p1 <<END
 --- Python-3.13.0rc3/Objects/moduleobject.c	2024-10-01 04:03:08.000000000 +0200
 +++ Python-3.13.0rc3.wasm/Objects/moduleobject.c	2024-10-02 13:16:33.030387509 +0200
@@ -75,6 +149,14 @@ then
      return 0;
 END
 
+
+
+
+
+
+
+
+
     popd
 
 fi

scripts/emsdk-fetch.sh

@@ -59,6 +59,22 @@ then
 END
             fi
 
+    # this one for debug mode and changing  -Wl,--global-base= with -sGLOBAL_BASE
+    patch -p1 <<END
+--- emsdk/upstream/emscripten/tools/link.py	2025-06-23 08:45:26.554013381 +0200
++++ emsdk.fix/upstream/emscripten/tools/link.py	2025-06-23 08:45:31.445921560 +0200
+@@ -1662,7 +1662,7 @@
+     # use a smaller LEB encoding).
+     # However, for debugability is better to have the stack come first
+     # (because stack overflows will trap rather than corrupting data).
+-    settings.STACK_FIRST = True
++    settings.STACK_FIRST = False
+
+   if state.has_link_flag('--stack-first'):
+     settings.STACK_FIRST = True
+END
+
+
         pushd upstream/emscripten
 
             echo "FIXME: applying stdio* are not const"

sources.wasm/7000-zstd.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+. scripts/emsdk-fetch.sh
+
+VERSION=1.5.7
+PKG=zstd
+
+cd ${ROOT}/src
+
+if [ -d $PKG ]
+then
+    echo "using $PKG local copy"
+else
+    wget -c https://github.com/facebook/zstd/releases/download/v${VERSION}/${PKG}-${VERSION}.tar.gz
+    tar xfz ${PKG}-${VERSION}.tar.gz
+fi
+
+if [ -f $PREFIX/lib/lib${PKG}.a ]
+then
+    echo "
+        already built in $PREFIX/lib/lib${PKG}.a
+    "
+else
+    mkdir -p $ROOT/build/${PKG}
+    pushd $ROOT/build/${PKG}
+    emcmake cmake ../../src/${PKG}-${VERSION}/build/cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_INSTALL_PREFIX=$PREFIX \
+     && emmake make install
+    popd
+fi
+
+
+

sources.wasm/8000-simde.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+PKG=simde
+
+cd ${ROOT}/src
+
+if [ -d $PKG ]
+then
+    echo "using $PKG local copy"
+else
+    git clone --no-tags --depth 1 --single-branch --branch master https://github.com/simd-everywhere/simde
+fi
+
+if [ -d $PREFIX/include/${PKG} ]
+then
+    echo "
+        $PKG already built in $PREFIX/include/${PKG}
+    "
+else
+    cp -R ${ROOT}/src/${PKG}/${PKG} $PREFIX/include/
+fi
+
+
+

support/__EMSCRIPTEN__.patches/3.14/asyncio/__init__.py

@@ -5,21 +5,52 @@
 import sys
 
 # This relies on each of the submodules having an __all__ variable.
+from . import base_events
 from .base_events import *
+
+from . import coroutines
 from .coroutines import *
+
+from . import events
 from .events import *
+
+from . import exceptions
 from .exceptions import *
+
+from . import futures
 from .futures import *
+
+from . import locks
 from .locks import *
+
+from . import protocols
 from .protocols import *
+
+from . import runners
 from .runners import *
+
+from . import queues
 from .queues import *
+
+from . import streams
 from .streams import *
+
+from . import subprocess
 from .subprocess import *
+
+from . import tasks
 from .tasks import *
+
+from . import taskgroups
 from .taskgroups import *
+
+from . import timeouts
 from .timeouts import *
+
+from . import threads
 from .threads import *
+
+from . import transports
 from .transports import *
 
 __all__ = (base_events.__all__ +
@@ -47,3 +78,31 @@
 else:
     from .unix_events import *  # pragma: no cover
     __all__ += unix_events.__all__
+
+def __getattr__(name: str):
+    import warnings
+
+    match name:
+        case "AbstractEventLoopPolicy":
+            warnings._deprecated(f"asyncio.{name}", remove=(3, 16))
+            return events._AbstractEventLoopPolicy
+        case "DefaultEventLoopPolicy":
+            warnings._deprecated(f"asyncio.{name}", remove=(3, 16))
+            if sys.platform in ['emscripten','wasi']:
+                return wasm_events._DefaultEventLoopPolicy
+            elif sys.platform == 'win32':
+                return windows_events._DefaultEventLoopPolicy
+            return unix_events._DefaultEventLoopPolicy
+        case "WindowsSelectorEventLoopPolicy":
+            if sys.platform == 'win32':
+                warnings._deprecated(f"asyncio.{name}", remove=(3, 16))
+                return windows_events._WindowsSelectorEventLoopPolicy
+            # Else fall through to the AttributeError below.
+        case "WindowsProactorEventLoopPolicy":
+            if sys.platform == 'win32':
+                warnings._deprecated(f"asyncio.{name}", remove=(3, 16))
+                return windows_events._WindowsProactorEventLoopPolicy
+            # Else fall through to the AttributeError below.
+
+    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
+