Skip to content

Commit 75921d2

Browse files
committed
Auto merge of rust-lang#3886 - RalfJung:freebsd-pthread, r=RalfJung
support pthread primitives on FreeBSD Fixes rust-lang/miri#3571: makes out pthread implementation support FreeBSD. FreeBSD sets PHTREAD_MUTEX_DEFAULT == PHTREAD_MUTEX_ERRORCK, so the logic for handling "default vs explicitly set mutex kind" had to be adjusted. The rest is just some general cleanup of the pthread logic, and I realized that we can enable the std::sync tests on Solarish.
2 parents 8c4f055 + 2ed9188 commit 75921d2

File tree

5 files changed

+70
-131
lines changed

5 files changed

+70
-131
lines changed

src/tools/miri/ci/ci.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,10 @@ case $HOST_TARGET in
150150
# Partially supported targets (tier 2)
151151
BASIC="empty_main integer vec string btreemap hello hashmap heap_alloc align" # ensures we have the basics: stdout/stderr, system allocator, randomness (for HashMap initialization)
152152
UNIX="panic/panic panic/unwind concurrency/simple atomic libc-mem libc-misc libc-random env num_cpus" # the things that are very similar across all Unixes, and hence easily supported there
153-
TEST_TARGET=x86_64-unknown-freebsd run_tests_minimal $BASIC $UNIX threadname libc-time fs
154-
TEST_TARGET=i686-unknown-freebsd run_tests_minimal $BASIC $UNIX threadname libc-time fs
155-
TEST_TARGET=x86_64-unknown-illumos run_tests_minimal $BASIC $UNIX threadname pthread available-parallelism libc-time tls
156-
TEST_TARGET=x86_64-pc-solaris run_tests_minimal $BASIC $UNIX threadname pthread available-parallelism libc-time tls
153+
TEST_TARGET=x86_64-unknown-freebsd run_tests_minimal $BASIC $UNIX threadname pthread libc-time fs
154+
TEST_TARGET=i686-unknown-freebsd run_tests_minimal $BASIC $UNIX threadname pthread libc-time fs
155+
TEST_TARGET=x86_64-unknown-illumos run_tests_minimal $BASIC $UNIX threadname pthread sync available-parallelism libc-time tls
156+
TEST_TARGET=x86_64-pc-solaris run_tests_minimal $BASIC $UNIX threadname pthread sync available-parallelism libc-time tls
157157
TEST_TARGET=aarch64-linux-android run_tests_minimal $BASIC $UNIX
158158
TEST_TARGET=wasm32-wasip2 run_tests_minimal empty_main wasm heap_alloc libc-mem
159159
TEST_TARGET=wasm32-unknown-unknown run_tests_minimal empty_main wasm

0 commit comments

Comments
 (0)