Ship the `llvm-addr2line` tool (#550)

Fixes #549.

.github/workflows/main.yml

@@ -169,6 +169,7 @@ jobs:
             -DCMAKE_C_COMPILER=/usr/lib/llvm-18/bin/clang \
             -DCMAKE_SYSTEM_NAME=WASI \
             -DWASI_SDK_INCLUDE_TESTS=ON \
+            -DWASI_SDK_CPU_CFLAGS="" \
             -DCMAKE_C_LINKER_DEPFILE_SUPPORTED=OFF \
             -DCMAKE_CXX_LINKER_DEPFILE_SUPPORTED=OFF
       - run: ninja -C build

README.md

@@ -85,6 +85,8 @@ in compiling WebAssembly code. Supported CMake flags are:
 * `-DWASI_SDK_DEBUG_PREFIX_MAKE=OFF` - disable `-fdebug-prefix-map` when
   building C/C++ code to use full host paths instead.
 * `-DWASI_SDK_INCLUDE_TESTS=ON` - used for building tests.
+* `-DWASI_SDK_CPU_CFLAGS=..` - used to specify CFLAGS to tweak wasm features
+  to enable/disable. The default is `-mcpu=lime1`.
 * `-DWASI_SDK_TEST_HOST_TOOLCHAIN=ON` - test the host toolchain's wasi-libc and
   sysroot libraries, don't build or use fresh libraries for tests.
 * `-DWASI_SDK_TARGETS=..` - a list of targets to build, by default all WASI
@@ -214,10 +216,21 @@ See [C setjmp/longjmp support] about setjmp/longjmp support.
 [C setjmp/longjmp support]: SetjmpLongjmp.md
 
 This repository experimentally supports __threads__ with
-`--target=wasm32-wasi-threads`. It uses WebAssembly's [threads] primitives
+`--target=wasm32-wasip1-threads`. It uses WebAssembly's [threads] primitives
 (atomics, `wait`/`notify`, shared memory) and [wasi-threads] for spawning
 threads. Note: this is experimental — do not expect long-term stability!
 
+Note that the `pthread_*` family of functions, as well as C++ threading primitives
+such as `<atomic>`, `<mutex>`, and `<thread>` are available on all targets.
+Any attempt to spawn a thread will fail on `--target=wasm32-wasip1` or
+`--target=wasm32-wasip2`, but other functionality, such as locks, still works.
+This makes it easier to port C++ codebases, as only a fraction of code needs
+to be modified to build for the single-threaded targets.
+
+Defining a macro `_WASI_STRICT_PTHREAD` will make `pthread_create`,
+`pthread_detach`, `pthread_join`, `pthread_tryjoin_np`, and `pthread_timedjoin_np`
+fail with a compile time error when building for single-threaded targets.
+
 [threads]: https://github.com/WebAssembly/threads
 [wasi-threads]: https://github.com/WebAssembly/wasi-threads
 

cmake/wasi-sdk-sysroot.cmake

@@ -24,6 +24,7 @@ option(WASI_SDK_DEBUG_PREFIX_MAP "Pass `-fdebug-prefix-map` for built artifacts"
 option(WASI_SDK_INCLUDE_TESTS "Whether or not to build tests by default" OFF)
 option(WASI_SDK_INSTALL_TO_CLANG_RESOURCE_DIR "Whether or not to modify the compiler's resource directory" OFF)
 option(WASI_SDK_LTO "Whether or not to build LTO assets" ON)
+set(WASI_SDK_CPU_CFLAGS "-mcpu=lime1" CACHE STRING "CFLAGS to specify wasm features to enable")
 
 set(wasi_tmp_install ${CMAKE_CURRENT_BINARY_DIR}/install)
 set(wasi_sysroot ${wasi_tmp_install}/share/wasi-sysroot)
@@ -87,6 +88,7 @@ function(define_compiler_rt target)
         -DCOMPILER_RT_BUILD_ORC=OFF
         -DCOMPILER_RT_BUILD_GWP_ASAN=OFF
         -DCMAKE_C_COMPILER_TARGET=${target}
+        -DCMAKE_C_FLAGS=${WASI_SDK_CPU_CFLAGS}
         -DCMAKE_INSTALL_PREFIX=${wasi_resource_dir}
     EXCLUDE_FROM_ALL ON
     USES_TERMINAL_CONFIGURE ON
@@ -161,7 +163,7 @@ function(define_wasi_libc_sub target target_suffix lto)
   get_property(directory_cflags DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY COMPILE_OPTIONS)
   list(APPEND directory_cflags -resource-dir ${wasi_resource_dir})
   set(extra_cflags_list
-    "${CMAKE_C_FLAGS} ${directory_cflags} ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE_UPPER}}")
+    "${WASI_SDK_CPU_CFLAGS} ${CMAKE_C_FLAGS} ${directory_cflags} ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE_UPPER}}")
   list(JOIN extra_cflags_list " " extra_cflags)
 
   if(${target} MATCHES threads)
@@ -222,11 +224,9 @@ execute_process(
 
 function(define_libcxx_sub target target_suffix extra_target_flags extra_libdir_suffix)
   if(${target} MATCHES threads)
-    set(threads ON)
     set(pic OFF)
     set(target_flags -pthread)
   else()
-    set(threads OFF)
     set(pic ON)
     set(target_flags "")
   endif()
@@ -240,6 +240,7 @@ function(define_libcxx_sub target target_suffix extra_target_flags extra_libdir_
   get_property(dir_compile_opts DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY COMPILE_OPTIONS)
   get_property(dir_link_opts DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY LINK_OPTIONS)
   set(extra_flags
+    ${WASI_SDK_CPU_CFLAGS}
     ${target_flags}
     --target=${target}
     ${dir_compile_opts}
@@ -262,8 +263,8 @@ function(define_libcxx_sub target target_suffix extra_target_flags extra_libdir_
       -DCMAKE_STAGING_PREFIX=${wasi_sysroot}
       -DCMAKE_POSITION_INDEPENDENT_CODE=${pic}
       -DCXX_SUPPORTS_CXX11=ON
-      -DLIBCXX_ENABLE_THREADS:BOOL=${threads}
+      -DLIBCXX_ENABLE_THREADS:BOOL=ON
-      -DLIBCXX_HAS_PTHREAD_API:BOOL=${threads}
+      -DLIBCXX_HAS_PTHREAD_API:BOOL=ON
       -DLIBCXX_HAS_EXTERNAL_THREAD_API:BOOL=OFF
       -DLIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY:BOOL=OFF
       -DLIBCXX_HAS_WIN32_THREAD_API:BOOL=OFF
@@ -280,8 +281,8 @@ function(define_libcxx_sub target target_suffix extra_target_flags extra_libdir_
       -DLIBCXXABI_ENABLE_EXCEPTIONS:BOOL=OFF
       -DLIBCXXABI_ENABLE_SHARED:BOOL=${pic}
       -DLIBCXXABI_SILENT_TERMINATE:BOOL=ON
-      -DLIBCXXABI_ENABLE_THREADS:BOOL=${threads}
+      -DLIBCXXABI_ENABLE_THREADS:BOOL=ON
-      -DLIBCXXABI_HAS_PTHREAD_API:BOOL=${threads}
+      -DLIBCXXABI_HAS_PTHREAD_API:BOOL=ON
       -DLIBCXXABI_HAS_EXTERNAL_THREAD_API:BOOL=OFF
       -DLIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY:BOOL=OFF
       -DLIBCXXABI_HAS_WIN32_THREAD_API:BOOL=OFF

cmake/wasi-sdk-toolchain.cmake

@@ -41,6 +41,7 @@ set(tools
   clang-tidy
   clang-apply-replacements
   lld
+  llvm-addr2line
   llvm-mc
   llvm-ranlib
   llvm-strip

src/wasi-libc

@@ -1 +1 @@
-Subproject commit 50ae11904df674fecaa311537967fe138c21fcc7
+Subproject commit 3f7eb4c7d6ede4dde3c4bffa6ed14e8d656fe93f