Skip to content
Snippets Groups Projects
Verified Commit 07dbc6bd authored by jD91mZM2's avatar jD91mZM2
Browse files

Fix no_std on redox

Apparently a root-level cfg does not go well with a root-level no_std
parent 17778ba1
No related branches found
No related tags found
No related merge requests found
......@@ -32,7 +32,7 @@ pub extern crate unistd;
pub extern crate wchar;
pub extern crate wctype;
#[cfg(not(any(test, target_os = "redox")))]
#[cfg(not(test))]
#[panic_implementation]
#[linkage = "weak"]
#[no_mangle]
......@@ -51,7 +51,7 @@ pub extern "C" fn rust_begin_unwind(pi: &::core::panic::PanicInfo) -> ! {
#[linkage = "weak"]
pub extern "C" fn rust_eh_personality() {}
#[cfg(not(any(test, target_os = "redox")))]
#[cfg(not(test))]
#[lang = "oom"]
#[linkage = "weak"]
#[no_mangle]
......
*
!.gitignore
//! sys/utsname implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/sysutsname.h.html
#![no_std]
#![cfg(target_os = "linux")]
extern crate platform;
#[cfg(target_os = "linux")]
mod inner {
extern crate platform;
use core::ptr;
use platform::types::*;
use core::ptr;
use self::platform::types::*;
const LENGTH: usize = 65;
const LENGTH: usize = 65;
#[allow(non_camel_case)]
#[no_mangle]
#[repr(C)]
pub struct utsname {
pub sysname: [c_char; LENGTH],
pub nodename: [c_char; LENGTH],
pub release: [c_char; LENGTH],
pub version: [c_char; LENGTH],
pub machine: [c_char; LENGTH],
pub domainname: [c_char; LENGTH]
}
#[allow(non_camel_case)]
#[no_mangle]
#[repr(C)]
pub struct utsname {
pub sysname: [c_char; LENGTH],
pub nodename: [c_char; LENGTH],
pub release: [c_char; LENGTH],
pub version: [c_char; LENGTH],
pub machine: [c_char; LENGTH],
pub domainname: [c_char; LENGTH]
}
#[no_mangle]
pub unsafe extern "C" fn uname(uts: *mut utsname) -> c_int {
platform::uname(uts as usize)
#[no_mangle]
pub unsafe extern "C" fn uname(uts: *mut utsname) -> c_int {
platform::uname(uts as usize)
}
}
#[cfg(target_os = "linux")]
pub use inner::*;
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment