Hopefully fix the 32bit SEGV

rust-lang · Jan 19, 2018 · 82ac9f7 · 82ac9f7
1 parent cc4deb2
commit 82ac9f7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/librustc_trans/lib.rs b/src/librustc_trans/lib.rs
@@ -252,7 +252,7 @@ impl TransCrate for LlvmTransCrate {
 
 /// 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
@@ -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