forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of rust-lang#578 - cactorium:master, r=alexcrichton
Steps towards support for musl-unknown-linux-uclibc Hello! I've been working towards resolving rust-lang/libc#361 , this PR compiles successfully with a newish compiler (with some minor fixes in `gcc`, `ctest`), and all the tests pass for `libc-ctest`. Basically most of the undefined functions, constants, and structs were just removed from the ctest, and then any constants that weren't correct were fixed. Would it make more sense to conditionally remove them from libc? I wasn't sure when it was appropriate to skip the test for it instead of removing the function/constants, so I just removed all the tests for now because that was a little easier than hunting them down. I'm also guessing the way some of the constants were conditionally set wasn't the correct style, would you guys have any advice on how to do it more correctly? Lemme know how it looks!
- Loading branch information
Showing
6 changed files
with
2,757 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,269 @@ | ||
| pub type c_char = i8; | ||
| pub type c_long = i32; | ||
| pub type c_ulong = u32; | ||
| pub type clock_t = i32; | ||
| pub type time_t = i32; | ||
| pub type suseconds_t = i32; | ||
| pub type wchar_t = i32; | ||
| pub type off_t = i32; | ||
| pub type ino_t = u32; | ||
| pub type blkcnt_t = i32; | ||
| pub type blksize_t = i32; | ||
| pub type nlink_t = u32; | ||
| pub type fsblkcnt_t = ::c_ulong; | ||
| pub type fsfilcnt_t = ::c_ulong; | ||
| pub type rlim_t = c_ulong; | ||
|
|
||
| s! { | ||
| pub struct stat { | ||
| pub st_dev: ::dev_t, | ||
| st_pad1: [::c_long; 2], | ||
| pub st_ino: ::ino_t, | ||
| pub st_mode: ::mode_t, | ||
| pub st_nlink: ::nlink_t, | ||
| pub st_uid: ::uid_t, | ||
| pub st_gid: ::gid_t, | ||
| pub st_rdev: ::dev_t, | ||
| pub st_pad2: [::c_long; 1], | ||
| pub st_size: ::off_t, | ||
| st_pad3: ::c_long, | ||
| pub st_atime: ::time_t, | ||
| pub st_atime_nsec: ::c_long, | ||
| pub st_mtime: ::time_t, | ||
| pub st_mtime_nsec: ::c_long, | ||
| pub st_ctime: ::time_t, | ||
| pub st_ctime_nsec: ::c_long, | ||
| pub st_blksize: ::blksize_t, | ||
| pub st_blocks: ::blkcnt_t, | ||
| st_pad5: [::c_long; 14], | ||
| } | ||
|
|
||
| pub struct stat64 { | ||
| pub st_dev: ::dev_t, | ||
| st_pad1: [::c_long; 2], | ||
| pub st_ino: ::ino64_t, | ||
| pub st_mode: ::mode_t, | ||
| pub st_nlink: ::nlink_t, | ||
| pub st_uid: ::uid_t, | ||
| pub st_gid: ::gid_t, | ||
| pub st_rdev: ::dev_t, | ||
| st_pad2: [::c_long; 2], | ||
| pub st_size: ::off64_t, | ||
| pub st_atime: ::time_t, | ||
| pub st_atime_nsec: ::c_long, | ||
| pub st_mtime: ::time_t, | ||
| pub st_mtime_nsec: ::c_long, | ||
| pub st_ctime: ::time_t, | ||
| pub st_ctime_nsec: ::c_long, | ||
| pub st_blksize: ::blksize_t, | ||
| st_pad3: ::c_long, | ||
| pub st_blocks: ::blkcnt64_t, | ||
| st_pad5: [::c_long; 14], | ||
| } | ||
|
|
||
| pub struct pthread_attr_t { | ||
| __size: [u32; 9] | ||
| } | ||
|
|
||
| pub struct sigaction { | ||
| pub sa_flags: ::c_uint, | ||
| pub sa_sigaction: ::sighandler_t, | ||
| pub sa_mask: sigset_t, | ||
| _restorer: *mut ::c_void, | ||
| } | ||
|
|
||
| pub struct stack_t { | ||
| pub ss_sp: *mut ::c_void, | ||
| pub ss_size: ::size_t, | ||
| pub ss_flags: ::c_int, | ||
| } | ||
|
|
||
| pub struct sigset_t { | ||
| __val: [::c_ulong; 4], | ||
| } | ||
|
|
||
| pub struct siginfo_t { | ||
| pub si_signo: ::c_int, | ||
| pub si_code: ::c_int, | ||
| pub si_errno: ::c_int, | ||
| pub _pad: [::c_int; 29], | ||
| } | ||
|
|
||
| pub struct glob64_t { | ||
| pub gl_pathc: ::size_t, | ||
| pub gl_pathv: *mut *mut ::c_char, | ||
| pub gl_offs: ::size_t, | ||
| pub gl_flags: ::c_int, | ||
|
|
||
| __unused1: *mut ::c_void, | ||
| __unused2: *mut ::c_void, | ||
| __unused3: *mut ::c_void, | ||
| __unused4: *mut ::c_void, | ||
| __unused5: *mut ::c_void, | ||
| } | ||
|
|
||
| pub struct ipc_perm { | ||
| pub __key: ::key_t, | ||
| pub uid: ::uid_t, | ||
| pub gid: ::gid_t, | ||
| pub cuid: ::uid_t, | ||
| pub cgid: ::gid_t, | ||
| pub mode: ::c_uint, | ||
| pub __seq: ::c_ushort, | ||
| __pad1: ::c_ushort, | ||
| __unused1: ::c_ulong, | ||
| __unused2: ::c_ulong | ||
| } | ||
|
|
||
| pub struct shmid_ds { | ||
| pub shm_perm: ::ipc_perm, | ||
| pub shm_segsz: ::size_t, | ||
| pub shm_atime: ::time_t, | ||
| pub shm_dtime: ::time_t, | ||
| pub shm_ctime: ::time_t, | ||
| pub shm_cpid: ::pid_t, | ||
| pub shm_lpid: ::pid_t, | ||
| pub shm_nattch: ::shmatt_t, | ||
| __unused4: ::c_ulong, | ||
| __unused5: ::c_ulong | ||
| } | ||
|
|
||
| pub struct msqid_ds { | ||
| pub msg_perm: ::ipc_perm, | ||
| #[cfg(target_endian = "big")] | ||
| __glibc_reserved1: ::c_ulong, | ||
| pub msg_stime: ::time_t, | ||
| #[cfg(target_endian = "little")] | ||
| __glibc_reserved1: ::c_ulong, | ||
| #[cfg(target_endian = "big")] | ||
| __glibc_reserved2: ::c_ulong, | ||
| pub msg_rtime: ::time_t, | ||
| #[cfg(target_endian = "little")] | ||
| __glibc_reserved2: ::c_ulong, | ||
| #[cfg(target_endian = "big")] | ||
| __glibc_reserved3: ::c_ulong, | ||
| pub msg_ctime: ::time_t, | ||
| #[cfg(target_endian = "little")] | ||
| __glibc_reserved3: ::c_ulong, | ||
| __msg_cbytes: ::c_ulong, | ||
| pub msg_qnum: ::msgqnum_t, | ||
| pub msg_qbytes: ::msglen_t, | ||
| pub msg_lspid: ::pid_t, | ||
| pub msg_lrpid: ::pid_t, | ||
| __glibc_reserved4: ::c_ulong, | ||
| __glibc_reserved5: ::c_ulong, | ||
| } | ||
|
|
||
| pub struct statfs { | ||
| pub f_type: ::c_long, | ||
| pub f_bsize: ::c_long, | ||
| pub f_frsize: ::c_long, | ||
| pub f_blocks: ::fsblkcnt_t, | ||
| pub f_bfree: ::fsblkcnt_t, | ||
| pub f_files: ::fsblkcnt_t, | ||
| pub f_ffree: ::fsblkcnt_t, | ||
| pub f_bavail: ::fsblkcnt_t, | ||
| pub f_fsid: ::fsid_t, | ||
|
|
||
| pub f_namelen: ::c_long, | ||
| f_spare: [::c_long; 6], | ||
| } | ||
|
|
||
| pub struct msghdr { | ||
| pub msg_name: *mut ::c_void, | ||
| pub msg_namelen: ::socklen_t, | ||
| pub msg_iov: *mut ::iovec, | ||
| pub msg_iovlen: ::c_int, | ||
| pub msg_control: *mut ::c_void, | ||
| pub msg_controllen: ::size_t, | ||
| pub msg_flags: ::c_int, | ||
| } | ||
|
|
||
| pub struct cmsghdr { | ||
| pub cmsg_len: ::size_t, | ||
| pub cmsg_level: ::c_int, | ||
| pub cmsg_type: ::c_int, | ||
| } | ||
|
|
||
| pub struct termios { | ||
| pub c_iflag: ::tcflag_t, | ||
| pub c_oflag: ::tcflag_t, | ||
| pub c_cflag: ::tcflag_t, | ||
| pub c_lflag: ::tcflag_t, | ||
| pub c_line: ::cc_t, | ||
| pub c_cc: [::cc_t; ::NCCS], | ||
| } | ||
|
|
||
| pub struct flock { | ||
| pub l_type: ::c_short, | ||
| pub l_whence: ::c_short, | ||
| pub l_start: ::off_t, | ||
| pub l_len: ::off_t, | ||
| pub l_sysid: ::c_long, | ||
| pub l_pid: ::pid_t, | ||
| pad: [::c_long; 4], | ||
| } | ||
|
|
||
| pub struct sysinfo { | ||
| pub uptime: ::c_long, | ||
| pub loads: [::c_ulong; 3], | ||
| pub totalram: ::c_ulong, | ||
| pub freeram: ::c_ulong, | ||
| pub sharedram: ::c_ulong, | ||
| pub bufferram: ::c_ulong, | ||
| pub totalswap: ::c_ulong, | ||
| pub freeswap: ::c_ulong, | ||
| pub procs: ::c_ushort, | ||
| pub pad: ::c_ushort, | ||
| pub totalhigh: ::c_ulong, | ||
| pub freehigh: ::c_ulong, | ||
| pub mem_unit: ::c_uint, | ||
| pub _f: [::c_char; 8], | ||
| } | ||
|
|
||
| // FIXME this is actually a union | ||
| pub struct sem_t { | ||
| #[cfg(target_pointer_width = "32")] | ||
| __size: [::c_char; 16], | ||
| #[cfg(target_pointer_width = "64")] | ||
| __size: [::c_char; 32], | ||
| __align: [::c_long; 0], | ||
| } | ||
| } | ||
|
|
||
| pub const __SIZEOF_PTHREAD_CONDATTR_T: usize = 4; | ||
| pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 24; | ||
| pub const __SIZEOF_PTHREAD_RWLOCK_T: usize = 32; | ||
| pub const __SIZEOF_PTHREAD_MUTEXATTR_T: usize = 4; | ||
|
|
||
| pub const RLIM_INFINITY: ::rlim_t = 0x7fffffff; | ||
|
|
||
| pub const SYS_gettid: ::c_long = 4222; // Valid for O32 | ||
|
|
||
| #[link(name = "util")] | ||
| extern { | ||
| pub fn sysctl(name: *mut ::c_int, | ||
| namelen: ::c_int, | ||
| oldp: *mut ::c_void, | ||
| oldlenp: *mut ::size_t, | ||
| newp: *mut ::c_void, | ||
| newlen: ::size_t) | ||
| -> ::c_int; | ||
| pub fn ioctl(fd: ::c_int, request: ::c_ulong, ...) -> ::c_int; | ||
| pub fn backtrace(buf: *mut *mut ::c_void, | ||
| sz: ::c_int) -> ::c_int; | ||
| pub fn glob64(pattern: *const ::c_char, | ||
| flags: ::c_int, | ||
| errfunc: ::dox::Option<extern fn(epath: *const ::c_char, | ||
| errno: ::c_int) | ||
| -> ::c_int>, | ||
| pglob: *mut glob64_t) -> ::c_int; | ||
| pub fn globfree64(pglob: *mut glob64_t); | ||
| pub fn ptrace(request: ::c_uint, ...) -> ::c_long; | ||
| pub fn pthread_attr_getaffinity_np(attr: *const ::pthread_attr_t, | ||
| cpusetsize: ::size_t, | ||
| cpuset: *mut ::cpu_set_t) -> ::c_int; | ||
| pub fn pthread_attr_setaffinity_np(attr: *mut ::pthread_attr_t, | ||
| cpusetsize: ::size_t, | ||
| cpuset: *const ::cpu_set_t) -> ::c_int; | ||
| } |
Oops, something went wrong.