aboutsummaryrefslogtreecommitdiff
path: root/soft-fp
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2013-06-22 19:27:41 +0000
committerJoseph Myers <joseph@codesourcery.com>2013-06-22 19:27:41 +0000
commit695c378f81263640618bdebf56eaa065f578251f (patch)
tree8d8a8e165bdbf28ea3a27365d1a1951536f5d9a6 /soft-fp
parentd1d5471579eb0426671bf94f2d71e61dfb204c30 (diff)
downloadglibc-695c378f81263640618bdebf56eaa065f578251f.tar
glibc-695c378f81263640618bdebf56eaa065f578251f.tar.gz
glibc-695c378f81263640618bdebf56eaa065f578251f.tar.bz2
glibc-695c378f81263640618bdebf56eaa065f578251f.zip
Fix soft-fp shadowing between __FP_FRAC_ADD_3 and _FP_MUL_MEAT_2_wide_3mul (bug 15667).
Diffstat (limited to 'soft-fp')
-rw-r--r--soft-fp/op-4.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/soft-fp/op-4.h b/soft-fp/op-4.h
index 007b01f36c..fd31da90f8 100644
--- 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