Skip to content

Commit 6c981c7

Browse files
kateinoigakukunMaxDesiatov
authored andcommitted
[test] fix runtime unittests for single threaded runtime
Some headers switch their inline implementations based on SWIFT_STDLIB_SINGLE_THREAD_RUNTIME definition. This fixes linking failure while building runtime unittests # Conflicts: # stdlib/public/Concurrency/Mutex.cpp
1 parent 16b6fcf commit 6c981c7

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

cmake/modules/AddSwiftUnittests.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,13 @@ function(add_swift_unittest test_dirname)
6565
_ENABLE_EXTENDED_ALIGNED_STORAGE)
6666
endif()
6767

68+
# some headers switch their inline implementations based on
69+
# SWIFT_STDLIB_SINGLE_THREADED_RUNTIME definition
70+
if(SWIFT_STDLIB_SINGLE_THREADED_RUNTIME)
71+
target_compile_definitions("${test_dirname}" PRIVATE
72+
SWIFT_STDLIB_SINGLE_THREADED_RUNTIME)
73+
endif()
74+
6875
if(NOT SWIFT_COMPILER_IS_MSVC_LIKE)
6976
if(SWIFT_USE_LINKER)
7077
target_link_options(${test_dirname} PRIVATE

stdlib/public/Concurrency/Mutex.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,6 @@
1515

1616
#include "../runtime/MutexPThread.cpp"
1717
#include "../runtime/MutexWin32.cpp"
18-
1918
#ifdef SWIFT_STDLIB_SINGLE_THREADED_RUNTIME
2019
#include "swift/Runtime/MutexSingleThreaded.h"
2120
#endif
22-
23-
__attribute__ ((weak))
24-
SWIFT_NORETURN void swift::fatalError(uint32_t flags, const char *format, ...) {
25-
abort();
26-
}

0 commit comments

Comments
 (0)