Commit 22493a73 by Paolo Carlini Committed by Paolo Carlini

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
parent c0ee0021
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> 2008-12-05 Tom Tromey <tromey@redhat.com>
* include/tr1_impl/functional (_Mu): Fix typo. * include/tr1_impl/functional (_Mu): Fix typo.
......
...@@ -364,6 +364,9 @@ indicate a place that may require attention for multi-thread safety. ...@@ -364,6 +364,9 @@ indicate a place that may require attention for multi-thread safety.
_res_ext _res_ext
__tg_* __tg_*
SPU adds:
__ea
For GCC: For GCC:
[Note that this list is out of date. It applies to the old [Note that this list is out of date. It applies to the old
......
...@@ -371,17 +371,18 @@ namespace tr1 ...@@ -371,17 +371,18 @@ namespace tr1
__zn = __c0 * (__zn + __lambda); __zn = __c0 * (__zn + __lambda);
} }
_Tp __ea = __xndev * __yndev; // Note: __ea is an SPU badname.
_Tp __eaa = __xndev * __yndev;
_Tp __eb = __zndev * __zndev; _Tp __eb = __zndev * __zndev;
_Tp __ec = __ea - __eb; _Tp __ec = __eaa - __eb;
_Tp __ed = __ea - _Tp(6) * __eb; _Tp __ed = __eaa - _Tp(6) * __eb;
_Tp __ef = __ed + __ec + __ec; _Tp __ef = __ed + __ec + __ec;
_Tp __s1 = __ed * (-__c1 + __c3 * __ed _Tp __s1 = __ed * (-__c1 + __c3 * __ed
/ _Tp(3) - _Tp(3) * __c4 * __zndev * __ef / _Tp(3) - _Tp(3) * __c4 * __zndev * __ef
/ _Tp(2)); / _Tp(2));
_Tp __s2 = __zndev _Tp __s2 = __zndev
* (__c2 * __ef * (__c2 * __ef
+ __zndev * (-__c3 * __ec - __zndev * __c4 - __ea)); + __zndev * (-__c3 * __ec - __zndev * __c4 - __eaa));
return _Tp(3) * __sigma + __power4 * (_Tp(1) + __s1 + __s2) return _Tp(3) * __sigma + __power4 * (_Tp(1) + __s1 + __s2)
/ (__mu * std::sqrt(__mu)); / (__mu * std::sqrt(__mu));
...@@ -634,16 +635,17 @@ namespace tr1 ...@@ -634,16 +635,17 @@ namespace tr1
__pn = __c0 * (__pn + __lambda); __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 __eb = __xndev * __yndev * __zndev;
_Tp __ec = __pndev * __pndev; _Tp __ec = __pndev * __pndev;
_Tp __e2 = __ea - _Tp(3) * __ec; _Tp __e2 = __eaa - _Tp(3) * __ec;
_Tp __e3 = __eb + _Tp(2) * __pndev * (__ea - __ec); _Tp __e3 = __eb + _Tp(2) * __pndev * (__eaa - __ec);
_Tp __s1 = _Tp(1) + __e2 * (-__c1 + _Tp(3) * __c3 * __e2 / _Tp(4) _Tp __s1 = _Tp(1) + __e2 * (-__c1 + _Tp(3) * __c3 * __e2 / _Tp(4)
- _Tp(3) * __c4 * __e3 / _Tp(2)); - _Tp(3) * __c4 * __e3 / _Tp(2));
_Tp __s2 = __eb * (__c2 / _Tp(2) _Tp __s2 = __eb * (__c2 / _Tp(2)
+ __pndev * (-__c3 - __c3 + __pndev * __c4)); + __pndev * (-__c3 - __c3 + __pndev * __c4));
_Tp __s3 = __pndev * __ea * (__c2 - __pndev * __c3) _Tp __s3 = __pndev * __eaa * (__c2 - __pndev * __c3)
- __c2 * __pndev * __ec; - __c2 * __pndev * __ec;
return _Tp(3) * __sigma + __power4 * (__s1 + __s2 + __s3) return _Tp(3) * __sigma + __power4 * (__s1 + __s2 + __s3)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment