提交 7f278811 编写于 作者: B bors

auto merge of #5622 : yichoi/rust/pull-0329, r=catamorphism

libcore: language change minor fix for ARM & MIPS

fix context.rs 
...@@ -160,7 +160,7 @@ fn initialize_call_frame(regs: &mut Registers, fptr: *c_void, arg: *c_void, sp: ...@@ -160,7 +160,7 @@ fn initialize_call_frame(regs: &mut Registers, fptr: *c_void, arg: *c_void, sp:
type Registers = [uint, ..32]; type Registers = [uint, ..32];
#[cfg(target_arch = "arm")] #[cfg(target_arch = "arm")]
fn new_regs() -> ~Registers { ~[0, .. 32] } fn new_regs() -> ~Registers { ~([0, .. 32]) }
#[cfg(target_arch = "arm")] #[cfg(target_arch = "arm")]
fn initialize_call_frame(regs: &mut Registers, fptr: *c_void, arg: *c_void, sp: *mut uint) { fn initialize_call_frame(regs: &mut Registers, fptr: *c_void, arg: *c_void, sp: *mut uint) {
...@@ -178,7 +178,7 @@ fn initialize_call_frame(regs: &mut Registers, fptr: *c_void, arg: *c_void, sp: ...@@ -178,7 +178,7 @@ fn initialize_call_frame(regs: &mut Registers, fptr: *c_void, arg: *c_void, sp:
type Registers = [uint, ..32]; type Registers = [uint, ..32];
#[cfg(target_arch = "mips")] #[cfg(target_arch = "mips")]
fn new_regs() -> ~Registers { ~[0, .. 32] } fn new_regs() -> ~Registers { ~([0, .. 32]) }
#[cfg(target_arch = "mips")] #[cfg(target_arch = "mips")]
fn initialize_call_frame(regs: &mut Registers, fptr: *c_void, arg: *c_void, sp: *mut uint) { fn initialize_call_frame(regs: &mut Registers, fptr: *c_void, arg: *c_void, sp: *mut uint) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册