More fixes

wasmerio · Jan 17, 2022 · 1e5dec6 · 1e5dec6
1 parent b8c8e05
commit 1e5dec6
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 16 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -296,4 +296,4 @@ path = "examples/features.rs"
 required-features = ["cranelift"]
 
 [patch.crates-io]
-object = { git = "https://github.com/Amanieu/object", branch = "wasmer" }
+object = { git = "https://github.com/gimli-rs/object" }
diff --git a/Makefile b/Makefile
@@ -211,14 +211,13 @@ compilers_engines :=
 ifeq ($(ENABLE_CRANELIFT), 1)
 	compilers_engines += cranelift-universal
 
-	ifneq (, $(filter 1, $(IS_DARWIN) $(IS_LINUX)))
+	ifneq (, $(filter 1, $(IS_WINDOWS) $(IS_DARWIN) $(IS_LINUX)))
 		ifeq ($(IS_AMD64), 1)
 			ifneq ($(LIBC), musl)
 				compilers_engines += cranelift-dylib
 			endif
 		else ifeq ($(IS_AARCH64), 1)
-			# The object crate doesn't support yet Darwin + Aarch64 relocations
-			ifneq ($(IS_DARWIN), 1)
+			ifneq ($(LIBC), musl)
 				compilers_engines += cranelift-dylib
 			endif
 		endif
@@ -230,7 +229,7 @@ endif
 ##
 
 ifeq ($(ENABLE_LLVM), 1)
-	ifneq (, $(filter 1, $(IS_DARWIN) $(IS_LINUX)))
+	ifneq (, $(filter 1, $(IS_WINDOWS) $(IS_DARWIN) $(IS_LINUX)))
 		ifeq ($(IS_AMD64), 1)
 			compilers_engines += llvm-universal
 			compilers_engines += llvm-dylib
@@ -246,7 +245,7 @@ endif
 ##
 
 ifeq ($(ENABLE_SINGLEPASS), 1)
-	ifneq (, $(filter 1, $(IS_DARWIN) $(IS_LINUX)))
+	ifneq (, $(filter 1, $(IS_WINDOWS) $(IS_DARWIN) $(IS_LINUX)))
 		ifeq ($(IS_AMD64), 1)
 			compilers_engines += singlepass-universal
 		endif

diff --git a/lib/engine-dylib/src/artifact.rs b/lib/engine-dylib/src/artifact.rs
@@ -176,6 +176,8 @@ impl DylibArtifact {
         data: &[u8],
         tunables: &dyn Tunables,
     ) -> Result<Self, CompileError> {
+        use object::{write::CoffExportStyle, BinaryFormat};
+
         let mut engine_inner = engine.inner_mut();
         let target = engine.target();
         let compiler = engine_inner.compiler()?;
@@ -241,6 +243,9 @@ impl DylibArtifact {
                     let mut obj =
                         get_object_for_target(&target_triple).map_err(to_compile_error)?;
                     emit_trampolines(&mut obj, engine.target());
+                    if obj.format() == BinaryFormat::Coff {
+                        obj.add_coff_exports(CoffExportStyle::Msvc);
+                    }
                     let file = tempfile::Builder::new()
                         .prefix("wasmer_dylib_")
                         .suffix(".o")
@@ -285,6 +290,9 @@ impl DylibArtifact {
                 .map_err(to_compile_error)?;
                 emit_compilation(&mut obj, compilation, &symbol_registry, &target_triple)
                     .map_err(to_compile_error)?;
+                if obj.format() == BinaryFormat::Coff {
+                    obj.add_coff_exports(CoffExportStyle::Msvc);
+                }
                 let file = tempfile::Builder::new()
                     .prefix("wasmer_dylib_")
                     .suffix(".o")
@@ -481,6 +489,13 @@ impl DylibArtifact {
         dylib_path: PathBuf,
         lib: Library,
     ) -> Result<Self, CompileError> {
+        unsafe {
+            let trampolines_symbol: LibrarySymbol<usize> = lib
+                .get(WASMER_TRAMPOLINES_SYMBOL)
+                .expect("missing WASMER_TRAMPOLINES symbol");
+            fill_trampoline_table(trampolines_symbol.into_raw().into_raw() as *mut usize);
+        }
+
         let mut finished_functions: PrimaryMap<LocalFunctionIndex, FunctionBodyPtr> =
             PrimaryMap::new();
         for (function_local_index, _function_len) in metadata.function_body_lengths.iter() {
@@ -665,15 +680,6 @@ impl DylibArtifact {
 
         let metadata = ModuleMetadata::deserialize(metadata_slice)?;
 
-        let trampolines_symbol: LibrarySymbol<usize> =
-            lib.get(WASMER_TRAMPOLINES_SYMBOL).map_err(|e| {
-                DeserializeError::CorruptedBinary(format!(
-                    "The provided object file doesn't seem to be generated by Wasmer: {}",
-                    e
-                ))
-            })?;
-        fill_trampoline_table(trampolines_symbol.into_raw().into_raw() as *mut usize);
-
         let mut engine_inner = engine.inner_mut();
 
         Self::from_parts(&mut engine_inner, metadata, shared_path, lib)