From 227f57dbb3194c859b7a2fb676caa9b33f82bfc5 Mon Sep 17 00:00:00 2001 From: Karl Fessel Date: Thu, 10 Feb 2022 12:18:37 +0100 Subject: [PATCH] pkg/wamr: remove support for architectures * for which no working assembly invokeNative is provided --- pkg/wamr/Makefile | 3 +-- pkg/wamr/Makefile.dep | 4 +++- pkg/wamr/doc.txt | 6 +++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkg/wamr/Makefile b/pkg/wamr/Makefile index 226cd6899f..4dfc249b05 100644 --- a/pkg/wamr/Makefile +++ b/pkg/wamr/Makefile @@ -36,10 +36,9 @@ ifeq ($(findstring arm,$(OS_ARCH)),arm) WAMR_BUILD_TARGET = ARM endif ifeq ($(findstring aarch,$(OS_ARCH)),aarch) + #using 32Bit arm on native aarch WAMR_BUILD_TARGET = ARM endif -else ifeq ($(findstring armv4,$(CPU_ARCH)),armv4) - WAMR_BUILD_TARGET = ARM else ifeq ($(findstring arm,$(CPU_ARCH)),arm) WAMR_BUILD_TARGET = THUMB else ifeq ($(CPU_ARCH),mips32r2) diff --git a/pkg/wamr/Makefile.dep b/pkg/wamr/Makefile.dep index 92a9d1904d..bba0e8bf1b 100644 --- a/pkg/wamr/Makefile.dep +++ b/pkg/wamr/Makefile.dep @@ -4,4 +4,6 @@ USEMODULE += ztimer_usec #WAMR supports "X86_32/64", "AARCH64", "ARM", "THUMB", "MIPS", "XTENSA" and RISCV -FEATURES_REQUIRED_ANY += arch_native|arch_arm|arch_mips32r2|arch_esp32|arch_riscv +FEATURES_REQUIRED_ANY += arch_native|arch_esp32|arch_riscv|cortexm_svc +#arch_arm|arch_mips32r2|arch_esp need modified +# build/pkg/wamr/core/iwasm/common/arch/invokeNative_.s diff --git a/pkg/wamr/doc.txt b/pkg/wamr/doc.txt index 8a50b999ec..5ef46bbeb4 100644 --- a/pkg/wamr/doc.txt +++ b/pkg/wamr/doc.txt @@ -16,8 +16,12 @@ * WAMR integration into RIOT should be considered experimental. * Changes that had to be done in WAMR are send to and integrated into upstream. * WAMR provides support for numerous architectures: + * "X86_32/64", "AARCH64", "ARM", "THUMB", "MIPS", "XTENSA" and "RISCV" + * this Package will build for native (x86,arm, aarch(using arm)), cortex-m, esp32 and riscv + * + * support for other architectures might provideable using the generic + * `core/iwasm/common/arch/invokeNative_general.c` this is not tested * - * "X86_32", "AARCH64", "ARM", "THUMB", "MIPS", "XTENSA" and "RISCV" * tested : Cortex-M - "THUMB", native - "X86_32" * * ## Memory usage