OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix objc ABI in std::env::args

This commit is contained in:
Mathieu Poumeyrol 2016-12-03 19:47:27 +01:00
parent 24175e8c9f
commit a1882ca769
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/libstd/sys/unix/args.rs
View File

@ -172,10 +172,23 @@ mod imp {
extern {
fn sel_registerName(name: *const libc::c_uchar) -> Sel;
fn objc_msgSend(obj: NsId, sel: Sel, ...) -> NsId;
fn objc_getClass(class_name: *const libc::c_uchar) -> NsId;
}
#[cfg(target_arch="aarch64")]
extern {
fn objc_msgSend(obj: NsId, sel: Sel) -> NsId;
#[link_name="objc_msgSend"]
fn objc_msgSend_ul(obj: NsId, sel: Sel, i: libc::c_ulong) -> NsId;
}
#[cfg(not(target_arch="aarch64"))]
extern {
fn objc_msgSend(obj: NsId, sel: Sel, ...) -> NsId;
#[link_name="objc_msgSend"]
fn objc_msgSend_ul(obj: NsId, sel: Sel, ...) -> NsId;
}
#[link(name = "Foundation", kind = "framework")]
#[link(name = "objc")]
#[cfg(not(cargobuild))]
@ -199,7 +212,7 @@ mod imp {
let cnt: usize = mem::transmute(objc_msgSend(args, count_sel));
for i in 0..cnt {
let tmp = objc_msgSend(args, object_at_sel, i);
let tmp = objc_msgSend_ul(args, object_at_sel, i as libc::c_ulong);
let utf_c_str: *const libc::c_char =
mem::transmute(objc_msgSend(tmp, utf8_sel));
let bytes = CStr::from_ptr(utf_c_str).to_bytes();