|
|
@@ -55,9 +55,10 @@ aot_target_options_map = {
|
|
|
"riscv32": ["--target=riscv32", "--target-abi=ilp32", "--cpu=generic-rv32", "--cpu-features=+m,+a,+c"],
|
|
|
"riscv32_ilp32f": ["--target=riscv32", "--target-abi=ilp32f", "--cpu=generic-rv32", "--cpu-features=+m,+a,+c,+f"],
|
|
|
"riscv32_ilp32d": ["--target=riscv32", "--target-abi=ilp32d", "--cpu=generic-rv32", "--cpu-features=+m,+a,+c,+f,+d"],
|
|
|
- "riscv64": ["--target=riscv64", "--target-abi=lp64", "--cpu=generic-rv64", "--cpu-features=+m,+a,+c"],
|
|
|
- "riscv64_lp64f": ["--target=riscv64", "--target-abi=lp64f", "--cpu=generic-rv64", "--cpu-features=+m,+a,+c,+f"],
|
|
|
- "riscv64_lp64d": ["--target=riscv64", "--target-abi=lp64d", "--cpu=generic-rv64", "--cpu-features=+m,+a,+c,+f,+d"],
|
|
|
+ # RISCV64 requires -mcmodel=medany, which can be set by --size-level=1
|
|
|
+ "riscv64": ["--target=riscv64", "--target-abi=lp64", "--cpu=generic-rv64", "--cpu-features=+m,+a,+c", "--size-level=1"],
|
|
|
+ "riscv64_lp64f": ["--target=riscv64", "--target-abi=lp64f", "--cpu=generic-rv64", "--cpu-features=+m,+a,+c,+f", "--size-level=1"],
|
|
|
+ "riscv64_lp64d": ["--target=riscv64", "--target-abi=lp64d", "--cpu=generic-rv64", "--cpu-features=+m,+a,+c,+f,+d", "--size-level=1"],
|
|
|
"xtensa": ["--target=xtensa"],
|
|
|
}
|
|
|
|
|
|
@@ -1140,10 +1141,6 @@ def compile_wasm_to_aot(wasm_tempfile, aot_tempfile, runner, opts, r, output = '
|
|
|
if opts.qemu or opts.memory64:
|
|
|
cmd.append("--bounds-checks=1")
|
|
|
|
|
|
- # RISCV64 requires -mcmodel=medany, which can be set by --size-level=1
|
|
|
- if test_target.startswith("riscv64"):
|
|
|
- cmd.append("--size-level=1")
|
|
|
-
|
|
|
cmd += ["-o", aot_tempfile, wasm_tempfile]
|
|
|
|
|
|
log("Running: %s" % " ".join(cmd))
|