From: Waldemar Kozaczuk <[email protected]> Committer: Waldemar Kozaczuk <[email protected]> Branch: master
libc: replace locale/strcoll*.c (from old musl) with musl copy of locale/strcoll.c Signed-off-by: Waldemar Kozaczuk <[email protected]> Message-Id: <[email protected]> --- diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -1043,8 +1043,7 @@ musl += locale/localeconv.o libc += locale/nl_langinfo_l.o musl += locale/setlocale.o musl += locale/strcasecmp_l.o -libc += locale/strcoll.o -libc += locale/strcoll_l.o +musl += locale/strcoll.o musl += locale/strerror_l.o musl += locale/strfmon.o libc += locale/strftime_l.o diff --git a/libc/locale/strcoll.c b/libc/locale/strcoll.c --- a/libc/locale/strcoll.c +++ b/libc/locale/strcoll.c @@ -1,6 +0,0 @@ -#include <string.h> - -int strcoll(const char *l, const char *r) -{ - return strcmp(l, r); -} diff --git a/libc/locale/strcoll_l.c b/libc/locale/strcoll_l.c --- a/libc/locale/strcoll_l.c +++ b/libc/locale/strcoll_l.c @@ -1,11 +0,0 @@ -#include <string.h> -#include <locale.h> -#include "libc.h" - -int __strcoll_l(const char *l, const char *r, locale_t loc) -{ - return strcoll(l, r); -} - -/* OSv local: a libstdc++ build against glibc wants the __ version */ -weak_alias(__strcoll_l, strcoll_l); -- You received this message because you are subscribed to the Google Groups "OSv Development" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/osv-dev/0000000000009ba34f05ad476bf3%40google.com.
