fix arm __tlsdesc_dynamic when built as thumb code without __ARM_ARCH>=5

[musl] / src / string / memchr.c

diff --git a/src/string/memchr.c b/src/string/memchr.c
index 4daff7b..65f0d78 100644 (file)
--- a/src/string/memchr.c
+++ b/src/string/memchr.c
@@ -12,12 +12,16 @@ void *memchr(const void *src, int c, size_t n)
 {
        const unsigned char *s = src;
        c = (unsigned char)c;
+#ifdef __GNUC__
        for (; ((uintptr_t)s & ALIGN) && n && *s != c; s++, n--);
        if (n && *s != c) {
-               const size_t *w;
+               typedef size_t __attribute__((__may_alias__)) word;
+               const word *w;
                size_t k = ONES * c;
                for (w = (const void *)s; n>=SS && !HASZERO(*w^k); w++, n-=SS);
-               for (s = (const void *)w; n && *s != c; s++, n--);
+               s = (const void *)w;
        }
+#endif
+       for (; n && *s != c; s++, n--);
        return n ? (void *)s : 0;
 }