Skip to content

Commit 000680f

Browse files
authored
NuttX: Retire CONFIG_ARCH_RV32IM and CONFIG_ARCH_RV64GC (#3717)
These symbols had been removed from NuttX in 2022, so it's time to remove references to them.
1 parent 740f499 commit 000680f

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

product-mini/platforms/nuttx/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ elseif(CONFIG_ARCH_X86_64)
1818
set(WAMR_BUILD_TARGET X86_64)
1919
elseif(CONFIG_ARCH_XTENSA)
2020
set(WAMR_BUILD_TARGET XTENSA)
21-
elseif(CONFIG_ARCH_RV64GC OR CONFIG_ARCH_RV64)
21+
elseif(CONFIG_ARCH_RV64)
2222
set(WAMR_BUILD_TARGET RISCV64)
23-
elseif(CONFIG_ARCH_RV32IM OR CONFIG_ARCH_RV32)
23+
elseif(CONFIG_ARCH_RV32)
2424
set(WAMR_BUILD_TARGET RISCV32)
2525
elseif(CONFIG_ARCH_SIM)
2626
if(CONFIG_SIM_M32 OR CONFIG_HOST_X86)

product-mini/platforms/nuttx/wamr.mk

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@ else ifeq ($(CONFIG_ARCH_X86_64),y)
2121
WAMR_BUILD_TARGET := X86_64
2222
else ifeq ($(CONFIG_ARCH_XTENSA),y)
2323
WAMR_BUILD_TARGET := XTENSA
24-
# RV64GC and RV32IM used in older
25-
# version NuttX
26-
else ifeq ($(CONFIG_ARCH_RV64GC),y)
27-
WAMR_BUILD_TARGET := RISCV64
28-
else ifeq ($(CONFIG_ARCH_RV32IM),y)
29-
WAMR_BUILD_TARGET := RISCV32
3024
else ifeq ($(CONFIG_ARCH_RV64),y)
3125
WAMR_BUILD_TARGET := RISCV64
3226
else ifeq ($(CONFIG_ARCH_RV32),y)

0 commit comments

Comments
 (0)