Signed-off-by: Waldemar Kozaczuk <[email protected]>
---
Makefile | 2 +-
libc/aliases.ld | 3 +++
libc/locale/toupper_l.c | 11 -----------
3 files changed, 4 insertions(+), 12 deletions(-)
delete mode 100644 libc/locale/toupper_l.c
diff --git a/Makefile b/Makefile
index 27f46011..7ec0cbb8 100644
--- 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
index ab9c7a7c..23f208b1 100644
--- 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
deleted file mode 100644
index cc7d3914..00000000
--- a/libc/locale/toupper_l.c
+++ /dev/null
@@ -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);
--
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-2-jwkozaczuk%40gmail.com.
