diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2008-12-06 10:25:24 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2008-12-06 10:25:24 +0000 |
| commit | 22493a73d5952c7d84908d8cc2abbb21264e3d5f (patch) | |
| tree | 81c02a1e0055475356cd6644161392934d00cf90 | |
| parent | c0ee00211f683cd8a0974cb211822c50b35b6782 (diff) | |
| download | gcc-22493a73d5952c7d84908d8cc2abbb21264e3d5f.zip gcc-22493a73d5952c7d84908d8cc2abbb21264e3d5f.tar.gz gcc-22493a73d5952c7d84908d8cc2abbb21264e3d5f.tar.bz2 | |
re PR libstdc++/38421 (libstdc++-v3/include/tr1/ell_integral.tcc contains __ea identifier)
2008-12-06 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/38421
* include/tr1/ell_integral.tcc: Avoid __ea, future SPU badname.
* doc/xml/manual/appendix_contributing.xml: Add __ea to the list
of badnames.
From-SVN: r142519
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/doc/xml/manual/appendix_contributing.xml | 3 | ||||
| -rw-r--r-- | libstdc++-v3/include/tr1/ell_integral.tcc | 18 |
3 files changed, 20 insertions, 8 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index e3094da..7bcae27 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2008-12-06 Paolo Carlini <paolo.carlini@oracle.com> + + PR libstdc++/38421 + * include/tr1/ell_integral.tcc: Avoid __ea, future SPU badname. + * doc/xml/manual/appendix_contributing.xml: Add __ea to the list + of badnames. + 2008-12-05 Tom Tromey <tromey@redhat.com> * include/tr1_impl/functional (_Mu): Fix typo. diff --git a/libstdc++-v3/doc/xml/manual/appendix_contributing.xml b/libstdc++-v3/doc/xml/manual/appendix_contributing.xml index f9edbe1..86723d6 100644 --- a/libstdc++-v3/doc/xml/manual/appendix_contributing.xml +++ b/libstdc++-v3/doc/xml/manual/appendix_contributing.xml @@ -364,6 +364,9 @@ indicate a place that may require attention for multi-thread safety. _res_ext __tg_* + SPU adds: + __ea + For GCC: [Note that this list is out of date. It applies to the old diff --git a/libstdc++-v3/include/tr1/ell_integral.tcc b/libstdc++-v3/include/tr1/ell_integral.tcc index 404cc27..d1587fc 100644 --- a/libstdc++-v3/include/tr1/ell_integral.tcc +++ b/libstdc++-v3/include/tr1/ell_integral.tcc @@ -371,17 +371,18 @@ namespace tr1 __zn = __c0 * (__zn + __lambda); } - _Tp __ea = __xndev * __yndev; + // Note: __ea is an SPU badname. + _Tp __eaa = __xndev * __yndev; _Tp __eb = __zndev * __zndev; - _Tp __ec = __ea - __eb; - _Tp __ed = __ea - _Tp(6) * __eb; + _Tp __ec = __eaa - __eb; + _Tp __ed = __eaa - _Tp(6) * __eb; _Tp __ef = __ed + __ec + __ec; _Tp __s1 = __ed * (-__c1 + __c3 * __ed / _Tp(3) - _Tp(3) * __c4 * __zndev * __ef / _Tp(2)); _Tp __s2 = __zndev * (__c2 * __ef - + __zndev * (-__c3 * __ec - __zndev * __c4 - __ea)); + + __zndev * (-__c3 * __ec - __zndev * __c4 - __eaa)); return _Tp(3) * __sigma + __power4 * (_Tp(1) + __s1 + __s2) / (__mu * std::sqrt(__mu)); @@ -634,16 +635,17 @@ namespace tr1 __pn = __c0 * (__pn + __lambda); } - _Tp __ea = __xndev * (__yndev + __zndev) + __yndev * __zndev; + // Note: __ea is an SPU badname. + _Tp __eaa = __xndev * (__yndev + __zndev) + __yndev * __zndev; _Tp __eb = __xndev * __yndev * __zndev; _Tp __ec = __pndev * __pndev; - _Tp __e2 = __ea - _Tp(3) * __ec; - _Tp __e3 = __eb + _Tp(2) * __pndev * (__ea - __ec); + _Tp __e2 = __eaa - _Tp(3) * __ec; + _Tp __e3 = __eb + _Tp(2) * __pndev * (__eaa - __ec); _Tp __s1 = _Tp(1) + __e2 * (-__c1 + _Tp(3) * __c3 * __e2 / _Tp(4) - _Tp(3) * __c4 * __e3 / _Tp(2)); _Tp __s2 = __eb * (__c2 / _Tp(2) + __pndev * (-__c3 - __c3 + __pndev * __c4)); - _Tp __s3 = __pndev * __ea * (__c2 - __pndev * __c3) + _Tp __s3 = __pndev * __eaa * (__c2 - __pndev * __c3) - __c2 * __pndev * __ec; return _Tp(3) * __sigma + __power4 * (__s1 + __s2 + __s3) |