about summary refs log tree commit diff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2014-12-19 05:28:06 -0800
committerH.J. Lu <hjl.tools@gmail.com>2014-12-19 05:32:39 -0800
commitc9c1a2d02cf344697c08075a44c170f771ebc6b2 (patch)
tree629ce20837bf562e981e207b3ff458ea1683eb39
parente54db0ea6a49affac43fa305fd134f3020c41382 (diff)
downloadglibc-c9c1a2d02cf344697c08075a44c170f771ebc6b2.tar.gz
glibc-c9c1a2d02cf344697c08075a44c170f771ebc6b2.tar.xz
glibc-c9c1a2d02cf344697c08075a44c170f771ebc6b2.zip
Replace 1L with (mp_limb_t) 1
X86-64 and x32 use sysdeps/i386/ldbl2mpn.c.  res_ptr is a pointer
to mp_limb_t, which is long for i386 and x86-64 and long long for
x32.  On x32, I got

../sysdeps/x86_64/../i386/ldbl2mpn.c: In function ‘__mpn_extract_long_double’:
../sysdeps/x86_64/../i386/ldbl2mpn.c:72:4: error: left shift count >= width of type [-Werror]
    res_ptr[N - 1] &= ~(1L << ((LDBL_MANT_DIG - 1) % BITS_PER_MP_LIMB));
    ^
cc1: all warnings being treated as errors

This patch replaces 1L with (mp_limb_t) 1.  Verified on x32, i686 and
x86-64 with GCC 4.8.3.
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/i386/ldbl2mpn.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 799b21a59d..eda51f8e6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/i386/ldbl2mpn.c (__mpn_extract_long_double): Replace
+	1L with (mp_limb_t) 1.
+
 2014-12-17  Roland McGrath  <roland@hack.frob.com>
 
 	* sysdeps/nptl/fork.c (__fork_generation_pointer): Variable moved ...
diff --git a/sysdeps/i386/ldbl2mpn.c b/sysdeps/i386/ldbl2mpn.c
index 09e30965ef..6f92833678 100644
--- a/sysdeps/i386/ldbl2mpn.c
+++ b/sysdeps/i386/ldbl2mpn.c
@@ -69,7 +69,7 @@ __mpn_extract_long_double (mp_ptr res_ptr, mp_size_t size,
 	     for denormalized number.  If it is one, the number is according
 	     to Intel's specification an invalid number.  We make the
 	     representation unique by explicitly clearing this bit.  */
-	  res_ptr[N - 1] &= ~(1L << ((LDBL_MANT_DIG - 1) % BITS_PER_MP_LIMB));
+	  res_ptr[N - 1] &= ~((mp_limb_t) 1 << ((LDBL_MANT_DIG - 1) % BITS_PER_MP_LIMB));
 
 	  if (res_ptr[N - 1] != 0)
 	    {