Skip to content

Commit 4dac66a

Browse files
committed
CI ?
1 parent f53e40b commit 4dac66a

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

ci/ci.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ case $HOST_TARGET in
123123
# Some targets are only partially supported.
124124
MIRI_TEST_TARGET=x86_64-unknown-freebsd run_tests_minimal hello integer vec panic/panic concurrency/simple pthread-threadname libc-getentropy libc-getrandom libc-misc libc-fs atomic env align num_cpus
125125
MIRI_TEST_TARGET=i686-unknown-freebsd run_tests_minimal hello integer vec panic/panic concurrency/simple pthread-threadname libc-getentropy libc-getrandom libc-misc libc-fs atomic env align num_cpus
126-
126+
MIRI_TEST_TARGET=x86_64-unknown-illumos run_tests_minimal no_std
127127
MIRI_TEST_TARGET=aarch64-linux-android run_tests_minimal hello integer vec panic/panic
128128
MIRI_TEST_TARGET=wasm32-wasi run_tests_minimal no_std integer strings wasm
129129
MIRI_TEST_TARGET=wasm32-unknown-unknown run_tests_minimal no_std integer strings wasm

src/shims/tls.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ impl TlsDtorsState {
238238
match &mut self.0 {
239239
Init => {
240240
match this.tcx.sess.target.os.as_ref() {
241-
"linux" | "freebsd" | "android" => {
241+
"linux" | "freebsd" | "android" | "solaris" | "illumos" => {
242242
// Run the pthread dtors.
243243
self.0 = PthreadDtors(Default::default());
244244
}

src/shims/unix/foreign_items.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
580580
}
581581
"getentropy" => {
582582
// This function is non-standard but exists with the same signature and behavior on
583-
// Linux, macOS, and FreeBSD.
583+
// Linux, macOS, FreeBSD and Solaris/Illumos.
584584
if !matches!(&*this.tcx.sess.target.os, "linux" | "macos" | "freebsd" | "illumos" | "solaris") {
585585
throw_unsup_format!(
586586
"`getentropy` is not supported on {}",
@@ -597,6 +597,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
597597
// FreeBSD: https://man.freebsd.org/cgi/man.cgi?query=getentropy&sektion=3&format=html
598598
// Linux: https://man7.org/linux/man-pages/man3/getentropy.3.html
599599
// macOS: https://keith.github.io/xcode-man-pages/getentropy.2.html
600+
// Solaris/Illumos: https://illumos.org/man/3C/getentropy
600601
if bufsize > 256 {
601602
let err = this.eval_libc("EIO");
602603
this.set_last_error(err)?;

tests/pass-dep/shims/libc-misc.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,12 @@ fn test_sync_file_range() {
153153

154154
/// Tests whether each thread has its own `__errno_location`.
155155
fn test_thread_local_errno() {
156+
#[cfg(any(target_os = "solaris", target_os = "illumos"))]
157+
use libc::__errno as __errno_location;
156158
#[cfg(target_os = "linux")]
157159
use libc::__errno_location;
158160
#[cfg(any(target_os = "macos", target_os = "freebsd"))]
159161
use libc::__error as __errno_location;
160-
#[cfg(any(target_os = "solaris", target_os = "illumos"))]
161-
use libc::__errno as __errno_location;
162162

163163
unsafe {
164164
*__errno_location() = 0xBEEF;

0 commit comments

Comments
 (0)