From cf6e8825e2c480e5da6d632ea4829269b90e32a1 Mon Sep 17 00:00:00 2001
From: Karl Fessel <karl.fessel@ovgu.de>
Date: Fri, 28 Jan 2022 13:22:44 +0100
Subject: [PATCH] pkg/wamr: update for ztimer(64)

---
 pkg/wamr/Makefile     | 7 +++++--
 pkg/wamr/Makefile.dep | 3 +++
 pkg/wamr/config.cmake | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkg/wamr/Makefile b/pkg/wamr/Makefile
index a85318ab3a..0cb0fc9055 100644
--- a/pkg/wamr/Makefile
+++ b/pkg/wamr/Makefile
@@ -1,10 +1,10 @@
 PKG_NAME=wamr
 PKG_URL=https://github.com/bytecodealliance/wasm-micro-runtime.git
-PKG_BLEADING?=1
 ifeq ($(PKG_BLEADING),1)
   PKG_VERSION=main
 else
-  PKG_VERSION=8fd89bd415db73281c8fbd53de1c2726f35b5ddb
+  PKG_VERSION=770ca8c90c8803f934bf681cd29949b7fb5291a3
+  #main 2022-01-28
 endif
 PKG_LICENSE=Apache-2.0
 
@@ -14,6 +14,7 @@ include $(RIOTBASE)/pkg/pkg.mk
 
 #less Wall TODO: get things fixed upstream
 CFLAGS :=  $(filter-out -pedantic, $(CFLAGS))
+CFLAGS :=  $(filter-out -Werror, $(CFLAGS))
 CFLAGS += -Wno-format
 CFLAGS += -Wno-strict-prototypes
 CFLAGS += -Wno-old-style-definition
@@ -86,6 +87,8 @@ print_build_target:
 	@echo CFLAGS: $(CFLAGS)
 	@echo WAMR_BUILD_TARGET: $(WAMR_BUILD_TARGET)
 	@echo WAMR_CONFIG: $(WAMR_CONFIG)
+	@echo RIOT_INCLUDES: $(RIOT_INCLUDES)
+
 
 CHECK_VERSION:
 	test -f $(PKG_DOWNLOADED) && (test `cat $(PKG_DOWNLOADED)` = $(PKG_VERSION) || rm $(PKG_DOWNLOADED));true
diff --git a/pkg/wamr/Makefile.dep b/pkg/wamr/Makefile.dep
index abd5a6c1c4..92a9d1904d 100644
--- a/pkg/wamr/Makefile.dep
+++ b/pkg/wamr/Makefile.dep
@@ -1,4 +1,7 @@
 USEMODULE += sema
+USEMODULE += ztimer64_msec
+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
diff --git a/pkg/wamr/config.cmake b/pkg/wamr/config.cmake
index 601794add0..a413eb94d0 100644
--- a/pkg/wamr/config.cmake
+++ b/pkg/wamr/config.cmake
@@ -1,4 +1,4 @@
-# following line a hints for build options mostly untested
+# following lines are hints for build options (mostly untested)
 # some are not matching RIOTs application targets
 # they default to off
 
@@ -19,3 +19,6 @@
 # set (WAMR_APP_THREAD_STACK_SIZE_MAX ${WAMR_APP_THREAD_STACK_SIZE_MAX})  #set maximum thread stack size
 # set (WAMR_BUILD_CUSTOM_NAME_SECTION 1) #enable Custom name section
 # set (WAMR_BUILD_TAIL_CALL 1) #enable Tail call
+
+# the builtin wamr libc is enabled by default
+# set (WAMR_BUILD_LIBC_BUILTIN 0) #disable builtin libc