mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-08 05:38:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed ARM cross compilation

Browse Source
This commit is contained in:
Syrus
2020-08-11 12:23:11 -07:00
parent a1ceec02e9
commit dd4f27accc
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/compiler-llvm/Cargo.toml
View File

@@ -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"

12
lib/compiler-llvm/src/config.rs
View File

@@ -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