Explorar el Código

Correct DPFPU and FPU handling for NuttX (#1027)

Since DPFPU depends on FPU, if FPU is enabled we will never enter DPFPU
branch since `ifeq (${CONFIG_ARCH_FPU}, y)` is always true.

Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
Huang Qi hace 3 años
padre
commit
0065743075
Se han modificado 1 ficheros con 8 adiciones y 8 borrados
  1. 8 8
      product-mini/platforms/nuttx/wamr.mk

+ 8 - 8
product-mini/platforms/nuttx/wamr.mk

@@ -74,12 +74,12 @@ else ifeq (${WAMR_BUILD_TARGET}, XTENSA)
   AOT_RELOC := aot_reloc_xtensa.c
 else ifeq (${WAMR_BUILD_TARGET}, RISCV64)
 
-ifeq (${CONFIG_ARCH_FPU},y)
-  $(error riscv64 lp64f is unsupported)
-else ifeq (${CONFIG_ARCH_DPFPU}, y)
+ifeq (${CONFIG_ARCH_DPFPU},y)
   CFLAGS += -DBUILD_TARGET_RISCV64_LP64D
-else
+else ifneq (${CONFIG_ARCH_FPU},y)
   CFLAGS += -DBUILD_TARGET_RISCV64_LP64
+else
+  $(error riscv64 lp64f is unsupported)
 endif
   INVOKE_NATIVE += invokeNative_riscv.S
 
@@ -87,12 +87,12 @@ endif
 
 else ifeq (${WAMR_BUILD_TARGET}, RISCV32)
 
-ifeq (${CONFIG_ARCH_FPU}, y)
-  $(error riscv32 ilp32f is unsupported)
-else ifeq (${CONFIG_ARCH_DPFPU}, y)
+ifeq (${CONFIG_ARCH_DPFPU},y)
   CFLAGS += -DBUILD_TARGET_RISCV32_ILP32D
-else
+else ifneq (${CONFIG_ARCH_FPU},y)
   CFLAGS += -DBUILD_TARGET_RISCV32_ILP32
+else
+  $(error riscv32 ilp32f is unsupported)
 endif
 
   INVOKE_NATIVE += invokeNative_riscv.S