Test fixes and rebase conflicts, round 3

src/test/debuginfo/function-prologue-stepping-regular.rs

@@ -126,6 +126,7 @@
 // lldb-command:continue
 
 #![allow(unused_variables)]
+#![feature(old_io)]
 #![omit_gdb_pretty_printer_section]
 
 fn immediate_args(a: int, b: bool, c: f64) {

src/test/run-pass/out-of-stack-no-split.rs

@@ -15,7 +15,7 @@
 //ignore-dragonfly
 //ignore-bitrig
 
-#![feature(asm)]
+#![feature(asm, old_io)]
 
 use std::old_io::process::Command;
 use std::env;