* 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
kprobinson · Nov 27, 2013 · ea9697c · ea9697c
1 parent c8a38f7
commit ea9697c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-27  Uros Bizjak  <ubizjak@gmail.com>
+
+	* soft-fp/op-4.h: Update from glibc.
+
 2013-11-27  Kugan Vivekanandarajah  <kuganv@linaro.org>
 
 	* libgcc2.c (__udivmoddi4): Define new implementation when
@@ -24,7 +28,7 @@
 
 2013-11-22  Yuri Rumyantsev  <ysrumyan@gmail.com>
 
-	 * 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  <jh@suse.cz>
 

diff --git a/libgcc/soft-fp/op-4.h b/libgcc/soft-fp/op-4.h
@@ -709,19 +709,19 @@
       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								\
 	{								\
 	  /* 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];						\
 	}								\
     }									\