Put weak symbols where they can find what they are aliasing. Clean up strcspn.c

libc/string/Makefile

@@ -27,8 +27,7 @@ LIBC=$(TOPDIR)libc.a
 MSRC=string.c
 MOBJ=strlen.o strcat.o strcpy.o strchr.o strcmp.o strncat.o strncpy.o \
 	strncmp.o strrchr.o strdup.o memcpy.o memccpy.o memset.o \
-	memmove.o memcmp.o memchr.o ffs.o strnlen.o index.o rindex.o \
+	memmove.o memcmp.o memchr.o ffs.o strnlen.o strxfrm.o
-	strxfrm.o strcoll.o
 
 MSRC1=strsignal.c
 MOBJ1=strsignal.o psignal.o

libc/string/strcspn.c

@@ -16,20 +16,7 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#if HAVE_CONFIG_H
+#include <string.h>
-# include <config.h>
-#endif
-
-#if defined _LIBC || HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef strchr
-#  define strchr index
-# endif
-#endif
-
-#undef strcspn
 
 /* Return the length of the maximum initial segment of S
    which contains no characters from REJECT.  */

libc/string/string.c

@@ -75,11 +75,9 @@ int strcmp(const char *s1, const char *s2)
 
 	return c1 - c2;
 }
-#endif
 
-#ifdef L_strcoll
 __asm__(".weak strcoll; strcoll = strcmp");
-#endif	
+#endif
 
 /********************** Function strncat ************************************/
 
@@ -161,9 +159,7 @@ char *strchr(const char *str, int c)
 
 	return 0;
 }
-#endif
 
-#ifdef L_index
 __asm__(".weak index; index = strchr");
 #endif
 
@@ -186,9 +182,7 @@ char *strrchr(const char *str, int c)
 	}
 	return prev;
 }
-#endif
 
-#ifdef L_rindex
 __asm__(".weak rindex; rindex = strrchr");
 #endif