Fixing debug.stm32f4: uncommented memcpy and memset aliases, placed them under #ifndef LIBC_MUSL.

This commit is contained in:
Ruben Ayrapetyan
2014-07-30 13:57:40 +04:00
parent d8c721f57a
commit 56daef38eb
2 changed files with 36 additions and 30 deletions
+2
View File
@@ -231,10 +231,12 @@ ifeq ($(OPTION_MCU),disable)
ifeq ($(OPTION_MUSL),enable) ifeq ($(OPTION_MUSL),enable)
CC := musl-$(CC) CC := musl-$(CC)
DEFINES_JERRY += -DLIBC_MUSL
CFLAGS_COMMON += -static CFLAGS_COMMON += -static
else else
CFLAGS_COMMON += -fsanitize=address CFLAGS_COMMON += -fsanitize=address
endif endif
ifeq ($(OPTION_COLOR),enable) ifeq ($(OPTION_COLOR),enable)
CFLAGS_COMMON += -fdiagnostics-color=always CFLAGS_COMMON += -fdiagnostics-color=always
endif endif
+34 -30
View File
@@ -18,36 +18,40 @@
*/ */
#include "jerry-libc.h" #include "jerry-libc.h"
//
///** FIXME( #ifndef LIBC_MUSL should be removed from here when own libc will be implemented )
// * memcpy alias to __memcpy (for compiler usage)
// */ #ifndef LIBC_MUSL
//extern void *memcpy(void *s1, const void*s2, size_t n); /**
// * memcpy alias to __memcpy (for compiler usage)
///** */
// * memset alias to __memset (for compiler usage) extern void *memcpy(void *s1, const void*s2, size_t n);
// */
//extern void *memset(void *s, int c, size_t n); /**
// * memset alias to __memset (for compiler usage)
///** */
// * memcpy alias to __memcpy (for compiler usage) extern void *memset(void *s, int c, size_t n);
// */
//void* memcpy(void *s1, /**< destination */ /**
// const void* s2, /**< source */ * memcpy alias to __memcpy (for compiler usage)
// size_t n) /**< bytes number */ */
//{ void* memcpy(void *s1, /**< destination */
// return __memcpy(s1, s2, n); const void* s2, /**< source */
//} /* memcpy */ size_t n) /**< bytes number */
// {
///** return __memcpy(s1, s2, n);
// * memset alias to __memset (for compiler usage) } /* memcpy */
// */
//void* memset(void *s, /**< area to set values in */ /**
// int c, /**< value to set */ * memset alias to __memset (for compiler usage)
// size_t n) /**< area size */ */
//{ void* memset(void *s, /**< area to set values in */
// return __memset(s, c, n); int c, /**< value to set */
//} /* memset */ size_t n) /**< area size */
{
return __memset(s, c, n);
} /* memset */
#endif /* LIBC_MUSL */
/** /**
* memset * memset