|
55 | 55 | "riscv32": ["--target=riscv32", "--target-abi=ilp32", "--cpu=generic-rv32", "--cpu-features=+m,+a,+c"], |
56 | 56 | "riscv32_ilp32f": ["--target=riscv32", "--target-abi=ilp32f", "--cpu=generic-rv32", "--cpu-features=+m,+a,+c,+f"], |
57 | 57 | "riscv32_ilp32d": ["--target=riscv32", "--target-abi=ilp32d", "--cpu=generic-rv32", "--cpu-features=+m,+a,+c,+f,+d"], |
58 | | - "riscv64": ["--target=riscv64", "--target-abi=lp64", "--cpu=generic-rv64", "--cpu-features=+m,+a,+c"], |
59 | | - "riscv64_lp64f": ["--target=riscv64", "--target-abi=lp64f", "--cpu=generic-rv64", "--cpu-features=+m,+a,+c,+f"], |
60 | | - "riscv64_lp64d": ["--target=riscv64", "--target-abi=lp64d", "--cpu=generic-rv64", "--cpu-features=+m,+a,+c,+f,+d"], |
| 58 | + # RISCV64 requires -mcmodel=medany, which can be set by --size-level=1 |
| 59 | + "riscv64": ["--target=riscv64", "--target-abi=lp64", "--cpu=generic-rv64", "--cpu-features=+m,+a,+c", "--size-level=1"], |
| 60 | + "riscv64_lp64f": ["--target=riscv64", "--target-abi=lp64f", "--cpu=generic-rv64", "--cpu-features=+m,+a,+c,+f", "--size-level=1"], |
| 61 | + "riscv64_lp64d": ["--target=riscv64", "--target-abi=lp64d", "--cpu=generic-rv64", "--cpu-features=+m,+a,+c,+f,+d", "--size-level=1"], |
61 | 62 | "xtensa": ["--target=xtensa"], |
62 | 63 | } |
63 | 64 |
|
@@ -1140,10 +1141,6 @@ def compile_wasm_to_aot(wasm_tempfile, aot_tempfile, runner, opts, r, output = ' |
1140 | 1141 | if opts.qemu or opts.memory64: |
1141 | 1142 | cmd.append("--bounds-checks=1") |
1142 | 1143 |
|
1143 | | - # RISCV64 requires -mcmodel=medany, which can be set by --size-level=1 |
1144 | | - if test_target.startswith("riscv64"): |
1145 | | - cmd.append("--size-level=1") |
1146 | | - |
1147 | 1144 | cmd += ["-o", aot_tempfile, wasm_tempfile] |
1148 | 1145 |
|
1149 | 1146 | log("Running: %s" % " ".join(cmd)) |
|
0 commit comments