proxmox-mirrors/wasi-libc
1
0
Fork 0
mirror of https://git.proxmox.com/git/wasi-libc synced 2025-08-15 23:29:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix uselocale to support non-default locales.

Browse Source 
Musl's locales implementation depends on pthreads. Since WASI libc
doesn't yet have pthreads, it currently has alternate code for
supporting locales. Previously, this code just assumed that it only had
to support the default locale, however libc++ uses uselocale with
non-default locals, so add support for that.

With this, the C++ <iostream>-style hello world now works, with
-fno-exceptions.
This commit is contained in:
Dan Gohman 2019-04-02 20:31:53 -07:00
parent f74124a6f4
commit 24792713d7
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libc-top-half/musl/src/internal/locale_impl.h
View File

@ -42,7 +42,15 @@ hidden char *__gettextdomain(void);
#define CURRENT_UTF8 (!!__pthread_self()->locale->cat[LC_CTYPE])
#else
#define CURRENT_LOCALE (*(libc.current_locale = &libc.global_locale, &libc.current_locale))
// If we haven't set up the current_local field yet, do so. Then return an
// lvalue for the current_locale field.
#define CURRENT_LOCALE \
(*({ \
if (!libc.current_locale) { \
libc.current_locale = &libc.global_locale; \
} \
&libc.current_locale; \
}))
#define CURRENT_UTF8 (!!libc.global_locale.cat[LC_CTYPE])
#endif

7
libc-top-half/musl/src/locale/uselocale.c
View File

@ -10,17 +10,14 @@ locale_t __uselocale(locale_t new)
pthread_t self = __pthread_self();
locale_t old = self->locale;
#else
locale_t old = &libc.global_locale;
locale_t old = libc.current_locale;
#endif
locale_t global = &libc.global_locale;
#if defined(__wasilibc_unmodified_upstream) || defined(_REENTRANT)
if (new) self->locale = new == LC_GLOBAL_LOCALE ? global : new;
#else
if (new != NULL && new != global && new != LC_GLOBAL_LOCALE) {
fputs("non-global locale not supported yet", stderr);
__builtin_trap();
}
if (new) libc.current_locale = new == LC_GLOBAL_LOCALE ? global : new;
#endif
return old == global ? LC_GLOBAL_LOCALE : old;