diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | soft-fp/op-4.h | 8 |
2 files changed, 10 insertions, 4 deletions
@@ -1,3 +1,9 @@ +2013-11-26 Uros Bizjak <ubizjak@gmail.com> + + * soft-fp/op-4.h (_FP_FRAC_ASSEMBLE_4): Check rsize against + _FP_W_TYPE_SIZE to avoid "left shift count >= width of type" + warning. + 2013-11-26 Adhemerval Zanella <azanella@linux.vnet.ibm.com> * sysdeps/powerpc/fpu/feenablxcpt.c (feenableexcept): Use diff --git a/soft-fp/op-4.h b/soft-fp/op-4.h index 3515bdc..6c6b461 100644 --- a/soft-fp/op-4.h +++ b/soft-fp/op-4.h @@ -709,7 +709,7 @@ else if (rsize <= 2*_FP_W_TYPE_SIZE) \ { \ r = X##_f[1]; \ - r <<= _FP_W_TYPE_SIZE; \ + r = (rsize <= _FP_W_TYPE_SIZE ? 0 : r << _FP_W_TYPE_SIZE); \ r += X##_f[0]; \ } \ else \ @@ -717,11 +717,11 @@ /* I'm feeling lazy so we deal with int == 3words (implausible)*/ \ /* and int == 4words as a single case. */ \ r = X##_f[3]; \ - r <<= _FP_W_TYPE_SIZE; \ + r = (rsize <= _FP_W_TYPE_SIZE ? 0 : r << _FP_W_TYPE_SIZE); \ r += X##_f[2]; \ - r <<= _FP_W_TYPE_SIZE; \ + r = (rsize <= _FP_W_TYPE_SIZE ? 0 : r << _FP_W_TYPE_SIZE); \ r += X##_f[1]; \ - r <<= _FP_W_TYPE_SIZE; \ + r = (rsize <= _FP_W_TYPE_SIZE ? 0 : r << _FP_W_TYPE_SIZE); \ r += X##_f[0]; \ } \ } \ |