Hopefully fix the 32bit SEGV

diff --git a/src/librustc_trans/lib.rs b/src/librustc_trans/lib.rs
index a2a7d0df2a94cb8aa2f36042ad7c1c273e7ad356..b67997081aa67c04e79688cd2760710e109f53b4 100644 (file)
--- a/src/librustc_trans/lib.rs
+++ b/src/librustc_trans/lib.rs
@@ -252,7 +252,7 @@ fn join_trans_and_link(
 
 /// This is the entrypoint for a hot plugged rustc_trans
 #[no_mangle]
-pub extern "C" fn __rustc_codegen_backend(sess: &Session) -> Box<TransCrate> {
+pub fn __rustc_codegen_backend(sess: &Session) -> Box<TransCrate> {
     LlvmTransCrate::new(sess)
 }
 

diff --git a/src/test/run-make/hotplug_codegen_backend/Makefile b/src/test/run-make/hotplug_codegen_backend/Makefile
index 1916983a9e79ff4feedd28ada8beb8a9c11927f4..9a216d1d81ff8cf6e2a785a232678fdba2cd445b 100644 (file)
--- a/src/test/run-make/hotplug_codegen_backend/Makefile
+++ b/src/test/run-make/hotplug_codegen_backend/Makefile
@@ -4,7 +4,6 @@ all:
        /bin/echo || exit 0 # This test requires /bin/echo to exist
        $(RUSTC) the_backend.rs --crate-name the_backend --crate-type dylib \
                -o $(TMPDIR)/the_backend.dylib
-       sleep 10
        $(RUSTC) some_crate.rs --crate-name some_crate --crate-type bin -o $(TMPDIR)/some_crate \
                -Z codegen-backend=$(TMPDIR)/the_backend.dylib -Z unstable-options
        grep -x "This has been \"compiled\" succesfully." $(TMPDIR)/some_crate