14 files changed, 42 insertions, 0 deletions
diff --git a/libc/misc/error/error.c b/libc/misc/error/error.c
index eddf24587..576d11154 100644
--- a/libc/misc/error/error.c
+++ b/libc/misc/error/error.c
@@ -22,6 +22,8 @@
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
 /* Adjusted slightly by Erik Andersen <andersen@uclibc.org> */
 
+#define strerror __strerror
+
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
diff --git a/libc/misc/ftw/ftw.c b/libc/misc/ftw/ftw.c
index e58c3e6ca..cf410ba02 100644
--- a/libc/misc/ftw/ftw.c
+++ b/libc/misc/ftw/ftw.c
@@ -18,6 +18,8 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+#define mempcpy __libc_mempcpy
+
 #define _GNU_SOURCE
 #include <features.h>
 
diff --git a/libc/misc/glob/glob.c b/libc/misc/glob/glob.c
index 0d788df53..246402113 100644
--- a/libc/misc/glob/glob.c
+++ b/libc/misc/glob/glob.c
@@ -15,6 +15,9 @@ License along with this library; see the file COPYING.LIB.  If
 not, write to the Free Software Foundation, Inc., 675 Mass Ave,
 Cambridge, MA 02139, USA.  */
 
+#define strrchr __strrchr
+#define strcoll __strcoll
+
 #include <features.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/libc/misc/locale/locale.c b/libc/misc/locale/locale.c
index 6e5830733..da62b04ce 100644
--- a/libc/misc/locale/locale.c
+++ b/libc/misc/locale/locale.c
@@ -46,6 +46,8 @@
  *    locale support had (8-bit codesets only).
  */
 
+#define strtok_r __strtok_r
+
 #define _GNU_SOURCE
 
 #define __CTYPE_HAS_8_BIT_LOCALES 1
diff --git a/libc/misc/mntent/mntent.c b/libc/misc/mntent/mntent.c
index d98a6870f..1af5a6b67 100644
--- a/libc/misc/mntent/mntent.c
+++ b/libc/misc/mntent/mntent.c
@@ -1,3 +1,6 @@
+#define strtok_r __strtok_r
+#define strstr __strstr
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/libc/misc/regex/regex.c b/libc/misc/regex/regex.c
index 0e8a18f5d..5f2e90da3 100644
--- a/libc/misc/regex/regex.c
+++ b/libc/misc/regex/regex.c
@@ -20,6 +20,14 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+#define HAVE_MEMPCPY
+#define __mempcpy __libc_mempcpy
+#define memset __memset
+#define memcmp __memcmp
+#define strcmp __strcmp
+#define strlen __strlen
+/* for some reason this does not work */
+#define memcpy __memcpy
 
 /* To exclude some unwanted junk.... */
 #undef _LIBC
@@ -30,6 +38,9 @@
 #include <string.h>
 #define STDC_HEADERS
 
+extern void *__libc_mempcpy (void *__restrict __dest,
+			__const void *__restrict __src, size_t __n) /*attribute_hidden*/;
+
 /* AIX requires this to be the first thing in the file. */
 #if defined _AIX && !defined REGEX_MALLOC
   #pragma alloca
diff --git a/libc/misc/statfs/fstatvfs.c b/libc/misc/statfs/fstatvfs.c
index 5e08f51ad..b79195e73 100644
--- a/libc/misc/statfs/fstatvfs.c
+++ b/libc/misc/statfs/fstatvfs.c
@@ -17,6 +17,8 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+#define strsep __strsep
+
 #include <features.h>
 
 #define __USE_GNU
diff --git a/libc/misc/statfs/fstatvfs64.c b/libc/misc/statfs/fstatvfs64.c
index ed4b63234..0d7416df3 100644
--- a/libc/misc/statfs/fstatvfs64.c
+++ b/libc/misc/statfs/fstatvfs64.c
@@ -17,6 +17,8 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+#define strsep __strsep
+
 #include <features.h>
 
 #ifdef __UCLIBC_HAS_LFS__
diff --git a/libc/misc/statfs/statvfs.c b/libc/misc/statfs/statvfs.c
index 02a95fcde..0fe239573 100644
--- a/libc/misc/statfs/statvfs.c
+++ b/libc/misc/statfs/statvfs.c
@@ -17,6 +17,8 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+#define strsep __strsep
+
 #include <features.h>
 
 #define __USE_GNU
diff --git a/libc/misc/statfs/statvfs64.c b/libc/misc/statfs/statvfs64.c
index 78d1a4c3f..8bacbba70 100644
--- a/libc/misc/statfs/statvfs64.c
+++ b/libc/misc/statfs/statvfs64.c
@@ -17,6 +17,8 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+#define strsep __strsep
+
 #include <features.h>
 
 #ifdef __UCLIBC_HAS_LFS__
diff --git a/libc/misc/syslog/syslog.c b/libc/misc/syslog/syslog.c
index 704336006..dc30db913 100644
--- a/libc/misc/syslog/syslog.c
+++ b/libc/misc/syslog/syslog.c
@@ -31,6 +31,8 @@
  * SUCH DAMAGE.
  */
 
+#define memmove __memmove
+
 #define __FORCE_GLIBC
 #define _GNU_SOURCE
 #include <features.h>
diff --git a/libc/misc/time/time.c b/libc/misc/time/time.c
index 0eda2a4d1..67add6845 100644
--- a/libc/misc/time/time.c
+++ b/libc/misc/time/time.c
@@ -129,6 +129,9 @@
  *            differs (intentionally) from glibc's behavior.
  */
 
+#define _uintmaxtostr __libc__uintmaxtostr
+#define strnlen __strnlen
+
 #define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/libc/misc/wchar/wchar.c b/libc/misc/wchar/wchar.c
index c9eb8df39..6778120b2 100644
--- a/libc/misc/wchar/wchar.c
+++ b/libc/misc/wchar/wchar.c
@@ -98,6 +98,8 @@
  * Manuel
  */
 
+#define memmove __memmove
+
 #define _GNU_SOURCE
 #define _ISOC99_SOURCE
 #include <errno.h>
diff --git a/libc/misc/wordexp/wordexp.c b/libc/misc/wordexp/wordexp.c
index 628b8f3fe..979723524 100644
--- a/libc/misc/wordexp/wordexp.c
+++ b/libc/misc/wordexp/wordexp.c
@@ -19,6 +19,10 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#define mempcpy __libc_mempcpy
+#define strndup __strndup
+#define strspn __strspn
+
 #define _GNU_SOURCE
 #include <sys/cdefs.h>
 #include <sys/types.h>