Signed-off-by: Waldemar Kozaczuk <[email protected]>
---
Makefile | 3 +--
libc/locale/strcoll.c | 6 ------
libc/locale/strcoll_l.c | 11 -----------
3 files changed, 1 insertion(+), 19 deletions(-)
delete mode 100644 libc/locale/strcoll.c
delete mode 100644 libc/locale/strcoll_l.c
diff --git a/Makefile b/Makefile
index de2f7866..93c4e189 100644
--- 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
deleted file mode 100644
index 30bccd62..00000000
--- a/libc/locale/strcoll.c
+++ /dev/null
@@ -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
deleted file mode 100644
index 033e7afd..00000000
--- a/libc/locale/strcoll_l.c
+++ /dev/null
@@ -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);
--
2.26.2
--
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/20200815042719.51117-9-jwkozaczuk%40gmail.com.
