diff options
| author | Ulf Samuelsson <ulf.samuelsson@atmel.com> | 2007-08-30 06:00:36 +0000 |
|---|---|---|
| committer | Ulf Samuelsson <ulf.samuelsson@atmel.com> | 2007-08-30 06:00:36 +0000 |
| commit | 0e75467ae3a0de2c393e1d2c460eae02488aec97 (patch) | |
| tree | 87411b1b638175ae93e4e6a6c0f0646d906f117e | |
| parent | 33b0908145f6b1f575e746846b68ac025e9cf93f (diff) | |
| download | buildroot-novena-0e75467ae3a0de2c393e1d2c460eae02488aec97.tar.gz buildroot-novena-0e75467ae3a0de2c393e1d2c460eae02488aec97.zip | |
Revert patch causing g++-4.2.1 build to fail
| -rw-r--r-- | toolchain/gcc/4.2.1/200-uclibc-locale.patch | 4 | ||||
| -rw-r--r-- | toolchain/gcc/4.2.1/205-uclibc-locale-update.patch | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/toolchain/gcc/4.2.1/200-uclibc-locale.patch b/toolchain/gcc/4.2.1/200-uclibc-locale.patch index 13e3d4659..ea21388b7 100644 --- 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_XLOCALE__ ++#ifdef __UCLIBC_HAS_XCLOCALE__ + _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_XLOCALE__ ++#ifdef __UCLIBC_HAS_XCLOCALE__ + __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 c9356044a..86b284455 100644 --- 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_XLOCALE__ +-#ifdef __UCLIBC_HAS_XCLOCALE__ - _Tv __v, const __c_locale& __cloc, int __prec) + inline int + __convert_from_v(const __c_locale& -+#ifndef __UCLIBC_HAS_XLOCALE__ ++#ifndef __UCLIBC_HAS_XCLOCALE__ + __cloc __attribute__ ((__unused__)) +#endif + , @@ -326,7 +326,7 @@ + const char* __fmt, ...) { + va_list __args; -+#ifdef __UCLIBC_HAS_XLOCALE__ ++#ifdef __UCLIBC_HAS_XCLOCALE__ __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_XLOCALE__ + #ifdef __UCLIBC_HAS_XCLOCALE__ __gnu_cxx::__uselocale(__old); |