Skip to content

Commit

Permalink
config.nims: Support Nim Apps for RISC-V 32-bit and 64-bit
Browse files Browse the repository at this point in the history
NuttX Build fails when it compiles `examples/hello_nim` for RISC-V (32-bit and 64-bit). That's because the Nim Config Script `config.nims` couldn't identify the Nim Target Platform: `riscv32` or `riscv64`.

This PR fixes `config.nims` so that Nim Compiler correctly derives the Nim Target Platform (`riscv32` or `riscv64`), by searching NuttX `.config` for `CONFIG_ARCH_FAMILY=rv32` or `rv64`.

This logic is slightly different from the Nim Targets `arm` and `arm64`, which are currently derived from `CONFIG_ARCH=arm` and `arm64`.

`config.nims` is explained in this article: https://lupyuen.github.io/articles/nim#inside-nim-on-nuttx
  • Loading branch information
lupyuen committed Jan 3, 2024
1 parent 9489659 commit f6a4e06
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions config.nims
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ switch "mm", "orc"
switch "arm.nuttx.gcc.exe", "arm-none-eabi-gcc"
switch "arm64.nuttx.gcc.exe", "aarch64-none-elf-gcc"
switch "riscv32.nuttx.gcc.exe", "riscv64-unknown-elf-gcc"
switch "riscv64.nuttx.gcc.exe", "riscv64-unknown-elf-gcc"
switch "amd64.nuttx.gcc.exe", "x86_64-linux-gnu-gcc"

switch "nimcache", ".nimcache"
Expand Down Expand Up @@ -69,14 +70,19 @@ proc read_config(cfg: string): DotConfig =
case arch
of "arm", "arm64":
result.arch = arch
of "riscv":
result.arch = "riscv32"
of "sim":
if defined(amd64):
result.arch = "amd64"
elif defined(aarch64):
result.arch = "arm64"
result.isSim = true
of "ARCH_FAMILY":
let arch = keyval[1].strip(chars = {'"'})
case arch
of "rv32":
result.arch = "riscv32"
of "rv64":
result.arch = "riscv64"
of "DEBUG_NOOPT":
result.opt = oNone
of "DEBUG_FULLOPT":
Expand Down

0 comments on commit f6a4e06

Please sign in to comment.