Skip to content

Commit 98a59cf

Browse files
committed
Auto merge of #31813 - nbaksalyar:solaris-fix, r=sanxiyn
A quick fix for several issues that break a Solaris/Illumos build. Also, adds a CPU target specification (as seen in a patch for OpenBSD #31727).
2 parents e628398 + e77c79e commit 98a59cf

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

src/librustc_back/target/x86_64_sun_solaris.rs

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ use target::Target;
1313
pub fn target() -> Target {
1414
let mut base = super::solaris_base::opts();
1515
base.pre_link_args.push("-m64".to_string());
16+
base.cpu = "x86-64".to_string();
1617

1718
Target {
1819
llvm_target: "x86_64-pc-solaris".to_string(),

src/libstd/os/solaris/fs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ impl MetadataExt for Metadata {
7373
#[allow(deprecated)]
7474
fn as_raw_stat(&self) -> &raw::stat {
7575
unsafe {
76-
&*(self.as_inner().as_inner() as *const libc::stat64
76+
&*(self.as_inner().as_inner() as *const libc::stat
7777
as *const raw::stat)
7878
}
7979
}

src/libstd/sys/unix/stack_overflow.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,8 @@ mod imp {
157157
target_os = "macos",
158158
target_os = "bitrig",
159159
target_os = "netbsd",
160-
target_os = "openbsd"))]
160+
target_os = "openbsd",
161+
target_os = "solaris"))]
161162
unsafe fn get_stack() -> libc::stack_t {
162163
libc::stack_t { ss_sp: get_stackp(), ss_flags: 0, ss_size: SIGSTKSZ }
163164
}

0 commit comments

Comments
 (0)