From 0f0ee4a910a71e7d53d6e05b2bc8bc45afff96ac Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 23 Oct 2018 22:18:24 +0200 Subject: [PATCH] localename: Simplify support for per-thread locales on Solaris 11.4. * m4/intl-thread-locale.m4: Renamed from m4/intlsolaris.m4. (gt_INTL_THREAD_LOCALE_NAME): Renamed from gt_INTL_SOLARIS. Define HAVE_SOLARIS114_LOCALES instead of HAVE_NAMELESS_LOCALES. * lib/localename.c: Handle HAVE_SOLARIS114_LOCALES through Solaris specific code. * lib/localename-table.h: Update comments. * lib/localename-table.c: Update comments. * m4/localename.m4 (gl_LOCALENAME): Require gt_INTL_THREAD_LOCALE_NAME. Test for 'uselocale'. Don't invoke gt_INTL_SOLARIS. * m4/intl.m4 (AM_INTL_SUBDIR): Require gt_INTL_THREAD_LOCALE_NAME. Test for 'uselocale'. Set HAVE_NAMELESS_LOCALES. (gt_INTL_SUBDIR_CORE): Don't invoke gt_INTL_SOLARIS. Don't set HAVE_NAMELESS_LOCALES here. * modules/localename (Files): Add m4/intl-thread-locale.m4. Remove m4/intlsolaris.m4. * modules/gettext (Files): Likewise. --- ChangeLog | 20 ++++++++++++ lib/localename-table.c | 2 +- lib/localename-table.h | 2 +- lib/localename.c | 24 ++++++++++++-- m4/{intlsolaris.m4 => intl-thread-locale.m4} | 34 +++++++++++++------- m4/intl.m4 | 21 ++++++------ m4/localename.m4 | 6 ++-- modules/gettext | 2 +- modules/localename | 2 +- 9 files changed, 82 insertions(+), 31 deletions(-) rename m4/{intlsolaris.m4 => intl-thread-locale.m4} (67%) diff --git a/ChangeLog b/ChangeLog index 3581249304..7c3c17dff8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2018-10-23 Bruno Haible + + localename: Simplify support for per-thread locales on Solaris 11.4. + * m4/intl-thread-locale.m4: Renamed from m4/intlsolaris.m4. + (gt_INTL_THREAD_LOCALE_NAME): Renamed from gt_INTL_SOLARIS. Define + HAVE_SOLARIS114_LOCALES instead of HAVE_NAMELESS_LOCALES. + * lib/localename.c: Handle HAVE_SOLARIS114_LOCALES through Solaris + specific code. + * lib/localename-table.h: Update comments. + * lib/localename-table.c: Update comments. + * m4/localename.m4 (gl_LOCALENAME): Require gt_INTL_THREAD_LOCALE_NAME. + Test for 'uselocale'. Don't invoke gt_INTL_SOLARIS. + * m4/intl.m4 (AM_INTL_SUBDIR): Require gt_INTL_THREAD_LOCALE_NAME. Test + for 'uselocale'. Set HAVE_NAMELESS_LOCALES. + (gt_INTL_SUBDIR_CORE): Don't invoke gt_INTL_SOLARIS. Don't set + HAVE_NAMELESS_LOCALES here. + * modules/localename (Files): Add m4/intl-thread-locale.m4. Remove + m4/intlsolaris.m4. + * modules/gettext (Files): Likewise. + 2018-10-22 Bruno Haible std-gnu11: Support Autoconf versions < 2.64. diff --git a/lib/localename-table.c b/lib/localename-table.c index 54fd67d083..4b0810d1e9 100644 --- a/lib/localename-table.c +++ b/lib/localename-table.c @@ -18,7 +18,7 @@ #include -#if HAVE_USELOCALE && HAVE_NAMELESS_LOCALES /* Solaris >= 11.4 */ +#if HAVE_USELOCALE && HAVE_NAMELESS_LOCALES /* Specification. */ #include "localename-table.h" diff --git a/lib/localename-table.h b/lib/localename-table.h index 0d204d6d14..07e92f6616 100644 --- a/lib/localename-table.h +++ b/lib/localename-table.h @@ -16,7 +16,7 @@ /* Written by Bruno Haible , 2018. */ -#if HAVE_USELOCALE && HAVE_NAMELESS_LOCALES /* Solaris >= 11.4 */ +#if HAVE_USELOCALE && HAVE_NAMELESS_LOCALES # include # include diff --git a/lib/localename.c b/lib/localename.c index 04e6d42b34..ac0354c07d 100644 --- a/lib/localename.c +++ b/lib/localename.c @@ -46,9 +46,13 @@ # if !defined IN_LIBINTL # include "glthread/lock.h" # endif -# if defined __sun && HAVE_GETLOCALENAME_L +# if defined __sun +# if HAVE_GETLOCALENAME_L /* Solaris >= 12. */ extern char * getlocalename_l(int, locale_t); +# elif HAVE_SOLARIS114_LOCALES +# include +# endif # endif # if HAVE_NAMELESS_LOCALES # include @@ -2704,7 +2708,7 @@ struniq (const char *string) #endif -#if HAVE_USELOCALE && HAVE_NAMELESS_LOCALES /* Solaris >= 11.4 */ +#if HAVE_USELOCALE && HAVE_NAMELESS_LOCALES /* The 'locale_t' object does not contain the names of the locale categories. We have to associate them with the object through a hash table. @@ -3145,6 +3149,22 @@ gl_locale_name_thread_unsafe (int category, const char *categoryname) # if HAVE_GETLOCALENAME_L /* Solaris >= 12. */ return getlocalename_l (category, thread_locale); +# elif HAVE_SOLARIS114_LOCALES + /* Solaris >= 11.4. */ + void *lcp = (*thread_locale)->core.data->lcp; + if (lcp != NULL) + switch (category) + { + case LC_CTYPE: + case LC_NUMERIC: + case LC_TIME: + case LC_COLLATE: + case LC_MONETARY: + case LC_MESSAGES: + return ((const char * const *) lcp)[category]; + default: /* We shouldn't get here. */ + return ""; + } # elif HAVE_NAMELESS_LOCALES return get_locale_t_name (category, thread_locale); # else diff --git a/m4/intlsolaris.m4 b/m4/intl-thread-locale.m4 similarity index 67% rename from m4/intlsolaris.m4 rename to m4/intl-thread-locale.m4 index 6d3ade465d..6f5ea24d7b 100644 --- a/m4/intlsolaris.m4 +++ b/m4/intl-thread-locale.m4 @@ -1,4 +1,4 @@ -# intlsolaris.m4 serial 2 +# intl-thread-locale.m4 serial 1 dnl Copyright (C) 2015-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -13,9 +13,9 @@ dnl by the GNU Library General Public License, and the rest of the GNU dnl gettext package is covered by the GNU General Public License. dnl They are *not* in the public domain. -dnl Checks for special localename support needed on Solaris. +dnl Check how to retrieve the name of a per-thread locale (POSIX locale_t). dnl Sets gt_nameless_locales. -AC_DEFUN([gt_INTL_SOLARIS], +AC_DEFUN([gt_INTL_THREAD_LOCALE_NAME], [ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles @@ -24,7 +24,6 @@ AC_DEFUN([gt_INTL_SOLARIS], AC_CHECK_FUNCS_ONCE([uselocale]) - gt_nameless_locales=no if test $ac_cv_func_uselocale = yes; then AC_CACHE_CHECK([for Solaris 11.4 locale system], [gt_cv_locale_solaris114], @@ -33,6 +32,9 @@ AC_DEFUN([gt_INTL_SOLARIS], dnl Test whether defines locale_t as a typedef of dnl 'struct _LC_locale_t **' (whereas Illumos defines it as a dnl typedef of 'struct _locale *'). + dnl Another possible test would be to include + dnl and test whether it defines the _LC_core_data_locale_t type. + dnl This type was added in Solaris 11.4. AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[ #include @@ -49,17 +51,27 @@ AC_DEFUN([gt_INTL_SOLARIS], fi if test $gt_cv_locale_solaris114 = yes; then gt_nameless_locales=yes - AC_DEFINE([HAVE_NAMELESS_LOCALES], [1], - [Define if the locale_t type does not contain the name of each locale category.]) + AC_DEFINE([HAVE_SOLARIS114_LOCALES], [1], + [Define if the locale_t type is as on Solaris 11.4.]) fi dnl Solaris 12 will maybe provide getlocalename_l. If it does, it will - dnl simplify the implementation of gl_locale_name_thread(). But the overrides - dnl of newlocale, duplocale, freelocale will still be necessary, in order to - dnl keep the libintl_locale_hash_table up-to-date, which may be used by - dnl libintl or gnulib code that was compiled on Solaris 11.4, before - dnl getlocalename_l was introduced. + dnl improve the implementation of gl_locale_name_thread(), by removing + dnl the use of undocumented structures. if test $ac_cv_func_uselocale = yes; then AC_CHECK_FUNCS([getlocalename_l]) fi + + dnl This code is for future use, in case we some day have to port to a + dnl platform where the locale_t type does not provide access to the name of + dnl each locale category. This code has the drawback that it requires the + dnl gnulib overrides of 'newlocale', 'duplocale', 'freelocale', which is a + dnl problem for GNU libunistring. Therefore try hard to avoid enabling this + dnl code! + gt_nameless_locales=no + if false; then + gt_nameless_locales=yes + AC_DEFINE([HAVE_NAMELESS_LOCALES], [1], + [Define if the locale_t type does not contain the name of each locale category.]) + fi ]) diff --git a/m4/intl.m4 b/m4/intl.m4 index 7efc7e8552..78c8ce5b00 100644 --- a/m4/intl.m4 +++ b/m4/intl.m4 @@ -1,4 +1,4 @@ -# intl.m4 serial 33 (gettext-0.19.9) +# intl.m4 serial 34 (gettext-0.19.9) dnl Copyright (C) 1995-2014, 2016-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -40,6 +40,7 @@ AC_DEFUN([AM_INTL_SUBDIR], AC_REQUIRE([gl_GLIBC21])dnl AC_REQUIRE([gl_XSIZE])dnl AC_REQUIRE([gl_FCNTL_O_FLAGS])dnl + AC_REQUIRE([gt_INTL_THREAD_LOCALE_NAME]) AC_REQUIRE([gt_INTL_MACOSX])dnl AC_REQUIRE([gl_EXTERN_INLINE])dnl AC_REQUIRE([gt_GL_ATTRIBUTE])dnl @@ -74,7 +75,7 @@ AC_DEFUN([AM_INTL_SUBDIR], ]) AC_CHECK_HEADERS([features.h stddef.h stdlib.h string.h]) AC_CHECK_FUNCS([asprintf fwprintf newlocale putenv setenv setlocale \ - snprintf strnlen wcslen wcsnlen mbrtowc wcrtomb]) + snprintf strnlen uselocale wcslen wcsnlen mbrtowc wcrtomb]) dnl Use the _snprintf function only if it is declared (because on NetBSD it dnl is defined as a weak alias of snprintf; we prefer to use the latter). @@ -119,6 +120,13 @@ AC_DEFUN([AM_INTL_SUBDIR], AM_LANGINFO_CODESET gt_LC_MESSAGES + if test $gt_nameless_locales = yes; then + HAVE_NAMELESS_LOCALES=1 + else + HAVE_NAMELESS_LOCALES=0 + fi + AC_SUBST([HAVE_NAMELESS_LOCALES]) + dnl Compilation on mingw and Cygwin needs special Makefile rules, because dnl 1. when we install a shared library, we must arrange to export dnl auxiliary pointer variables for every exported variable, @@ -235,15 +243,6 @@ AC_DEFUN([gt_INTL_SUBDIR_CORE], stpcpy strcasecmp strdup strtoul tsearch argz_count argz_stringify \ argz_next __fsetlocking]) - dnl For Solaris 11.4 and 12. - gt_INTL_SOLARIS - if test $gt_nameless_locales = yes; then - HAVE_NAMELESS_LOCALES=1 - else - HAVE_NAMELESS_LOCALES=0 - fi - AC_SUBST([HAVE_NAMELESS_LOCALES]) - dnl Use the *_unlocked functions only if they are declared. dnl (because some of them were defined without being declared in Solaris dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built diff --git a/m4/localename.m4 b/m4/localename.m4 index 3d8418acaa..f093fa5e4c 100644 --- a/m4/localename.m4 +++ b/m4/localename.m4 @@ -1,4 +1,4 @@ -# localename.m4 serial 4 +# localename.m4 serial 5 dnl Copyright (C) 2007, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -8,10 +8,11 @@ AC_DEFUN([gl_LOCALENAME], [ AC_REQUIRE([gl_LOCALE_H_DEFAULTS]) AC_REQUIRE([gt_LC_MESSAGES]) + AC_REQUIRE([gt_INTL_THREAD_LOCALE_NAME]) AC_REQUIRE([gt_INTL_MACOSX]) AC_CHECK_HEADERS_ONCE([langinfo.h]) AC_CHECK_FUNCS([setlocale]) - AC_CHECK_FUNCS_ONCE([uselocale newlocale duplocale freelocale]) + AC_CHECK_FUNCS_ONCE([newlocale duplocale freelocale]) if test $ac_cv_func_newlocale != yes; then HAVE_NEWLOCALE=0 fi @@ -21,7 +22,6 @@ AC_DEFUN([gl_LOCALENAME], if test $ac_cv_func_freelocale != yes; then HAVE_FREELOCALE=0 fi - gt_INTL_SOLARIS if test $gt_nameless_locales = yes; then REPLACE_NEWLOCALE=1 REPLACE_DUPLOCALE=1 diff --git a/modules/gettext b/modules/gettext index 15cf53b7a1..64a4900814 100644 --- a/modules/gettext +++ b/modules/gettext @@ -18,9 +18,9 @@ m4/glibc21.m4 m4/iconv.m4 m4/intdiv0.m4 m4/intl.m4 +m4/intl-thread-locale.m4 m4/intldir.m4 m4/intlmacosx.m4 -m4/intlsolaris.m4 m4/intmax.m4 m4/inttypes_h.m4 m4/inttypes-pri.m4 diff --git a/modules/localename b/modules/localename index cb848b5dcb..1813d28f79 100644 --- a/modules/localename +++ b/modules/localename @@ -7,8 +7,8 @@ lib/localename.c lib/localename-table.h lib/localename-table.c m4/localename.m4 +m4/intl-thread-locale.m4 m4/intlmacosx.m4 -m4/intlsolaris.m4 m4/lcmessage.m4 Depends-on: -- 2.39.5