diff --git a/build.rs b/build.rs index d87317ad56c5689e88de2b2397be058d250d4c3b..b4cef42aa38d34d6406bbe11e25afdb08e0204aa 100644 --- a/build.rs +++ b/build.rs @@ -7,8 +7,9 @@ fn main() { cc::Build::new() .flag("-nostdinc") - .flag("-nostdlib") - .flag("-I").flag(&format!("{}/include", crate_dir)) + .flag("-nostdlib") + .flag("-I") + .flag(&format!("{}/include", crate_dir)) .flag("-fno-stack-protector") .file("src/c/fcntl.c") .file("src/c/stdio.c") diff --git a/src/stdlib/src/lib.rs b/src/stdlib/src/lib.rs index 4a1e7c96757d3aee0cbe5bb950dd82c96682a86d..55928ae4c9bfc16a71a64bc7f24e5f6ef46026bd 100644 --- a/src/stdlib/src/lib.rs +++ b/src/stdlib/src/lib.rs @@ -333,7 +333,7 @@ pub unsafe extern "C" fn memalign(alignment: size_t, size: size_t) -> *mut c_voi align *= 2; } - malloc_inner(size, align/2, align) + malloc_inner(size, align / 2, align) } #[no_mangle] diff --git a/src/string/src/lib.rs b/src/string/src/lib.rs index 80696ac898dd75d39e11830338117cf9395fdeac..cd57b63fbed23fce3f3a589b8c8e7aa0cc03ed2e 100644 --- a/src/string/src/lib.rs +++ b/src/string/src/lib.rs @@ -43,11 +43,7 @@ pub unsafe extern "C" fn memchr(s: *const c_void, c: c_int, n: usize) -> *mut c_ } #[no_mangle] -pub unsafe extern "C" fn memcmp( - s1: *const c_void, - s2: *const c_void, - n: usize, -) -> c_int { +pub unsafe extern "C" fn memcmp(s1: *const c_void, s2: *const c_void, n: usize) -> c_int { let mut i = 0; while i < n { let a = *(s1 as *const u8).offset(i as isize); @@ -61,11 +57,7 @@ pub unsafe extern "C" fn memcmp( } #[no_mangle] -pub unsafe extern "C" fn memcpy( - s1: *mut c_void, - s2: *const c_void, - n: usize, -) -> *mut c_void { +pub unsafe extern "C" fn memcpy(s1: *mut c_void, s2: *const c_void, n: usize) -> *mut c_void { let mut i = 0; while i < n { *(s1 as *mut u8).offset(i as isize) = *(s2 as *const u8).offset(i as isize); @@ -75,11 +67,7 @@ pub unsafe extern "C" fn memcpy( } #[no_mangle] -pub unsafe extern "C" fn memmove( - s1: *mut c_void, - s2: *const c_void, - n: usize, -) -> *mut c_void { +pub unsafe extern "C" fn memmove(s1: *mut c_void, s2: *const c_void, n: usize) -> *mut c_void { if s2 < s1 as *const c_void { // copy from end let mut i = n; @@ -99,11 +87,7 @@ pub unsafe extern "C" fn memmove( } #[no_mangle] -pub unsafe extern "C" fn memset( - s: *mut c_void, - c: c_int, - n: usize, -) -> *mut c_void { +pub unsafe extern "C" fn memset(s: *mut c_void, c: c_int, n: usize) -> *mut c_void { let mut i = 0; while i < n { *(s as *mut u8).offset(i as isize) = c as u8; diff --git a/src/sys_mman/src/redox.rs b/src/sys_mman/src/redox.rs index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8b137891791fe96927ad78e64b0aad7bded08bdc 100644 --- a/src/sys_mman/src/redox.rs +++ b/src/sys_mman/src/redox.rs @@ -0,0 +1 @@ +