---

yaml
---
r: 60607
b: refs/heads/auto
c: da94580
h: refs/heads/master
i:
  60605: b37e4de
  60603: 2b9628d
  60599: a685f42
  60591: 381ffb3
  60575: ed03b9c
  60543: 960555c
v: v3

Author: kud1ing

[refs]

@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 8a4bffc7eee07d895e32db9a4a366c23995d260a
+refs/heads/auto: da94580ddc605318a6bb7082a4b7907509d2dcc4
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/libcore/rt/context.rs

@@ -165,9 +165,7 @@ fn new_regs() -> ~Registers { ~([0, .. 32]) }
 
 #[cfg(target_arch = "arm")]
 fn initialize_call_frame(regs: &mut Registers, fptr: *c_void, arg: *c_void, sp: *mut uint) {
-    let sp = align_down(sp);
-    // sp of arm eabi is 8-byte aligned
-    let sp = mut_offset(sp, -2);
+    let sp = mut_offset(sp, -1);
 
     // The final return address. 0 indicates the bottom of the stack
     unsafe { *sp = 0; }

branches/auto/src/librusti/rusti.rc

@@ -389,7 +389,7 @@ pub fn main() {
     if istty {
         io::println("WARNING: The Rust REPL is experimental and may be");
         io::println("unstable. If you encounter problems, please use the");
-        io::println("compiler instead.");
+        io::println("compiler instead. Type :help for help.");
 
         unsafe {
             do rl::complete |line, suggest| {

branches/auto/src/rt/arch/arm/context.cpp

@@ -26,11 +26,9 @@ void context::call(void *f, void *arg, void *stack)
 
   // set up the stack
   uint32_t *sp = ( uint32_t *)stack;
-  sp = align_down(sp);
+  //sp = align_down(sp);
   // The final return address. 0 indicates the bottom of the stack
-  // sp of arm eabi is 8-byte aligned
-  sp -= 2;
-  *sp = 0;
+  *--sp = 0;
 
   regs.data[0] = ( uint32_t )arg; // r0
   regs.data[13] = ( uint32_t )sp; //#52 sp, r13