Skip to content

Fix tier3s #662

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

Merged
merged 5 commits into from
Jul 9, 2017
Merged

Fix tier3s #662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fbfb70c
arm-unknown-linux-musleabi is only supported on Rust 1.14+
Susurrus Jul 9, 2017
6dd3625
Enable ioctl on mips64 and s390x
Susurrus Jul 9, 2017
38d0e55
SIGSTKFLT doesn't exist on Linux/GNU/mips(64)
Susurrus Jul 9, 2017
e359449
Enable syscalls on s390x
Susurrus Jul 9, 2017
c83b33a
Support syscalls on mips64
Susurrus Jul 9, 2017
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
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ matrix:
- env: TARGET=arm-unknown-linux-gnueabi
rust: 1.13.0
- env: TARGET=arm-unknown-linux-musleabi
rust: 1.13.0
rust: 1.14.0
- env: TARGET=armv7-unknown-linux-gnueabihf
rust: 1.13.0
- env: TARGET=i686-unknown-linux-gnu
Expand Down Expand Up @@ -131,7 +131,7 @@ matrix:
- env: TARGET=mips64el-unknown-linux-gnuabi64
rust: 1.13.0
- env: TARGET=arm-unknown-linux-musleabi
rust: 1.13.0
rust: 1.14.0
- env: TARGET=s390x-unknown-linux-gnu
rust: 1.13.0

Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ Tier 2:

Tier 3:
* aarch64-apple-ios
* arm-unknown-linux-musleabi
* arm-unknown-linux-musleabi (requires Rust >= 1.14)
* armv7-apple-ios
* armv7s-apple-ios
* i386-apple-ios
Expand Down
5 changes: 4 additions & 1 deletion src/sys/ioctl/platform/linux.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pub const NRBITS: u32 = 8;
pub const TYPEBITS: u32 = 8;

#[cfg(any(target_arch = "mips", target_arch = "powerpc", target_arch = "powerpc64"))]
#[cfg(any(target_arch = "mips", target_arch = "mips64", target_arch = "powerpc", target_arch = "powerpc64"))]
mod consts {
pub const NONE: u8 = 1;
pub const READ: u8 = 2;
Expand All @@ -12,16 +12,19 @@ mod consts {

#[cfg(not(any(target_arch = "powerpc",
target_arch = "mips",
target_arch = "mips64",
target_arch = "x86",
target_arch = "arm",
target_arch = "x86_64",
target_arch = "powerpc64",
target_arch = "s390x",
target_arch = "aarch64")))]
use this_arch_not_supported;

// "Generic" ioctl protocol
#[cfg(any(target_arch = "x86",
target_arch = "arm",
target_arch = "s390x",
target_arch = "x86_64",
target_arch = "aarch64"))]
mod consts {
Expand Down
6 changes: 3 additions & 3 deletions src/sys/signal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ pub enum Signal {
SIGPIPE = libc::SIGPIPE,
SIGALRM = libc::SIGALRM,
SIGTERM = libc::SIGTERM,
#[cfg(all(any(target_os = "linux", target_os = "android", target_os = "emscripten"), not(target_arch = "mips")))]
#[cfg(all(any(target_os = "linux", target_os = "android", target_os = "emscripten"), not(any(target_arch = "mips", target_arch = "mips64"))))]
SIGSTKFLT = libc::SIGSTKFLT,
SIGCHLD = libc::SIGCHLD,
SIGCONT = libc::SIGCONT,
Expand All @@ -58,7 +58,7 @@ pub enum Signal {

pub use self::Signal::*;

#[cfg(all(any(target_os = "linux", target_os = "android", target_os = "emscripten"), not(target_arch = "mips")))]
#[cfg(all(any(target_os = "linux", target_os = "android", target_os = "emscripten"), not(any(target_arch = "mips", target_arch = "mips64"))))]
const SIGNALS: [Signal; 31] = [
SIGHUP,
SIGINT,
Expand Down Expand Up @@ -91,7 +91,7 @@ const SIGNALS: [Signal; 31] = [
SIGIO,
SIGPWR,
SIGSYS];
#[cfg(all(any(target_os = "linux", target_os = "android", target_os = "emscripten"), target_arch = "mips"))]
#[cfg(all(any(target_os = "linux", target_os = "android", target_os = "emscripten"), any(target_arch = "mips", target_arch = "mips64")))]
const SIGNALS: [Signal; 30] = [
SIGHUP,
SIGINT,
Expand Down
22 changes: 22 additions & 0 deletions src/sys/syscall.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ mod arch {
pub static MEMFD_CREATE: Syscall = 385;
}

// Rust on mips uses the N32 ABI
#[cfg(target_arch = "mips")]
mod arch {
use libc::c_long;
Expand All @@ -54,6 +55,17 @@ mod arch {
pub static MEMFD_CREATE: Syscall = 354;
}

// Rust on mips64 uses the N64 ABI
#[cfg(target_arch = "mips64")]
mod arch {
use libc::c_long;

pub type Syscall = c_long;

pub static SYSPIVOTROOT: Syscall = 151;
pub static MEMFD_CREATE: Syscall = 314;
}

#[cfg(any(target_arch = "powerpc", target_arch = "powerpc64"))]
mod arch {
use libc::c_long;
Expand All @@ -64,6 +76,16 @@ mod arch {
pub static MEMFD_CREATE: Syscall = 360;
}

#[cfg(target_arch = "s390x")]
mod arch {
use libc::c_long;

pub type Syscall = c_long;

pub static SYSPIVOTROOT: Syscall = 217;
pub static MEMFD_CREATE: Syscall = 350;
}

extern {
pub fn syscall(num: Syscall, ...) -> c_int;
}