Commit de6b4f99 authored by Heiko Carstens's avatar Heiko Carstens
Browse files

s390/string: Remove strcpy() implementation 



Remove the optimized strcpy() library implementation. This doesn't make any
difference since gcc recognizes all strcpy() usages anyway and uses the
builtin variant. There is not a single branch to strcpy() within the
generated kernel image, which also seems to be the reason why most other
architectures don't have a strcpy() implementation anymore.

Reviewed-by: default avatarMikhail Zaslonko <zaslonko@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent ed5eef11

arch/s390/include/asm/string.h

+0 −18
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ void *memmove(void *dest, const void *src, size_t n); 
#define __HAVE_ARCH_MEMSCAN	/* inline & arch function */

#define __HAVE_ARCH_STRCAT	/* inline & arch function */

#define __HAVE_ARCH_STRCMP	/* arch function */

#define __HAVE_ARCH_STRCPY	/* inline & arch function */

#define __HAVE_ARCH_STRLCAT	/* arch function */

#define __HAVE_ARCH_STRLEN	/* inline & arch function */

#define __HAVE_ARCH_STRNCAT	/* arch function */
@@ -153,22 +152,6 @@ static inline char *strcat(char *dst, const char *src) 
}

#endif



#ifdef __HAVE_ARCH_STRCPY

static inline char *strcpy(char *dst, const char *src)

{

	char *ret = dst;



	asm volatile(

		"	lghi	0,0\n"

		"0:	mvst	%[dst],%[src]\n"

		"	jo	0b"

		: [dst] "+&a" (dst), [src] "+&a" (src)

		:

		: "cc", "memory", "0");

	return ret;

}

#endif



#if defined(__HAVE_ARCH_STRLEN) || (defined(CONFIG_KASAN) && !defined(__SANITIZE_ADDRESS__))

static inline size_t __no_sanitize_prefix_strfunc(strlen)(const char *s)

{
@@ -206,7 +189,6 @@ static inline size_t strnlen(const char * s, size_t n) 
void *memchr(const void * s, int c, size_t n);

void *memscan(void *s, int c, size_t n);

char *strcat(char *dst, const char *src);

char *strcpy(char *dst, const char *src);

size_t strlen(const char *s);

size_t strnlen(const char * s, size_t n);

#endif /* !IN_ARCH_STRING_C */

arch/s390/lib/string.c

+0 −24
Original line number Diff line number Diff line
@@ -77,30 +77,6 @@ size_t strnlen(const char *s, size_t n) 
EXPORT_SYMBOL(strnlen);

#endif



/**

 * strcpy - Copy a %NUL terminated string

 * @dest: Where to copy the string to

 * @src: Where to copy the string from

 *

 * returns a pointer to @dest

 */

#ifdef __HAVE_ARCH_STRCPY

char *strcpy(char *dest, const char *src)

{

	char *ret = dest;



	asm volatile(

		"	lghi	0,0\n"

		"0:	mvst	%[dest],%[src]\n"

		"	jo	0b\n"

		: [dest] "+&a" (dest), [src] "+&a" (src)

		:

		: "cc", "memory", "0");

	return ret;

}

EXPORT_SYMBOL(strcpy);

#endif



/**

 * strcat - Append one %NUL-terminated string to another

 * @dest: The string to be appended to