From 82ac9f7532accc29730848242411dbe15a143c51 Mon Sep 17 00:00:00 2001 From: bjorn3 Date: Fri, 19 Jan 2018 20:24:42 +0100 Subject: [PATCH] Hopefully fix the 32bit SEGV --- src/librustc_trans/lib.rs | 2 +- src/test/run-make/hotplug_codegen_backend/Makefile | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/librustc_trans/lib.rs b/src/librustc_trans/lib.rs index a2a7d0df2a94c..b67997081aa67 100644 --- 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 { +pub fn __rustc_codegen_backend(sess: &Session) -> Box { LlvmTransCrate::new(sess) } diff --git a/src/test/run-make/hotplug_codegen_backend/Makefile b/src/test/run-make/hotplug_codegen_backend/Makefile index 1916983a9e79f..9a216d1d81ff8 100644 --- 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