Skip to content

Merging more PRs in the queue #216

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
Mar 7, 2016
Merged

Merging more PRs in the queue #216

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
0b0a17d
Fix SYS_gettid type to match first argument of syscall.
dhylands Mar 6, 2016
8ad2520
musl: opt for dynamic linking for arm arch
joerg-krause Mar 6, 2016
f5885ee
Add utimensat
fpgaminer Mar 7, 2016
ba516ff
Merge branch 'musl-arm' of https://github.com/joerg-krause/libc into …
alexcrichton Mar 7, 2016
c01ec7e
Merge branch 'master' of https://github.com/fpgaminer/libc into merge
alexcrichton Mar 7, 2016
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
3 changes: 2 additions & 1 deletion src/unix/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,8 @@ cfg_if! {
if #[cfg(not(stdbuild))] {
// cargo build, don't pull in anything extra as the libstd dep
// already pulls in all libs.
} else if #[cfg(all(target_env = "musl", not(target_arch = "mips")))] {
} else if #[cfg(all(target_env = "musl", not(any(target_arch = "mips",
target_arch = "arm"))))] {
#[link(name = "c", kind = "static")]
extern {}
} else if #[cfg(target_os = "emscripten")] {
Expand Down
2 changes: 1 addition & 1 deletion src/unix/notbsd/android/b32.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ s! {
}
}

pub const SYS_gettid: ::c_int = 224;
pub const SYS_gettid: ::c_long = 224;
2 changes: 1 addition & 1 deletion src/unix/notbsd/android/b64.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ s! {
}
}

pub const SYS_gettid: ::c_int = 178;
pub const SYS_gettid: ::c_long = 178;
2 changes: 1 addition & 1 deletion src/unix/notbsd/linux/mips.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ pub const RTLD_DEEPBIND: ::c_int = 0x10;
pub const RTLD_GLOBAL: ::c_int = 0x4;
pub const RTLD_NOLOAD: ::c_int = 0x8;

pub const SYS_gettid: ::c_int = 4222; // Valid for O32
pub const SYS_gettid: ::c_long = 4222; // Valid for O32

extern {
pub fn sysctl(name: *mut ::c_int,
Expand Down
2 changes: 1 addition & 1 deletion src/unix/notbsd/linux/musl/b32/arm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,4 +303,4 @@ pub const TIOCMSET: ::c_ulong = 0x5418;
pub const FIONREAD: ::c_ulong = 0x541B;
pub const TIOCCONS: ::c_ulong = 0x541D;

pub const SYS_gettid: ::c_int = 224;
pub const SYS_gettid: ::c_long = 224;
2 changes: 1 addition & 1 deletion src/unix/notbsd/linux/musl/b32/asmjs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,4 +303,4 @@ pub const TIOCMSET: ::c_ulong = 0x5418;
pub const FIONREAD: ::c_ulong = 0x541B;
pub const TIOCCONS: ::c_ulong = 0x541D;

pub const SYS_gettid: ::c_int = 224; // Valid for arm (32-bit) and x86 (32-bit)
pub const SYS_gettid: ::c_long = 224; // Valid for arm (32-bit) and x86 (32-bit)
2 changes: 1 addition & 1 deletion src/unix/notbsd/linux/musl/b32/mips.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,4 +302,4 @@ pub const TIOCMSET: ::c_ulong = 0x741D;
pub const FIONREAD: ::c_ulong = 0x467F;
pub const TIOCCONS: ::c_ulong = 0x80047478;

pub const SYS_gettid: ::c_int = 4222; // Valid for O32
pub const SYS_gettid: ::c_long = 4222; // Valid for O32
2 changes: 1 addition & 1 deletion src/unix/notbsd/linux/musl/b32/x86.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,4 +304,4 @@ pub const TIOCMSET: ::c_ulong = 0x5418;
pub const FIONREAD: ::c_ulong = 0x541B;
pub const TIOCCONS: ::c_ulong = 0x541D;

pub const SYS_gettid: ::c_int = 224;
pub const SYS_gettid: ::c_long = 224;
2 changes: 1 addition & 1 deletion src/unix/notbsd/linux/musl/b64/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,4 +325,4 @@ pub const TIOCMSET: ::c_ulong = 0x5418;
pub const FIONREAD: ::c_ulong = 0x541B;
pub const TIOCCONS: ::c_ulong = 0x541D;

pub const SYS_gettid: ::c_int = 186; // Valid for x86_64
pub const SYS_gettid: ::c_long = 186; // Valid for x86_64
2 changes: 1 addition & 1 deletion src/unix/notbsd/linux/other/b32/arm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ pub const SO_SNDTIMEO: ::c_int = 21;
pub const FIOCLEX: ::c_ulong = 0x5451;
pub const FIONBIO: ::c_ulong = 0x5421;

pub const SYS_gettid: ::c_int = 224;
pub const SYS_gettid: ::c_long = 224;
2 changes: 1 addition & 1 deletion src/unix/notbsd/linux/other/b32/powerpc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ pub const SO_SNDTIMEO: ::c_int = 19;
pub const FIOCLEX: ::c_ulong = 0x20006601;
pub const FIONBIO: ::c_ulong = 0x8004667e;

pub const SYS_gettid: ::c_int = 207;
pub const SYS_gettid: ::c_long = 207;
2 changes: 1 addition & 1 deletion src/unix/notbsd/linux/other/b32/x86.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ pub const SO_SNDTIMEO: ::c_int = 21;
pub const FIOCLEX: ::c_ulong = 0x5451;
pub const FIONBIO: ::c_ulong = 0x5421;

pub const SYS_gettid: ::c_int = 224;
pub const SYS_gettid: ::c_long = 224;

extern {
pub fn getcontext(ucp: *mut ucontext_t) -> ::c_int;
Expand Down
2 changes: 1 addition & 1 deletion src/unix/notbsd/linux/other/b64/aarch64.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,4 @@ pub const SO_SNDTIMEO: ::c_int = 21;
pub const FIOCLEX: ::c_ulong = 0x5451;
pub const FIONBIO: ::c_ulong = 0x5421;

pub const SYS_gettid: ::c_int = 178;
pub const SYS_gettid: ::c_long = 178;
2 changes: 1 addition & 1 deletion src/unix/notbsd/linux/other/b64/powerpc64.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,4 @@ pub const SO_SNDTIMEO: ::c_int = 19;
pub const FIOCLEX: ::c_ulong = 0x20006601;
pub const FIONBIO: ::c_ulong = 0x8004667e;

pub const SYS_gettid: ::c_int = 207;
pub const SYS_gettid: ::c_long = 207;
2 changes: 1 addition & 1 deletion src/unix/notbsd/linux/other/b64/x86_64.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ pub const PTRACE_SETFPXREGS: ::c_uint = 19;
pub const PTRACE_GETREGS: ::c_uint = 12;
pub const PTRACE_SETREGS: ::c_uint = 13;

pub const SYS_gettid: ::c_int = 186;
pub const SYS_gettid: ::c_long = 186;

extern {
pub fn getcontext(ucp: *mut ucontext_t) -> ::c_int;
Expand Down
5 changes: 5 additions & 0 deletions src/unix/notbsd/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,6 +548,9 @@ pub const POSIX_FADV_WILLNEED: ::c_int = 3;
pub const POSIX_FADV_DONTNEED: ::c_int = 4;
pub const POSIX_FADV_NOREUSE: ::c_int = 5;

pub const AT_FDCWD: ::c_int = -100;
pub const AT_SYMLINK_NOFOLLOW: ::c_int = 0x100;

f! {
pub fn FD_CLR(fd: ::c_int, set: *mut fd_set) -> () {
let fd = fd as usize;
Expand Down Expand Up @@ -664,6 +667,8 @@ extern {
pub fn posix_fadvise(fd: ::c_int, offset: ::off_t, len: ::off_t,
advise: ::c_int) -> ::c_int;
pub fn futimens(fd: ::c_int, times: *const ::timespec) -> ::c_int;
pub fn utimensat(dirfd: ::c_int, path: *const ::c_char,
times: *const ::timespec, flag: ::c_int) -> ::c_int;
}

cfg_if! {
Expand Down