yann@552: Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.0/uclibc/90_all_205-uclibc-locale-update.patch yann@552: diff -durN gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc gcc-4.3.0/libstdc++-v3/config/locale/uclibc/c_locale.cc yann@552: --- gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc 2008-06-10 14:45:43.000000000 +0200 yann@552: +++ gcc-4.3.0/libstdc++-v3/config/locale/uclibc/c_locale.cc 2008-06-10 14:45:46.000000000 +0200 yann@552: @@ -46,16 +46,13 @@ yann@552: __convert_to_v(const char* __s, float& __v, ios_base::iostate& __err, yann@552: const __c_locale& __cloc) yann@552: { yann@552: - if (!(__err & ios_base::failbit)) yann@552: - { yann@552: - char* __sanity; yann@552: - errno = 0; yann@552: - float __f = __strtof_l(__s, &__sanity, __cloc); yann@552: - if (__sanity != __s && errno != ERANGE) yann@552: - __v = __f; yann@552: - else yann@552: - __err |= ios_base::failbit; yann@552: - } yann@552: + char* __sanity; yann@552: + errno = 0; yann@552: + float __f = __strtof_l(__s, &__sanity, __cloc); yann@552: + if (__sanity != __s && errno != ERANGE) yann@552: + __v = __f; yann@552: + else yann@552: + __err |= ios_base::failbit; yann@552: } yann@552: yann@552: template<> yann@552: @@ -63,16 +60,13 @@ yann@552: __convert_to_v(const char* __s, double& __v, ios_base::iostate& __err, yann@552: const __c_locale& __cloc) yann@552: { yann@552: - if (!(__err & ios_base::failbit)) yann@552: - { yann@552: - char* __sanity; yann@552: - errno = 0; yann@552: - double __d = __strtod_l(__s, &__sanity, __cloc); yann@552: - if (__sanity != __s && errno != ERANGE) yann@552: - __v = __d; yann@552: - else yann@552: - __err |= ios_base::failbit; yann@552: - } yann@552: + char* __sanity; yann@552: + errno = 0; yann@552: + double __d = __strtod_l(__s, &__sanity, __cloc); yann@552: + if (__sanity != __s && errno != ERANGE) yann@552: + __v = __d; yann@552: + else yann@552: + __err |= ios_base::failbit; yann@552: } yann@552: yann@552: template<> yann@552: @@ -80,16 +74,13 @@ yann@552: __convert_to_v(const char* __s, long double& __v, ios_base::iostate& __err, yann@552: const __c_locale& __cloc) yann@552: { yann@552: - if (!(__err & ios_base::failbit)) yann@552: - { yann@552: - char* __sanity; yann@552: - errno = 0; yann@552: - long double __ld = __strtold_l(__s, &__sanity, __cloc); yann@552: - if (__sanity != __s && errno != ERANGE) yann@552: - __v = __ld; yann@552: - else yann@552: - __err |= ios_base::failbit; yann@552: - } yann@552: + char* __sanity; yann@552: + errno = 0; yann@552: + long double __ld = __strtold_l(__s, &__sanity, __cloc); yann@552: + if (__sanity != __s && errno != ERANGE) yann@552: + __v = __ld; yann@552: + else yann@552: + __err |= ios_base::failbit; yann@552: } yann@552: yann@552: void yann@552: @@ -110,7 +101,7 @@ yann@552: void yann@552: locale::facet::_S_destroy_c_locale(__c_locale& __cloc) yann@552: { yann@552: - if (_S_get_c_locale() != __cloc) yann@552: + if (__cloc && _S_get_c_locale() != __cloc) yann@552: __freelocale(__cloc); yann@552: } yann@552: yann@552: diff -durN gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/c_locale.h gcc-4.3.0/libstdc++-v3/config/locale/uclibc/c_locale.h yann@552: --- gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/c_locale.h 2008-06-10 14:45:43.000000000 +0200 yann@552: +++ gcc-4.3.0/libstdc++-v3/config/locale/uclibc/c_locale.h 2008-06-10 14:45:46.000000000 +0200 yann@552: @@ -39,21 +39,23 @@ yann@552: #pragma GCC system_header yann@552: yann@552: #include // get std::strlen yann@552: -#include // get std::snprintf or std::sprintf yann@552: +#include // get std::vsnprintf or std::vsprintf yann@552: #include yann@552: #include // For codecvt yann@552: #ifdef __UCLIBC_MJN3_ONLY__ yann@552: #warning fix this yann@552: #endif yann@552: -#ifdef __UCLIBC_HAS_LOCALE__ yann@552: +#ifdef _GLIBCXX_USE_ICONV yann@552: #include // For codecvt using iconv, iconv_t yann@552: #endif yann@552: -#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__ yann@552: -#include // For messages yann@552: +#ifdef HAVE_LIBINTL_H yann@552: +#include // For messages yann@552: #endif yann@552: +#include yann@552: yann@552: #ifdef __UCLIBC_MJN3_ONLY__ yann@552: #warning what is _GLIBCXX_C_LOCALE_GNU for yann@552: +// psm: used in os/gnu-linux/ctype_noninline.h yann@552: #endif yann@552: #define _GLIBCXX_C_LOCALE_GNU 1 yann@552: yann@552: @@ -62,7 +64,7 @@ yann@552: #endif yann@552: // #define _GLIBCXX_NUM_CATEGORIES 6 yann@552: #define _GLIBCXX_NUM_CATEGORIES 0 yann@552: - yann@552: + yann@552: #ifdef __UCLIBC_HAS_XLOCALE__ yann@552: namespace __gnu_cxx yann@552: { yann@552: @@ -79,22 +81,24 @@ yann@552: typedef int* __c_locale; yann@552: #endif yann@552: yann@552: - // Convert numeric value of type _Tv to string and return length of yann@552: - // string. If snprintf is available use it, otherwise fall back to yann@552: - // the unsafe sprintf which, in general, can be dangerous and should yann@552: + // Convert numeric value of type double to string and return length of yann@552: + // string. If vsnprintf is available use it, otherwise fall back to yann@552: + // the unsafe vsprintf which, in general, can be dangerous and should yann@552: // be avoided. yann@552: - template yann@552: - int yann@552: - __convert_from_v(char* __out, yann@552: - const int __size __attribute__ ((__unused__)), yann@552: - const char* __fmt, yann@552: -#ifdef __UCLIBC_HAS_XCLOCALE__ yann@552: - _Tv __v, const __c_locale& __cloc, int __prec) yann@552: + inline int yann@552: + __convert_from_v(const __c_locale& yann@552: +#ifndef __UCLIBC_HAS_XCLOCALE__ yann@552: + __cloc __attribute__ ((__unused__)) yann@552: +#endif yann@552: + , yann@552: + char* __out, yann@552: + const int __size, yann@552: + const char* __fmt, ...) yann@552: { yann@552: + va_list __args; yann@552: +#ifdef __UCLIBC_HAS_XCLOCALE__ yann@552: __c_locale __old = __gnu_cxx::__uselocale(__cloc); yann@552: #else yann@552: - _Tv __v, const __c_locale&, int __prec) yann@552: - { yann@552: # ifdef __UCLIBC_HAS_LOCALE__ yann@552: char* __old = std::setlocale(LC_ALL, NULL); yann@552: char* __sav = new char[std::strlen(__old) + 1]; yann@552: @@ -103,7 +107,9 @@ yann@552: # endif yann@552: #endif yann@552: yann@552: - const int __ret = std::snprintf(__out, __size, __fmt, __prec, __v); yann@552: + va_start(__args, __fmt); yann@552: + const int __ret = std::vsnprintf(__out, __size, __fmt, __args); yann@552: + va_end(__args); yann@552: yann@552: #ifdef __UCLIBC_HAS_XCLOCALE__ yann@552: __gnu_cxx::__uselocale(__old); yann@552: diff -durN gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc gcc-4.3.0/libstdc++-v3/config/locale/uclibc/ctype_members.cc yann@552: --- gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2008-06-10 14:45:43.000000000 +0200 yann@552: +++ gcc-4.3.0/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2008-06-10 14:45:46.000000000 +0200 yann@552: @@ -33,9 +33,14 @@ yann@552: yann@552: // Written by Benjamin Kosnik yann@552: yann@552: +#include yann@552: +#ifdef __UCLIBC_HAS_LOCALE__ yann@552: #define _LIBC yann@552: #include yann@552: #undef _LIBC yann@552: +#else yann@552: +#include yann@552: +#endif yann@552: #include yann@552: yann@552: namespace std yann@552: @@ -138,20 +143,34 @@ yann@552: ctype:: yann@552: do_is(mask __m, wchar_t __c) const yann@552: { yann@552: - // Highest bitmask in ctype_base == 10, but extra in "C" yann@552: - // library for blank. yann@552: + // The case of __m == ctype_base::space is particularly important, yann@552: + // due to its use in many istream functions. Therefore we deal with yann@552: + // it first, exploiting the knowledge that on GNU systems _M_bit[5] yann@552: + // is the mask corresponding to ctype_base::space. NB: an encoding yann@552: + // change would not affect correctness! yann@552: bool __ret = false; yann@552: - const size_t __bitmasksize = 11; yann@552: - for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur) yann@552: - if (__m & _M_bit[__bitcur] yann@552: - && __iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype)) yann@552: - { yann@552: - __ret = true; yann@552: - break; yann@552: - } yann@552: + if (__m == _M_bit[5]) yann@552: + __ret = __iswctype_l(__c, _M_wmask[5], _M_c_locale_ctype); yann@552: + else yann@552: + { yann@552: + // Highest bitmask in ctype_base == 10, but extra in "C" yann@552: + // library for blank. yann@552: + const size_t __bitmasksize = 11; yann@552: + for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur) yann@552: + if (__m & _M_bit[__bitcur]) yann@552: + { yann@552: + if (__iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype)) yann@552: + { yann@552: + __ret = true; yann@552: + break; yann@552: + } yann@552: + else if (__m == _M_bit[__bitcur]) yann@552: + break; yann@552: + } yann@552: + } yann@552: return __ret; yann@552: } yann@552: - yann@552: + yann@552: const wchar_t* yann@552: ctype:: yann@552: do_is(const wchar_t* __lo, const wchar_t* __hi, mask* __vec) const yann@552: diff -durN gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/messages_members.h gcc-4.3.0/libstdc++-v3/config/locale/uclibc/messages_members.h yann@552: --- gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/messages_members.h 2008-06-10 14:45:43.000000000 +0200 yann@552: +++ gcc-4.3.0/libstdc++-v3/config/locale/uclibc/messages_members.h 2008-06-10 14:45:46.000000000 +0200 yann@552: @@ -47,18 +47,21 @@ yann@552: template yann@552: messages<_CharT>::messages(size_t __refs) yann@552: : facet(__refs), _M_c_locale_messages(_S_get_c_locale()), yann@552: - _M_name_messages(_S_get_c_name()) yann@552: + _M_name_messages(_S_get_c_name()) yann@552: { } yann@552: yann@552: template yann@552: messages<_CharT>::messages(__c_locale __cloc, const char* __s, yann@552: size_t __refs) yann@552: - : facet(__refs), _M_c_locale_messages(_S_clone_c_locale(__cloc)), yann@552: - _M_name_messages(__s) yann@552: + : facet(__refs), _M_c_locale_messages(NULL), _M_name_messages(NULL) yann@552: { yann@552: - char* __tmp = new char[std::strlen(__s) + 1]; yann@552: - std::strcpy(__tmp, __s); yann@552: + const size_t __len = std::strlen(__s) + 1; yann@552: + char* __tmp = new char[__len]; yann@552: + std::memcpy(__tmp, __s, __len); yann@552: _M_name_messages = __tmp; yann@552: + yann@552: + // Last to avoid leaking memory if new throws. yann@552: + _M_c_locale_messages = _S_clone_c_locale(__cloc); yann@552: } yann@552: yann@552: template yann@552: diff -durN gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc gcc-4.3.0/libstdc++-v3/config/locale/uclibc/monetary_members.cc yann@552: --- gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2008-06-10 14:45:46.000000000 +0200 yann@552: +++ gcc-4.3.0/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2008-06-10 14:45:46.000000000 +0200 yann@552: @@ -33,9 +33,14 @@ yann@552: yann@552: // Written by Benjamin Kosnik yann@552: yann@552: +#include yann@552: +#ifdef __UCLIBC_HAS_LOCALE__ yann@552: #define _LIBC yann@552: #include yann@552: #undef _LIBC yann@552: +#else yann@552: +#include yann@552: +#endif yann@552: #include yann@552: yann@552: #ifdef __UCLIBC_MJN3_ONLY__ yann@552: @@ -206,7 +211,7 @@ yann@552: } yann@552: break; yann@552: default: yann@552: - ; yann@552: + __ret = pattern(); yann@552: } yann@552: return __ret; yann@552: } yann@552: diff -durN gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc gcc-4.3.0/libstdc++-v3/config/locale/uclibc/numeric_members.cc yann@552: --- gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2008-06-10 14:45:46.000000000 +0200 yann@552: +++ gcc-4.3.0/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2008-06-10 14:45:46.000000000 +0200 yann@552: @@ -33,9 +33,14 @@ yann@552: yann@552: // Written by Benjamin Kosnik yann@552: yann@552: +#include yann@552: +#ifdef __UCLIBC_HAS_LOCALE__ yann@552: #define _LIBC yann@552: #include yann@552: #undef _LIBC yann@552: +#else yann@552: +#include yann@552: +#endif yann@552: #include yann@552: yann@552: #ifdef __UCLIBC_MJN3_ONLY__ yann@552: diff -durN gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/time_members.h gcc-4.3.0/libstdc++-v3/config/locale/uclibc/time_members.h yann@552: --- gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/time_members.h 2008-06-10 14:45:39.000000000 +0200 yann@552: +++ gcc-4.3.0/libstdc++-v3/config/locale/uclibc/time_members.h 2008-06-10 14:45:46.000000000 +0200 yann@552: @@ -37,25 +37,33 @@ yann@552: template yann@552: __timepunct<_CharT>::__timepunct(size_t __refs) yann@552: : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL), yann@552: - _M_name_timepunct(_S_get_c_name()) yann@552: + _M_name_timepunct(_S_get_c_name()) yann@552: { _M_initialize_timepunct(); } yann@552: yann@552: template yann@552: __timepunct<_CharT>::__timepunct(__cache_type* __cache, size_t __refs) yann@552: : facet(__refs), _M_data(__cache), _M_c_locale_timepunct(NULL), yann@552: - _M_name_timepunct(_S_get_c_name()) yann@552: + _M_name_timepunct(_S_get_c_name()) yann@552: { _M_initialize_timepunct(); } yann@552: yann@552: template yann@552: __timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s, yann@552: size_t __refs) yann@552: : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL), yann@552: - _M_name_timepunct(__s) yann@552: + _M_name_timepunct(NULL) yann@552: { yann@552: - char* __tmp = new char[std::strlen(__s) + 1]; yann@552: - std::strcpy(__tmp, __s); yann@552: + const size_t __len = std::strlen(__s) + 1; yann@552: + char* __tmp = new char[__len]; yann@552: + std::memcpy(__tmp, __s, __len); yann@552: _M_name_timepunct = __tmp; yann@552: - _M_initialize_timepunct(__cloc); yann@552: + yann@552: + try yann@552: + { _M_initialize_timepunct(__cloc); } yann@552: + catch(...) yann@552: + { yann@552: + delete [] _M_name_timepunct; yann@552: + __throw_exception_again; yann@552: + } yann@552: } yann@552: yann@552: template