llvm17: changes to make cpython build with latest wasi-libc

csegarragonz · csegarragonz · commit 7e1130ff2499 · 2024-02-19T16:11:09.000Z
diff --git a/Modules/Setup.local b/Modules/Setup.local
@@ -40,7 +40,7 @@ _decimal _decimal/_decimal.c _decimal/libmpdec/basearith.c _decimal/libmpdec/con
 # ctypes module - flags and sources derived from pyodide
 # https://github.com/pyodide/pyodide/blob/main/cpython/Setup.local#L22-L23
 CTYPES_FLAGS=-DHAVE_FFI_PREP_CIF_VAR=1 -DHAVE_FFI_PREP_CLOSURE_LOC=1 -DHAVE_FFI_CLOSURE_ALLOC=1
-_ctypes _ctypes/_ctypes.c _ctypes/callbacks.c _ctypes/callproc.c _ctypes/cfield.c _ctypes/stgdict.c $(CTYPES_FLAGS) -L/usr/local/faasm/llvm-sysroot/lib/wasm32-wasi -lffi
+_ctypes _ctypes/_ctypes.c _ctypes/callbacks.c _ctypes/callproc.c _ctypes/cfield.c _ctypes/stgdict.c $(CTYPES_FLAGS) -lffi
 
 # Hashing support - build statically as pyodide does
 # https://github.com/pyodide/pyodide/blob/main/cpython/Setup.local#L37-L42
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
@@ -1765,10 +1765,10 @@ PyInit_time(void)
 #if defined(HAVE_CLOCK_GETTIME) || defined(HAVE_CLOCK_SETTIME) || defined(HAVE_CLOCK_GETRES)
 
 #ifdef CLOCK_REALTIME
-    PyModule_AddIntMacro(m, CLOCK_REALTIME);
+    PyModule_AddIntMacro(m, (long) CLOCK_REALTIME);
 #endif
 #ifdef CLOCK_MONOTONIC
-    PyModule_AddIntMacro(m, CLOCK_MONOTONIC);
+    PyModule_AddIntMacro(m, (long) CLOCK_MONOTONIC);
 #endif
 #ifdef CLOCK_MONOTONIC_RAW
     PyModule_AddIntMacro(m, CLOCK_MONOTONIC_RAW);
diff --git a/config.sub b/config.sub
@@ -118,7 +118,7 @@ case $maybe_os in
   linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
   knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
   kopensolaris*-gnu* | cloudabi*-eabi* | \
-  storm-chaos* | os2-emx* | rtmk-nova* | wasi )
+  storm-chaos* | os2-emx* | rtmk-nova* | wasi* )
     os=-$maybe_os
     basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
