rust-lang · bors · Dec 23, 2014 · Dec 22, 2014
diff --git a/mk/rt.mk b/mk/rt.mk
@@ -35,7 +35,7 @@
 # that's per-target so you're allowed to conditionally add files based on the
 # target.
 ################################################################################
-NATIVE_LIBS := rust_builtin hoedown morestack miniz context_switch \
+NATIVE_LIBS := rust_builtin hoedown morestack miniz \
 		rustrt_native rust_test_helpers
 
 # $(1) is the target triple
@@ -58,8 +58,7 @@ NATIVE_DEPS_rustrt_native_$(1) := \
 			arch/$$(HOST_$(1))/record_sp.S
 NATIVE_DEPS_rust_test_helpers_$(1) := rust_test_helpers.c
 NATIVE_DEPS_morestack_$(1) := arch/$$(HOST_$(1))/morestack.S
-NATIVE_DEPS_context_switch_$(1) := \
-			arch/$$(HOST_$(1))/_context.S
+
 
 ################################################################################
 # You shouldn't find it that necessary to edit anything below this line.

diff --git a/src/rt/arch/arm/_context.S b/src/rt/arch/arm/_context.S
diff --git a/src/rt/arch/i386/_context.S b/src/rt/arch/i386/_context.S
diff --git a/src/rt/arch/mips/_context.S b/src/rt/arch/mips/_context.S
diff --git a/src/rt/arch/mipsel/_context.S b/src/rt/arch/mipsel/_context.S
diff --git a/src/rt/arch/x86_64/_context.S b/src/rt/arch/x86_64/_context.S
diff --git a/src/rt/arch/x86_64/regs.h b/src/rt/arch/x86_64/regs.h