Looking at the the gcc-4.2.1 patches for uClibc, I found that the

200-uclibc-locale and 205-uclibc-locale-update patches uses a not
existing macro
__UCLIBC_HAS_XCLOCALE__ while they should refer to __UCLIBC_HAS_XLOCALE__

Find attached the patches to fix the above mentioned patches

Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>

diff --git a/toolchain/gcc/4.2.1/200-uclibc-locale.patch b/toolchain/gcc/4.2.1/200-uclibc-locale.patch
index ea21388b7509becba76887fab91d7efc29164079..13e3d465940636073a7ccd1afac7caf8d6a10641 100644 (file)
--- a/toolchain/gcc/4.2.1/200-uclibc-locale.patch
+++ b/toolchain/gcc/4.2.1/200-uclibc-locale.patch
@@ -381,7 +381,7 @@
 +    __convert_from_v(char* __out, 
 +                   const int __size __attribute__ ((__unused__)),
 +                   const char* __fmt,
-+#ifdef __UCLIBC_HAS_XCLOCALE__
++#ifdef __UCLIBC_HAS_XLOCALE__
 +                   _Tv __v, const __c_locale& __cloc, int __prec)
 +    {
 +      __c_locale __old = __gnu_cxx::__uselocale(__cloc);
@@ -398,7 +398,7 @@
 +
 +      const int __ret = std::snprintf(__out, __size, __fmt, __prec, __v);
 +
-+#ifdef __UCLIBC_HAS_XCLOCALE__
++#ifdef __UCLIBC_HAS_XLOCALE__
 +      __gnu_cxx::__uselocale(__old);
 +#elif defined __UCLIBC_HAS_LOCALE__
 +      std::setlocale(LC_ALL, __sav);

diff --git a/toolchain/gcc/4.2.1/205-uclibc-locale-update.patch b/toolchain/gcc/4.2.1/205-uclibc-locale-update.patch
index 86b2844554e48fb9d2d2656ffd54c57e91dcfd08..c9356044af1d9b55d3ed908bd694d45cf19a01ae 100644 (file)
--- a/toolchain/gcc/4.2.1/205-uclibc-locale-update.patch
+++ b/toolchain/gcc/4.2.1/205-uclibc-locale-update.patch
@@ -313,11 +313,11 @@
 -    __convert_from_v(char* __out, 
 -                   const int __size __attribute__ ((__unused__)),
 -                   const char* __fmt,
--#ifdef __UCLIBC_HAS_XCLOCALE__
+-#ifdef __UCLIBC_HAS_XLOCALE__
 -                   _Tv __v, const __c_locale& __cloc, int __prec)
 +    inline int
 +    __convert_from_v(const __c_locale&
-+#ifndef __UCLIBC_HAS_XCLOCALE__
++#ifndef __UCLIBC_HAS_XLOCALE__
 +                                      __cloc __attribute__ ((__unused__))
 +#endif
 +                   ,
@@ -326,7 +326,7 @@
 +                   const char* __fmt, ...)
      {
 +      va_list __args;
-+#ifdef __UCLIBC_HAS_XCLOCALE__
++#ifdef __UCLIBC_HAS_XLOCALE__
        __c_locale __old = __gnu_cxx::__uselocale(__cloc);
  #else
 -                   _Tv __v, const __c_locale&, int __prec)
@@ -343,5 +343,5 @@
 +      const int __ret = std::vsnprintf(__out, __size, __fmt, __args);
 +      va_end(__args);
  
- #ifdef __UCLIBC_HAS_XCLOCALE__
+ #ifdef __UCLIBC_HAS_XLOCALE__
        __gnu_cxx::__uselocale(__old);