7 files changed, 22 insertions, 6 deletions
diff --git a/example/mini_core.rs b/example/mini_core.rs
index 32501530cfa..c554a87b825 100644
--- a/example/mini_core.rs
+++ b/example/mini_core.rs
@@ -138,6 +138,14 @@ impl Mul for u8 {
     }
 }
 
+impl Mul for i32 {
+    type Output = Self;
+
+    fn mul(self, rhs: Self) -> Self::Output {
+        self * rhs
+    }
+}
+
 impl Mul for usize {
     type Output = Self;
 
@@ -248,6 +256,14 @@ impl Sub for i16 {
     }
 }
 
+impl Sub for i32 {
+    type Output = Self;
+
+    fn sub(self, rhs: Self) -> Self {
+        self - rhs
+    }
+}
+
 #[lang = "rem"]
 pub trait Rem<RHS = Self> {
     type Output;
diff --git a/tests/run/abort1.rs b/tests/run/abort1.rs
index ae7e457d1cd..ff2bb75ece2 100644
--- a/tests/run/abort1.rs
+++ b/tests/run/abort1.rs
@@ -3,7 +3,7 @@
 // Run-time:
 //   status: signal
 
-#![feature(no_core, start)]
+#![feature(no_core)]
 #![no_std]
 #![no_core]
 #![no_main]
diff --git a/tests/run/abort2.rs b/tests/run/abort2.rs
index 28fad0107f7..781f518e0b2 100644
--- a/tests/run/abort2.rs
+++ b/tests/run/abort2.rs
@@ -3,7 +3,7 @@
 // Run-time:
 //   status: signal
 
-#![feature(no_core, start)]
+#![feature(no_core)]
 #![no_std]
 #![no_core]
 #![no_main]
diff --git a/tests/run/assign.rs b/tests/run/assign.rs
index a54d0b20def..4535ab5778e 100644
--- a/tests/run/assign.rs
+++ b/tests/run/assign.rs
@@ -23,7 +23,7 @@ fn inc(num: isize) -> isize {
 }
 
 #[no_mangle]
-extern "C" fn main(mut argc: i32, _argv: *const *const u8) -> i32 {
+extern "C" fn main(mut argc: isize, _argv: *const *const u8) -> i32 {
     argc = inc(argc);
     unsafe {
         libc::printf(b"%ld\n\0" as *const u8 as *const i8, argc);
diff --git a/tests/run/closure.rs b/tests/run/closure.rs
index b827a261400..a8a3fadfed4 100644
--- a/tests/run/closure.rs
+++ b/tests/run/closure.rs
@@ -17,7 +17,7 @@ extern crate mini_core;
 use mini_core::*;
 
 #[no_mangle]
-extern "C" fn main(argc: i32, _argv: *const *const u8) -> i32 {
+extern "C" fn main(argc: isize, _argv: *const *const u8) -> i32 {
     let string = "Arg: %d\n\0";
     let mut closure = || unsafe {
         libc::printf(string as *const str as *const i8, argc);
diff --git a/tests/run/mut_ref.rs b/tests/run/mut_ref.rs
index 5fa5df751a3..fa50d5bc5d3 100644
--- a/tests/run/mut_ref.rs
+++ b/tests/run/mut_ref.rs
@@ -27,7 +27,7 @@ fn update_num(num: &mut isize) {
 }
 
 #[no_mangle]
-extern "C" fn main(argc: i32, _argv: *const *const u8) -> i32 {
+extern "C" fn main(mut argc: isize, _argv: *const *const u8) -> i32 {
     let mut test = test(argc);
     unsafe {
         libc::printf(b"%ld\n\0" as *const u8 as *const i8, test.field);
diff --git a/tests/run/static.rs b/tests/run/static.rs
index c58151f8417..1e36cf4f3d3 100644
--- a/tests/run/static.rs
+++ b/tests/run/static.rs
@@ -34,7 +34,7 @@ static mut TEST2: Test = Test { field: 14 };
 static mut WITH_REF: WithRef = WithRef { refe: unsafe { &TEST } };
 
 #[no_mangle]
-extern "C" fn main(argc: i32, _argv: *const *const u8) -> i32 {
+extern "C" fn main(argc: isize, _argv: *const *const u8) -> i32 {
     unsafe {
         libc::printf(b"%ld\n\0" as *const u8 as *const i8, CONSTANT);
         libc::printf(b"%ld\n\0" as *const u8 as *const i8, TEST2.field);