Skip to content

[WIP] Use docker for MIPS #114

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 2 commits into from
Jan 11, 2016
Merged

[WIP] Use docker for MIPS #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cdb21e
Use docker for MIPS
Dec 25, 2015
6ac75c1
Fix mips fallout on new toolchain
Dec 27, 2015
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
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ matrix:
env: TARGET=arm-unknown-linux-gnueabihf
rust: nightly
- os: linux
env: TARGET=mips-unknown-linux-gnu
env: TARGET=mips-unknown-linux-gnu DOCKER=plhk/ubuntu-cross-mips:latest
rust: nightly
- os: linux
env: TARGET=aarch64-unknown-linux-gnu
Expand Down
2 changes: 1 addition & 1 deletion ci/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ case "$TARGET" in
;;

mips-unknown-linux-gnu)
qemu-mips -L /usr/mips-linux-gnu libc-test/target/$TARGET/debug/libc-test
qemu-mips -L /usr/mips-linux-gnu /tmp/$TARGET/debug/libc-test
;;

aarch64-unknown-linux-gnu)
Expand Down
15 changes: 8 additions & 7 deletions src/unix/notbsd/linux/mips.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ s! {
}

pub struct sigaction {
pub sa_flags: ::c_uint,
pub sa_flags: ::c_int,
pub sa_sigaction: ::sighandler_t,
pub sa_mask: sigset_t,
_restorer: *mut ::c_void,
Expand Down Expand Up @@ -190,18 +190,18 @@ pub const RLIMIT_AS: ::c_int = 6;
pub const RLIMIT_RSS: ::c_int = 7;
pub const RLIMIT_NPROC: ::c_int = 8;
pub const RLIMIT_MEMLOCK: ::c_int = 9;
pub const RLIMIT_NLIMITS: ::c_int = 15;
pub const RLIMIT_NLIMITS: ::c_int = 16;
pub const RLIM_INFINITY: ::rlim_t = 0x7fffffff;

pub const O_APPEND: ::c_int = 8;
pub const O_CREAT: ::c_int = 256;
pub const O_EXCL: ::c_int = 1024;
pub const O_NOCTTY: ::c_int = 2048;
pub const O_NONBLOCK: ::c_int = 128;
pub const O_SYNC: ::c_int = 0x10;
pub const O_RSYNC: ::c_int = 0x10;
pub const O_SYNC: ::c_int = 0x4010;
pub const O_RSYNC: ::c_int = 0x4010;
pub const O_DSYNC: ::c_int = 0x10;
pub const O_FSYNC: ::c_int = 0x10;
pub const O_FSYNC: ::c_int = 0x4010;
pub const O_ASYNC: ::c_int = 0x1000;
pub const O_NDELAY: ::c_int = 0x80;

Expand Down Expand Up @@ -357,6 +357,7 @@ pub const SIG_UNBLOCK: ::c_int = 0x2;
pub const PTHREAD_STACK_MIN: ::size_t = 131072;

pub const MS_VERBOSE: ::c_ulong = 0x8000;
pub const MS_RMT_MASK: ::c_ulong = 0x2800051;

pub const ADFS_SUPER_MAGIC: ::c_long = 0x0000adf5;
pub const AFFS_SUPER_MAGIC: ::c_long = 0x0000adff;
Expand Down Expand Up @@ -454,7 +455,7 @@ extern {
hostlen: ::socklen_t,
serv: *mut ::c_char,
sevlen: ::socklen_t,
flags: ::c_uint) -> ::c_int;
pub fn eventfd(init: ::c_int, flags: ::c_int) -> ::c_int;
flags: ::c_int) -> ::c_int;
pub fn eventfd(init: ::c_uint, flags: ::c_int) -> ::c_int;
pub fn ptrace(request: ::c_uint, ...) -> ::c_long;
}
1 change: 0 additions & 1 deletion src/unix/notbsd/linux/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,6 @@ pub const MS_RELATIME: ::c_ulong = 0x200000;
pub const MS_KERNMOUNT: ::c_ulong = 0x400000;
pub const MS_I_VERSION: ::c_ulong = 0x800000;
pub const MS_STRICTATIME: ::c_ulong = 0x01000000;
pub const MS_RMT_MASK: ::c_ulong = 0x800051;

pub const EPOLLRDHUP: ::c_int = 0x2000;
pub const EPOLLONESHOT: ::c_int = 0x40000000;
Expand Down
1 change: 1 addition & 0 deletions src/unix/notbsd/linux/musl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,7 @@ pub const EPOLLWAKEUP: ::c_int = 0x20000000;

pub const MS_NOSEC: ::c_ulong = 0x10000000;
pub const MS_BORN: ::c_ulong = 0x20000000;
pub const MS_RMT_MASK: ::c_ulong = 0x800051;

pub const MADV_HUGEPAGE: ::c_int = 14;
pub const MADV_NOHUGEPAGE: ::c_int = 15;
Expand Down
1 change: 1 addition & 0 deletions src/unix/notbsd/linux/other/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,7 @@ pub const ST_RELATIME: ::c_ulong = 4096;
pub const NI_MAXHOST: ::socklen_t = 1025;

pub const MS_VERBOSE: ::c_ulong = 0x8000;
pub const MS_RMT_MASK: ::c_ulong = 0x800051;

pub const ADFS_SUPER_MAGIC: ::c_long = 0x0000adf5;
pub const AFFS_SUPER_MAGIC: ::c_long = 0x0000adff;
Expand Down