Skip to content

[compiler-rt][wasm] Compile atomic.c with atomics and bulk-memory features #89049

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[compiler-rt][wasm] Compile atomic.c with atomics and bulk-memory features #89049

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions compiler-rt/lib/builtins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,11 +854,30 @@ else ()
list(APPEND BUILTIN_CFLAGS_${arch} -fforce-enable-int128)
endif()

set(BUILTIN_OBJECT_LIBS_${arch})
# For WebAssembly, we need to compile the atomic.c with different flags than the rest
# to enable atomics and bulk-memory features only for the object file.
if((arch STREQUAL "wasm32" OR arch STREQUAL "wasm64") AND "atomic.c" IN_LIST ${arch}_SOURCES)
set(BUILTIN_ATOMIC_CFLAGS_${arch} ${BUILTIN_CFLAGS_${arch}})
list(APPEND BUILTIN_ATOMIC_CFLAGS_${arch} -matomics -mbulk-memory)
add_compiler_rt_object_libraries(clang_rt.builtins.${arch}.atomic
ARCHS ${arch}
DEPS ${deps_${arch}}
SOURCES atomic.c
DEFS ${BUILTIN_DEFS}
CFLAGS ${BUILTIN_ATOMIC_CFLAGS_${arch}})
# Include the atomic object file in the builtins archive
list(APPEND BUILTIN_OBJECT_LIBS_${arch} clang_rt.builtins.${arch}.atomic)
# Remove atomic.c from the main list of sources
list(REMOVE_ITEM ${arch}_SOURCES atomic.c)
endif()

add_compiler_rt_runtime(clang_rt.builtins
STATIC
ARCHS ${arch}
DEPS ${deps_${arch}}
SOURCES ${${arch}_SOURCES}
OBJECT_LIBS ${BUILTIN_OBJECT_LIBS_${arch}}
DEFS ${BUILTIN_DEFS}
CFLAGS ${BUILTIN_CFLAGS_${arch}}
PARENT_TARGET builtins)
Expand Down