From ea9697c47fce40051c57d37fd93f2dddad246005 Mon Sep 17 00:00:00 2001 From: uros Date: Wed, 27 Nov 2013 21:57:52 +0000 Subject: [PATCH] * soft-fp/op-4.h: Update from glibc. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@205462 138bc75d-0d04-0410-961f-82ee72b054a4 --- libgcc/ChangeLog | 6 +++++- libgcc/soft-fp/op-4.h | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 7e7aa4a40d1..586372a3b6d 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,7 @@ +2013-11-27 Uros Bizjak + + * soft-fp/op-4.h: Update from glibc. + 2013-11-27 Kugan Vivekanandarajah * libgcc2.c (__udivmoddi4): Define new implementation when @@ -24,7 +28,7 @@ 2013-11-22 Yuri Rumyantsev - * config/i386/cpuinfo.c (get_intel_cpu): Add Silvermont cases. + * config/i386/cpuinfo.c (get_intel_cpu): Add Silvermont cases. 2013-11-18 Jan Hubicka diff --git a/libgcc/soft-fp/op-4.h b/libgcc/soft-fp/op-4.h index 3515bdc497b..6c6b4611662 100644 --- a/libgcc/soft-fp/op-4.h +++ b/libgcc/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]; \ } \ } \ -- 2.11.4.GIT