diff --git a/lib/compiler-llvm/Cargo.toml b/lib/compiler-llvm/Cargo.toml index e18f9075f..eda70394a 100644 --- a/lib/compiler-llvm/Cargo.toml +++ b/lib/compiler-llvm/Cargo.toml @@ -21,19 +21,12 @@ byteorder = "1" itertools = "0.9" rayon = "1.3" -[target.'cfg(target_arch = "x86_64")'.dependencies.inkwell] +[dependencies.inkwell] #version = "0.1.0-llvm8sample" git = "https://github.com/theDan64/inkwell" rev = "fdf895777e937c974204e879cf1102cf7a727c42" default-features = false -features = ["llvm10-0", "target-x86"] - -[target.'cfg(target_arch = "aarch64")'.dependencies.inkwell] -#version = "0.1.0-llvm8sample" -git = "https://github.com/theDan64/inkwell" -rev = "fdf895777e937c974204e879cf1102cf7a727c42" -default-features = false -features = ["llvm10-0", "target-aarch64"] +features = ["llvm10-0", "target-x86", "target-aarch64"] [build-dependencies] cc = "1.0" diff --git a/lib/compiler-llvm/src/config.rs b/lib/compiler-llvm/src/config.rs index 45875e335..13bd1ae13 100644 --- a/lib/compiler-llvm/src/config.rs +++ b/lib/compiler-llvm/src/config.rs @@ -153,7 +153,7 @@ impl LLVM { info: true, machine_code: true, }), - Architecture::Arm(_) => InkwellTarget::initialize_aarch64(&InitializationConfig { + Architecture::Aarch64(_) => InkwellTarget::initialize_aarch64(&InitializationConfig { asm_parser: true, asm_printer: true, base: true, @@ -161,7 +161,15 @@ impl LLVM { info: true, machine_code: true, }), - _ => unimplemented!("target {} not supported", triple), + // Architecture::Arm(_) => InkwellTarget::initialize_arm(&InitializationConfig { + // asm_parser: true, + // asm_printer: true, + // base: true, + // disassembler: true, + // info: true, + // machine_code: true, + // }), + _ => unimplemented!("target {} not yet supported in Wasmer", triple), } // The CPU features formatted as LLVM strings