X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fstring%2Fmemmove.c;h=5dc9cdb924218cb10f284d013984797e03fd4e19;hb=12a757b3219408c5f96fd5b9daa5c551944337ee;hp=27f670e1a31fe860ff6ce17a453559ef42706aeb;hpb=1701e4f3d46b14c4c4be8a46e64f8eaf15a5c061;p=musl

diff --git a/src/string/memmove.c b/src/string/memmove.c
index 27f670e1..5dc9cdb9 100644
--- a/src/string/memmove.c
+++ b/src/string/memmove.c
@@ -1,8 +1,10 @@
 #include <string.h>
 #include <stdint.h>
 
-#define WT size_t
+#ifdef __GNUC__
+typedef __attribute__((__may_alias__)) size_t WT;
 #define WS (sizeof(WT))
+#endif
 
 void *memmove(void *dest, const void *src, size_t n)
 {
@@ -10,9 +12,10 @@ void *memmove(void *dest, const void *src, size_t n)
 	const char *s = src;
 
 	if (d==s) return d;
-	if (s+n <= d || d+n <= s) return memcpy(d, s, n);
+	if ((uintptr_t)s-(uintptr_t)d-n <= -2*n) return memcpy(d, s, n);
 
 	if (d<s) {
+#ifdef __GNUC__
 		if ((uintptr_t)s % WS == (uintptr_t)d % WS) {
 			while ((uintptr_t)d % WS) {
 				if (!n--) return dest;
@@ -20,8 +23,10 @@ void *memmove(void *dest, const void *src, size_t n)
 			}
 			for (; n>=WS; n-=WS, d+=WS, s+=WS) *(WT *)d = *(WT *)s;
 		}
+#endif
 		for (; n; n--) *d++ = *s++;
 	} else {
+#ifdef __GNUC__
 		if ((uintptr_t)s % WS == (uintptr_t)d % WS) {
 			while ((uintptr_t)(d+n) % WS) {
 				if (!n--) return dest;
@@ -29,6 +34,7 @@ void *memmove(void *dest, const void *src, size_t n)
 			}
 			while (n>=WS) n-=WS, *(WT *)(d+n) = *(WT *)(s+n);
 		}
+#endif
 		while (n) n--, d[n] = s[n];
 	}