From: ulf at uclibc.org <ulf@uclibc.org>
To: buildroot@busybox.net
Subject: [Buildroot] svn commit: trunk/buildroot/toolchain/gcc/4.2.1
Date: Wed, 29 Aug 2007 23:00:37 -0700 (PDT) [thread overview]
Message-ID: <20070830060037.3D54DA462D@busybox.net> (raw)
Author: ulf
Date: 2007-08-29 23:00:36 -0700 (Wed, 29 Aug 2007)
New Revision: 19737
Log:
Revert patch causing g++-4.2.1 build to fail
Modified:
trunk/buildroot/toolchain/gcc/4.2.1/200-uclibc-locale.patch
trunk/buildroot/toolchain/gcc/4.2.1/205-uclibc-locale-update.patch
Changeset:
Modified: trunk/buildroot/toolchain/gcc/4.2.1/200-uclibc-locale.patch
===================================================================
--- trunk/buildroot/toolchain/gcc/4.2.1/200-uclibc-locale.patch 2007-08-29 18:34:26 UTC (rev 19736)
+++ trunk/buildroot/toolchain/gcc/4.2.1/200-uclibc-locale.patch 2007-08-30 06:00:36 UTC (rev 19737)
@@ -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);
Modified: trunk/buildroot/toolchain/gcc/4.2.1/205-uclibc-locale-update.patch
===================================================================
--- trunk/buildroot/toolchain/gcc/4.2.1/205-uclibc-locale-update.patch 2007-08-29 18:34:26 UTC (rev 19736)
+++ trunk/buildroot/toolchain/gcc/4.2.1/205-uclibc-locale-update.patch 2007-08-30 06:00:36 UTC (rev 19737)
@@ -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);
next reply other threads:[~2007-08-30 6:00 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-30 6:00 ulf at uclibc.org [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-03-29 11:07 [Buildroot] svn commit: trunk/buildroot/toolchain/gcc/4.2.1 ulf at uclibc.org
2008-03-27 19:37 jacmet at uclibc.org
2008-03-06 22:56 jacmet at uclibc.org
2007-10-17 21:56 ulf at uclibc.org
2007-08-28 18:21 ulf at uclibc.org
2007-08-25 11:22 aldot at uclibc.org
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070830060037.3D54DA462D@busybox.net \
--to=ulf@uclibc.org \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox