Fix soft-fp shadowing between __FP_FRAC_ADD_3 and _FP_MUL_MEAT_2_wide_3mul (bug 15667).

diff --git a/ChangeLog b/ChangeLog
index 4888b196848e3af897858bbb78e3f2dde380e429..ca04a70e647e638d15356771f172849d8d3e55a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-06-22  Joseph Myers  <joseph@codesourcery.com>
+
+       [BZ #15667]
+       * soft-fp/op-4.h (__FP_FRAC_ADD_3): Rename variables _c1 and _c2
+       to __FP_FRAC_ADD_3_c1 and __FP_FRAC_ADD_3_c2.
+
 2013-06-21  Maciej W. Rozycki  <macro@codesourcery.com>
 
        * elf/dl-dst.h (DL_DST_REQUIRED): Remove call to

diff --git a/NEWS b/NEWS
index 28afc835d36a075874f31e53d1913d67d8f878e5..ea4a4651a08667fccd3c368ce8332b2778956974 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -21,7 +21,7 @@ Version 2.18
   15416, 15418, 15419, 15423, 15424, 15426, 15429, 15431, 15432, 15441,
   15442, 15448, 15465, 15480, 15485, 15488, 15490, 15492, 15493, 15497,
   15506, 15529, 15536, 15553, 15577, 15583, 15618, 15627, 15631, 15654,
-  15655.
+  15655, 15667.
 
 * CVE-2013-0242 Buffer overrun in regexp matcher has been fixed (Bugzilla
   #15078).

diff --git a/soft-fp/op-4.h b/soft-fp/op-4.h
index 007b01f36c8b6667c2c0773daf56bcfd2e95d84f..fd31da90f855a97af7239b1b56972b09b38d152b 100644 (file)
--- a/soft-fp/op-4.h
+++ b/soft-fp/op-4.h
@@ -525,14 +525,14 @@
 #ifndef __FP_FRAC_ADD_3
 #define __FP_FRAC_ADD_3(r2,r1,r0,x2,x1,x0,y2,y1,y0)            \
   do {                                                         \
-    _FP_W_TYPE _c1, _c2;                                       \
+    _FP_W_TYPE __FP_FRAC_ADD_3_c1, __FP_FRAC_ADD_3_c2;         \
     r0 = x0 + y0;                                              \
-    _c1 = r0 < x0;                                             \
+    __FP_FRAC_ADD_3_c1 = r0 < x0;                              \
     r1 = x1 + y1;                                              \
-    _c2 = r1 < x1;                                             \
-    r1 += _c1;                                                 \
-    _c2 |= r1 < _c1;                                           \
-    r2 = x2 + y2 + _c2;                                                \
+    __FP_FRAC_ADD_3_c2 = r1 < x1;                              \
+    r1 += __FP_FRAC_ADD_3_c1;                                  \
+    __FP_FRAC_ADD_3_c2 |= r1 < __FP_FRAC_ADD_3_c1;             \
+    r2 = x2 + y2 + __FP_FRAC_ADD_3_c2;                         \
   } while (0)
 #endif