diff --git a/include/nuttx/compiler.h b/include/nuttx/compiler.h index 6efefcdd24..3772cf23d0 100644 --- a/include/nuttx/compiler.h +++ b/include/nuttx/compiler.h @@ -182,7 +182,7 @@ # if defined(__clang__) # define nostackprotect_function __attribute__ ((optnone)) # else -# define nostackprotect_function __attribute__ ((__optimize__ ("-fno-stack-protector"))) +# define nostackprotect_function __attribute__ ((__optimize__("-fno-stack-protector"))) # endif #endif @@ -381,6 +381,12 @@ # define UNUSED(a) ((void)(1 || (a))) +# if defined(__clang__) +# define no_builtin(n) __attribute__((no_builtin(n))) +# else +# define no_builtin(n) __attribute__((__optimize__("-fno-tree-loop-distribute-patterns"))) +#endif + /* SDCC-specific definitions ************************************************/ #elif defined(SDCC) || defined(__SDCC) @@ -537,6 +543,8 @@ # define offsetof(a, b) ((size_t)(&(((a *)(0))->b))) +# define no_builtin(n) + /* Zilog-specific definitions ***********************************************/ #elif defined(__ZILOG__) @@ -677,6 +685,8 @@ # define offsetof(a, b) ((size_t)(&(((a *)(0))->b))) +# define no_builtin(n) + /* ICCARM-specific definitions **********************************************/ #elif defined(__ICCARM__) @@ -746,6 +756,8 @@ # define offsetof(a, b) ((size_t)(&(((a *)(0))->b))) +# define no_builtin(n) + /* Unknown compiler *********************************************************/ #else @@ -803,6 +815,8 @@ # define offsetof(a, b) ((size_t)(&(((a *)(0))->b))) +# define no_builtin(n) + #endif /**************************************************************************** diff --git a/libs/libc/string/lib_memcmp.c b/libs/libc/string/lib_memcmp.c index 1f788f451e..9602c9a254 100644 --- a/libs/libc/string/lib_memcmp.c +++ b/libs/libc/string/lib_memcmp.c @@ -32,6 +32,7 @@ #ifndef CONFIG_LIBC_ARCH_MEMCMP #undef memcmp /* See mm/README.txt */ +no_builtin("memcmp") int memcmp(FAR const void *s1, FAR const void *s2, size_t n) { unsigned char *p1 = (unsigned char *)s1; diff --git a/libs/libc/string/lib_memcpy.c b/libs/libc/string/lib_memcpy.c index de4f8eed23..ba91d5abb1 100644 --- a/libs/libc/string/lib_memcpy.c +++ b/libs/libc/string/lib_memcpy.c @@ -36,6 +36,7 @@ #ifndef CONFIG_LIBC_ARCH_MEMCPY #undef memcpy /* See mm/README.txt */ +no_builtin("memcpy") FAR void *memcpy(FAR void *dest, FAR const void *src, size_t n) { FAR unsigned char *pout = (FAR unsigned char *)dest; diff --git a/libs/libc/string/lib_memmove.c b/libs/libc/string/lib_memmove.c index bc72a85daf..afed8e0172 100644 --- a/libs/libc/string/lib_memmove.c +++ b/libs/libc/string/lib_memmove.c @@ -32,6 +32,7 @@ #ifndef CONFIG_LIBC_ARCH_MEMMOVE #undef memmove /* See mm/README.txt */ +no_builtin("memmove") FAR void *memmove(FAR void *dest, FAR const void *src, size_t count) { FAR char *tmp; diff --git a/libs/libc/string/lib_memset.c b/libs/libc/string/lib_memset.c index e22a6cd205..4f20f15f9e 100644 --- a/libs/libc/string/lib_memset.c +++ b/libs/libc/string/lib_memset.c @@ -48,6 +48,7 @@ #ifndef CONFIG_LIBC_ARCH_MEMSET #undef memset /* See mm/README.txt */ +no_builtin("memset") FAR void *memset(FAR void *s, int c, size_t n) { #ifdef CONFIG_MEMSET_OPTSPEED diff --git a/libs/libc/string/lib_vikmemcpy.c b/libs/libc/string/lib_vikmemcpy.c index 88e5676be7..ce9a89a4e2 100644 --- a/libs/libc/string/lib_vikmemcpy.c +++ b/libs/libc/string/lib_vikmemcpy.c @@ -305,6 +305,7 @@ typedef uint32_t uintn; * ****************************************************************************/ +no_builtin("memcpy") FAR void *memcpy(FAR void *dest, FAR const void *src, size_t count) { FAR uint8_t *dst8 = (FAR uint8_t *)dest;