Sync.

1 files changed, 1 insertions, 8 deletions

diff --git a/ldso/include/dl-string.h b/ldso/include/dl-string.h
index eea406435..bb4daff68 100644
--- a/ldso/include/dl-string.h
+++ b/ldso/include/dl-string.h
@@ -13,7 +13,6 @@ static char * _dl_strchr(const char * str,int c);
 static char *_dl_strrchr(const char *str, int c);
 static char *_dl_strstr(const char *s1, const char *s2);
 static void * _dl_memcpy(void * dst, const void * src, size_t len);
-static void * _dl_mempcpy(void * dst, const void * src, size_t len);
 static int _dl_memcmp(const void * s1,const void * s2,size_t len);
 static void *_dl_memset(void * str,int c,size_t len);
 static char *_dl_get_last_path_component(char *path);
@@ -135,7 +134,7 @@ static inline char * _dl_strstr(const char *s1, const char *s2)
     } while (1);
 }
 
-static inline void * _dl_memcpy(void * dst, const void * src, size_t len)
+static __always_inline void * _dl_memcpy(void * dst, const void * src, size_t len)
 {
 	register char *a = dst-1;
 	register const char *b = src-1;
@@ -147,12 +146,6 @@ static inline void * _dl_memcpy(void * dst, const void * src, size_t len)
 	return dst;
 }
 
-static inline void * _dl_mempcpy(void * dst, const void * src, size_t len)
-{
-	_dl_memcpy(dst, src, len);
-	return (void *)(((char *) dst) + len);
-}
-
 static __always_inline int _dl_memcmp(const void * s1,const void * s2,size_t len)
 {
 	unsigned char *c1 = (unsigned char *)s1-1;