From: Waldemar Kozaczuk <jwkozac...@gmail.com>
Committer: Waldemar Kozaczuk <jwkozac...@gmail.com>
Branch: master
libc: drop OSv toupper_l in favor of musl copy and add alias __toupper_l
Signed-off-by: Waldemar Kozaczuk <jwkozac...@gmail.com>
Message-Id: <20200815042719.51117-2-jwkozac...@gmail.com>
---
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -1055,7 +1055,7 @@ libc += locale/strtold_l.o
libc += locale/strxfrm.o
libc += locale/strxfrm_l.o
musl += locale/tolower_l.o
-libc += locale/toupper_l.o
+musl += locale/toupper_l.o
musl += locale/towctrans_l.o
libc += locale/towlower_l.o
libc += locale/towupper_l.o
diff --git a/libc/aliases.ld b/libc/aliases.ld
--- a/libc/aliases.ld
+++ b/libc/aliases.ld
@@ -24,6 +24,9 @@ __finite = finite;
__finitef = finitef;
__finitel = finitel;
+/* locale */
+__toupper_l = toupper_l;
+
/* multibyte */
__mbrlen = mbrlen;
diff --git a/libc/locale/toupper_l.c b/libc/locale/toupper_l.c
--- a/libc/locale/toupper_l.c
+++ b/libc/locale/toupper_l.c
@@ -1,11 +0,0 @@
-#include <ctype.h>
-#include "libc.h"
-
-#undef __toupper_l
-int __toupper_l(int c, locale_t l)
-{
- return toupper(c);
-}
-
-/* OSv local: a libstdc++ build against glibc wants the __ version */
-weak_alias(__toupper_l, toupper_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 osv-dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/osv-dev/00000000000013a0c705ad476b30%40google.com.
