Cleanup the toploevel makefile handing of shared libs. Add weak_alias

define, and set things up so nasty old coff toolchains can now compile
things and should actually work again.
 -Erik

2 files changed, 4 insertions, 4 deletions

diff --git a/libc/string/string.c b/libc/string/string.c
index 0e2df303b..bb524eeac 100644
--- a/libc/string/string.c
+++ b/libc/string/string.c
@@ -77,7 +77,7 @@ int strcmp(const char *s1, const char *s2)
 }
 
 #ifndef __UCLIBC_HAS_LOCALE__
-__asm__(".weak strcoll; strcoll = strcmp");
+weak_alias(strcmp, strcoll);
 #endif /* __UCLIBC_HAS_LOCALE__ */
 #endif
 
@@ -191,7 +191,7 @@ char *strchr(const char *str, int c)
 	return 0;
 }
 
-__asm__(".weak index; index = strchr");
+weak_alias(strchr, index);
 #endif
 
 /********************** Function strrchr ************************************/
@@ -214,7 +214,7 @@ char *strrchr(const char *str, int c)
 	return prev;
 }
 
-__asm__(".weak rindex; rindex = strrchr");
+weak_alias(strrchr, rindex);
 #endif
 
 /********************** Function strdup ************************************/
diff --git a/libc/string/strtok_r.c b/libc/string/strtok_r.c
index 37b313455..e6c24218a 100644
--- a/libc/string/strtok_r.c
+++ b/libc/string/strtok_r.c
@@ -52,4 +52,4 @@ char *__strtok_r(char *s, const char *delim, char **save_ptr)
 	return token;
 }
 
-__asm__(".weak strtok_r; strtok_r = __strtok_r");
+weak_alias(__strtok_r, strtok_r);