From ceff11ee7eb6f95ac93041aa7885c4c5505e6f70 Mon Sep 17 00:00:00 2001 From: Peter Bee Date: Fri, 21 Oct 2022 11:15:51 +0800 Subject: [PATCH] core/iwasm: Fix build on arm64 host (macOS) (#1625) Add aarch64 files on nuttx platform Signed-off-by: Peter Bee Change-Id: Idf94cf6aba01f1f9191412a71ef31c1a3b944c78 --- product-mini/platforms/nuttx/wamr.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/product-mini/platforms/nuttx/wamr.mk b/product-mini/platforms/nuttx/wamr.mk index bebd5f2a..06c40d68 100644 --- a/product-mini/platforms/nuttx/wamr.mk +++ b/product-mini/platforms/nuttx/wamr.mk @@ -32,6 +32,12 @@ WAMR_BUILD_TARGET := RISCV32 else ifeq ($(CONFIG_ARCH_SIM),y) ifeq ($(CONFIG_SIM_M32),y) WAMR_BUILD_TARGET := X86_32 +else ifeq ($(CONFIG_HOST_X86),y) +WAMR_BUILD_TARGET := X86_32 +else ifeq ($(CONFIG_HOST_ARM),y) +WAMR_BUILD_TARGET := ARM +else ifeq ($(CONFIG_HOST_ARM64),y) +WAMR_BUILD_TARGET := AARCH64 else WAMR_BUILD_TARGET := X86_64 endif @@ -54,6 +60,11 @@ else ifeq ($(WAMR_BUILD_TARGET), X86_64) CFLAGS += -DBUILD_TARGET_X86_64 INVOKE_NATIVE := invokeNative_em64.s AOT_RELOC := aot_reloc_x86_64.c +else ifeq ($(WAMR_BUILD_TARGET), AARCH64) + CFLAGS += -DBUILD_TARGET_AARCH64 + CFLAGS += -DBUILD_TARGET=\"$(WAMR_BUILD_TARGET)\" + INVOKE_NATIVE := invokeNative_aarch64.s + AOT_RELOC := aot_reloc_aarch64.c else ifeq ($(findstring ARM,$(WAMR_BUILD_TARGET)), ARM) CFLAGS += -DBUILD_TARGET_ARM CFLAGS += -DBUILD_TARGET=\"$(WAMR_BUILD_TARGET)\"