[NativeAOT-LLVM] Clean up WASI build (#3149)

* Clean up WASI build

* More python workarounds

Author: SingleAccretion

eng/native/configurecompiler.cmake

@@ -142,13 +142,6 @@ elseif (CLR_CMAKE_HOST_UNIX)
   # Use uppercase CMAKE_BUILD_TYPE for the string comparisons below
   string(TOUPPER ${CMAKE_BUILD_TYPE} UPPERCASE_CMAKE_BUILD_TYPE)
 
-  if(CLR_CMAKE_HOST_BROWSER OR CLR_CMAKE_HOST_WASI)
-    # The emscripten build has additional warnings so -Werror breaks
-    add_compile_options(-Wno-unused-parameter)
-    add_compile_options(-Wno-alloca)
-    add_compile_options(-Wno-implicit-int-float-conversion)
-  endif()
-
   if (CMAKE_USE_PTHREADS AND CLR_CMAKE_HOST_BROWSER)
     add_compile_options(-pthread)
   endif(CMAKE_USE_PTHREADS AND CLR_CMAKE_HOST_BROWSER)
@@ -523,7 +516,7 @@ endif ()
 #--------------------------------------
 # Compile Options
 #--------------------------------------
-if (CLR_CMAKE_HOST_UNIX)
+if (CLR_CMAKE_HOST_UNIX OR CLR_CMAKE_HOST_WASI)
   # Disable frame pointer optimizations so profilers can get better call stacks
   add_compile_options(-fno-omit-frame-pointer)
 
@@ -701,16 +694,7 @@ if (CLR_CMAKE_HOST_UNIX)
     endif()
   endif(CLR_CMAKE_HOST_MACCATALYST)
 
-endif(CLR_CMAKE_HOST_UNIX)
-
-if(CLR_CMAKE_HOST_WASI)
-  # TODO-LLVM: deduplicate with the suppressions above (WASI is not "Unix").
-  add_compile_options(-Wno-unused-variable)
-  add_compile_options(-Wno-unused-value)
-  add_compile_options(-Wno-unused-function)
-  add_compile_options(-Wno-tautological-compare)
-  add_compile_options(-Wno-invalid-offsetof)
-endif()
+endif(CLR_CMAKE_HOST_UNIX OR CLR_CMAKE_HOST_WASI)
 
 if(CLR_CMAKE_TARGET_UNIX)
   add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:IGNORE_DEFAULT_TARGET_OS>>>:TARGET_UNIX>)
@@ -751,12 +735,7 @@ if(CLR_CMAKE_TARGET_UNIX)
   endif()
 elseif(CLR_CMAKE_TARGET_WASI)
   add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:IGNORE_DEFAULT_TARGET_OS>>>:TARGET_WASI>)
-  if (CLR_CMAKE_TARGET_OS STREQUAL wasi)
-    add_definitions(-D_WASI_EMULATED_PROCESS_CLOCKS -D_WASI_EMULATED_SIGNAL -D_WASI_EMULATED_GETPID -D_GNU_SOURCE)
-    # no-unsafe-buffer-usage for pal_random.c
-    # no-unused-macros for _version.c
-    add_compile_options(-Wno-deprecated-declarations -Wno-unsafe-buffer-usage -Wno-unused-macros)
-  endif ()
+  add_compile_definitions(_WASI_EMULATED_PROCESS_CLOCKS _WASI_EMULATED_SIGNAL _WASI_EMULATED_GETPID _GNU_SOURCE)
 else(CLR_CMAKE_TARGET_UNIX)
   add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:IGNORE_DEFAULT_TARGET_OS>>>:TARGET_WINDOWS>)
 endif(CLR_CMAKE_TARGET_UNIX)

src/coreclr/nativeaot/Bootstrap/base/CMakeLists.txt

@@ -9,7 +9,7 @@ set_target_properties(bootstrapper PROPERTIES OUTPUT_NAME bootstrapper)
 
 install_bootstrapper_object(bootstrapper aotsdk)
 
-if (CLR_CMAKE_HOST_UNIX)
+if (CLR_CMAKE_HOST_UNIX OR CLR_CMAKE_HOST_WASI)
   add_library(stdc++compat STATIC ../stdcppshim.cpp)
   install_static_library(stdc++compat aotsdk nativeaot)
 endif()

src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets

@@ -620,7 +620,7 @@ The .NET Foundation licenses this file to you under the MIT license.
 
     <ItemGroup Condition="'$(_targetOS)' == 'wasi'" >
       <CustomLinkerArg Include="@(_CustomLinkerArgExport->'-Wl,--export=%(Identity)')" />
-      <CustomLinkerArg Include="-lstdc++;-lwasi-emulated-process-clocks;-lwasi-emulated-signal;-lwasi-emulated-mman;-lwasi-emulated-getpid" />
+      <CustomLinkerArg Include="-lstdc++;-lwasi-emulated-process-clocks;-lwasi-emulated-signal;-lwasi-emulated-mman;-lwasi-emulated-getpid;-lwasi-emulated-pthread" />
       <CustomLinkerArg Include="-Wl,--max-memory=2147483648" />
       <CustomLinkerArg Include="-Wl,--global-base=$(IlcWasmGlobalBase)" />
       <CustomLinkerArg Include="-Wl,-z,stack-size=$(IlcWasmStackSize)" />

src/coreclr/nativeaot/Runtime/CMakeLists.txt

@@ -137,10 +137,6 @@ else()
 
   include(${GC_DIR}/unix/configure.cmake)
 
-  if(CLR_CMAKE_TARGET_ARCH_WASM)
-    include_directories($ENV{EMSCRIPTEN/system/lib/libcxxabi/include})
-  endif()
-
   # Disable building _Unwind_XXX style APIs of libunwind, since we don't use them.
   add_definitions(-D_LIBUNWIND_DISABLE_ZERO_COST_APIS=1)
 

src/coreclr/nativeaot/Runtime/wasm/PalRedhawkWasm.cpp

@@ -46,102 +46,6 @@ void PalGetMaximumStackBounds_SingleThreadedWasm(void** ppStackLowOut, void** pp
 }
 
 #ifdef TARGET_WASI
-// No-op stubs that assume a single-threaded environment.
-int pthread_mutex_init(pthread_mutex_t *, const pthread_mutexattr_t *)
-{
-    return 0;
-}
-
-int pthread_mutexattr_init(pthread_mutexattr_t *)
-{
-    return 0;
-}
-
-int pthread_mutexattr_settype(pthread_mutexattr_t *, int)
-{
-    return 0;
-}
-
-int pthread_mutex_destroy(pthread_mutex_t *)
-{
-    return 0;
-}
-
-int pthread_mutexattr_destroy(pthread_mutexattr_t *)
-{
-    return 0;
-}
-
-int pthread_cond_init(pthread_cond_t *, const pthread_condattr_t *)
-{
-    return 0;
-}
-
-int pthread_cond_destroy(pthread_cond_t *)
-{
-    return 0;
-}
-
-int pthread_cond_wait(pthread_cond_t *, pthread_mutex_t *)
-{
-    return 0;
-}
-
-int pthread_cond_timedwait(pthread_cond_t *, pthread_mutex_t *, const struct timespec *)
-{
-    return 0;
-}
-
-int pthread_condattr_init(pthread_condattr_t *)
-{
-    return 0;
-}
-
-int pthread_mutex_lock(pthread_mutex_t *)
-{
-    return 0;
-}
-
-int pthread_mutex_unlock(pthread_mutex_t *)
-{
-    return 0;
-}
-
-pthread_t pthread_self(void)
-{
-    return (pthread_t)0;
-}
-
-int pthread_equal(pthread_t, pthread_t)
-{
-    return 1; // only one thread
-}
-
-int pthread_attr_init(pthread_attr_t *)
-{
-    return 0;
-}
-
-int pthread_attr_destroy(pthread_attr_t *)
-{
-    return 0;
-}
-
-int pthread_condattr_destroy(pthread_condattr_t *)
-{
-    return 0;
-}
-
-int pthread_cond_broadcast(pthread_cond_t *)
-{
-    return 0;
-}
-
-int pthread_attr_setdetachstate(pthread_attr_t *, int)
-{
-    return 0;
-}
-
 using Dtor = void(*)(void*);
 
 // Due to a bug in the toolchain, we have to provide an implementation of thread-local destruction.

src/coreclr/vm/eventing/EtwProvider/CMakeLists.txt

@@ -1,5 +1,10 @@
 include(FindPython)
 
+# Workaround from https://github.com/dotnet/runtime/pull/117513
+if (NOT "$ENV{EMSDK_PYTHON}" STREQUAL "")
+  set(Python_EXECUTABLE "$ENV{EMSDK_PYTHON}")
+endif()
+
 set(ETW_PROVIDER_SCRIPT ${CLR_DIR}/scripts/genEtwProvider.py)
 
 set (ETW_PROVIDER_OUTPUTS