baremetal: disable -mindirect-branch-register (requires gcc >5.4)

CMakeLists.txt

@@ -135,7 +135,8 @@ endif()
 
 if (WAMR_BUILD_TARGET MATCHES "X86_.*" OR WAMR_BUILD_TARGET STREQUAL "AMD_64")
   if (NOT (CMAKE_C_COMPILER MATCHES ".*clang.*" OR CMAKE_C_COMPILER_ID MATCHES ".*Clang"))
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mindirect-branch-register")
+    # NOTE: The crosscompiler (gcc 5.4 i386) does not support this flag
+    # set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mindirect-branch-register")
   endif ()
 endif ()
 

core/shared/platform/baremetal/platform_init.c

@@ -32,51 +32,51 @@ bh_log_proc_mem(const char *function, uint32 line)
  * string
  ****************************************************/
 
-void *
-memcpy(void *restrict dest, const void *restrict src, size_t n)
-{
-    unsigned char *d = (unsigned char *)dest;
-    const unsigned char *s = (const unsigned char *)src;
-
-    while (n--)
-        *d++ = *s++;
-
-    return dest;
-}
-
-void *
-memmove(void *dest, const void *src, size_t n)
-{
-    unsigned char *d = (unsigned char *)dest;
-    const unsigned char *s = (const unsigned char *)src;
-
-    if (d == s || n == 0)
-        return dest;
-
-    if (d < s) {
-        /* forward copy */
-        while (n--)
-            *d++ = *s++;
-    }
-    else {
-        /* backward copy */
-        d += n;
-        s += n;
-        while (n--)
-            *--d = *--s;
-    }
-
-    return dest;
-}
-
-void *
-memset(void *dest, int c, size_t n)
-{
-    unsigned char *p = dest;
-    while (n--)
-        *p++ = (unsigned char)c;
-    return dest;
-}
+// void *
+// memcpy(void *restrict dest, const void *restrict src, size_t n)
+// {
+//     unsigned char *d = (unsigned char *)dest;
+//     const unsigned char *s = (const unsigned char *)src;
+//
+//     while (n--)
+//         *d++ = *s++;
+//
+//     return dest;
+// }
+//
+// void *
+// memmove(void *dest, const void *src, size_t n)
+// {
+//     unsigned char *d = (unsigned char *)dest;
+//     const unsigned char *s = (const unsigned char *)src;
+//
+//     if (d == s || n == 0)
+//         return dest;
+//
+//     if (d < s) {
+//         /* forward copy */
+//         while (n--)
+//             *d++ = *s++;
+//     }
+//     else {
+//         /* backward copy */
+//         d += n;
+//         s += n;
+//         while (n--)
+//             *--d = *--s;
+//     }
+//
+//     return dest;
+// }
+//
+// void *
+// memset(void *dest, int c, size_t n)
+// {
+//     unsigned char *p = dest;
+//     while (n--)
+//         *p++ = (unsigned char)c;
+//     return dest;
+// }
 
 /****************************************************
  * mman

core/shared/platform/baremetal/platform_internal.h

@@ -81,12 +81,12 @@ os_getpagesize()
     return 4096;
 }
 
-void *
-memcpy(void *restrict dest, const void *restrict src, size_t n);
-void *
-memmove(void *dest, const void *src, size_t n);
-void *
-memset(void *dest, int c, size_t n);
+// void *
+// memcpy(void *restrict dest, const void *restrict src, size_t n);
+// void *
+// memmove(void *dest, const void *src, size_t n);
+// void *
+// memset(void *dest, int c, size_t n);
 
 #ifdef __cplusplus
 }