path: root/arch/s390/include/asm/string.h
diff options
authorHeiko Carstens <heiko.carstens@de.ibm.com>2012-08-14 13:20:20 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2012-09-26 15:44:50 +0200
commit535c611ddd3eb076f96579131e30bc5dd02a3b1c (patch)
treef6e3fdb6c8870ab01e35e79a4f017c6f6a365fda /arch/s390/include/asm/string.h
parent68d9884dbc4215b6693c108eb35a02bd78f7956e (diff)
s390/string: provide asm lib functions for memcpy and memcmp
Our memcpy and memcmp variants were implemented by calling the corresponding gcc builtin variants. However gcc is free to replace a call to __builtin_memcmp with a call to memcmp which, when called, will result in an endless recursion within memcmp. So let's provide asm variants and also fix the variants that are used for uncompressing the kernel image. In addition remove all other occurences of builtin function calls. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/include/asm/string.h')
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/s390/include/asm/string.h b/arch/s390/include/asm/string.h
index 1bd1352fa3b5..7e2dcd7c57ef 100644
--- a/arch/s390/include/asm/string.h
+++ b/arch/s390/include/asm/string.h
@@ -96,7 +96,6 @@ static inline char *strcat(char *dst, const char *src)
static inline char *strcpy(char *dst, const char *src)
-#if __GNUC__ < 4
register int r0 asm("0") = 0;
char *ret = dst;
@@ -106,14 +105,10 @@ static inline char *strcpy(char *dst, const char *src)
: "+&a" (dst), "+&a" (src) : "d" (r0)
: "cc", "memory");
return ret;
- return __builtin_strcpy(dst, src);
static inline size_t strlen(const char *s)
-#if __GNUC__ < 4
register unsigned long r0 asm("0") = 0;
const char *tmp = s;
@@ -122,9 +117,6 @@ static inline size_t strlen(const char *s)
" jo 0b"
: "+d" (r0), "+a" (tmp) : : "cc");
return r0 - (unsigned long) s;
- return __builtin_strlen(s);
static inline size_t strnlen(const char * s, size_t n)

Privacy Policy