[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commits] r18762 - in /trunk: ./ libc/ libc/math/ libc/sysdeps/ieee754/dbl-64/ libc/sysdeps/ieee754/dbl-64/wordsize-64/ libc/sysdeps/i...



Author: joseph
Date: Sat May 26 20:24:08 2012
New Revision: 18762

Log:
Merge changes between r18730 and r18761 from /fsf/trunk.

Added:
    trunk/ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libcidn.abilist
      - copied unchanged from r18761, fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libcidn.abilist
    trunk/ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_compat.abilist
      - copied unchanged from r18761, fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_compat.abilist
    trunk/ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_db.abilist
      - copied unchanged from r18761, fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_db.abilist
    trunk/ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_dns.abilist
      - copied unchanged from r18761, fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_dns.abilist
    trunk/ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_files.abilist
      - copied unchanged from r18761, fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_files.abilist
    trunk/ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_hesiod.abilist
      - copied unchanged from r18761, fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_hesiod.abilist
    trunk/ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_nis.abilist
      - copied unchanged from r18761, fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_nis.abilist
    trunk/ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_nisplus.abilist
      - copied unchanged from r18761, fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_nisplus.abilist
Removed:
    trunk/ports/sysdeps/unix/sysv/linux/arm/chown.c
Modified:
    trunk/   (props changed)
    trunk/libc/ChangeLog
    trunk/libc/math/libm-test.inc
    trunk/libc/sysdeps/ieee754/dbl-64/s_logb.c
    trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_logb.c
    trunk/libc/sysdeps/ieee754/flt-32/s_logbf.c
    trunk/libc/sysdeps/ieee754/ldbl-128/s_logbl.c
    trunk/libc/sysdeps/ieee754/ldbl-128ibm/s_logbl.c
    trunk/libc/sysdeps/ieee754/ldbl-96/s_logbl.c
    trunk/libc/sysdeps/powerpc/powerpc32/power7/fpu/s_logb.c
    trunk/libc/sysdeps/powerpc/powerpc32/power7/fpu/s_logbl.c
    trunk/ports/ChangeLog.arm
    trunk/ports/ChangeLog.mips
    trunk/ports/sysdeps/arm/bits/predefs.h   (props changed)
    trunk/ports/sysdeps/unix/sysv/linux/arm/syscalls.list

Propchange: trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 26 20:24:08 2012
@@ -1,1 +1,1 @@
-/fsf/trunk:15224-18730
+/fsf/trunk:15224-18761

Modified: trunk/libc/ChangeLog
==============================================================================
--- trunk/libc/ChangeLog (original)
+++ trunk/libc/ChangeLog Sat May 26 20:24:08 2012
@@ -1,3 +1,22 @@
+2012-05-26  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
+
+	* sysdeps/ieee754/dbl-64/s_logb.c (__logb): Optimize
+	handling of denormals.
+	* sysdeps/ieee754/dbl-64/wordsize-64/s_logb.c (__logb): Likewise.
+	* sysdeps/ieee754/flt-32/s_logbf.c (__logbf): Likewise.
+	* sysdeps/ieee754/ldbl-96/s_logbl.c (__logbl): Likewise.
+	* sysdeps/ieee754/ldbl-128/s_logbl.c (__logbl): Likewise.
+	* sysdeps/ieee754/ldbl-128ibm/s_logbl.c (__logbl): Likewise.
+	* sysdeps/powerpc/powerpc32/power7/fpu/s_logb.c (_logb): Likewise.
+	* sysdeps/powerpc/powerpc32/power7/fpu/s_logbl.c (_logbl):
+	Likewise.
+
+2012-05-26  Marek Polacek  <polacek@xxxxxxxxxx>
+
+	[BZ #14152]
+	* math/libm-test.inc (fma_test): Don't always expect underflow
+	exception.
+
 2012-05-26  Siddhesh Poyarekar  <siddhesh@xxxxxxxxxx>
 
 	[BZ #12416]

Modified: trunk/libc/math/libm-test.inc
==============================================================================
--- trunk/libc/math/libm-test.inc (original)
+++ trunk/libc/math/libm-test.inc Sat May 26 20:24:08 2012
@@ -3983,7 +3983,8 @@
   TEST_fff_f (fma, 0x1.4000004p-967, 0x1p-106, 0x0.000001p-1022, 0x0.0000010000003p-1022, UNDERFLOW_EXCEPTION);
   TEST_fff_f (fma, 0x1.4p-967, -0x1p-106, -0x0.000001p-1022, -0x0.0000010000002p-1022, UNDERFLOW_EXCEPTION);
   TEST_fff_f (fma, -0x1.19cab66d73e17p-959, 0x1.c7108a8c5ff51p-107, -0x0.80b0ad65d9b64p-1022, -0x0.80b0ad65d9d59p-1022, UNDERFLOW_EXCEPTION);
-  TEST_fff_f (fma, -0x1.d2eaed6e8e9d3p-979, -0x1.4e066c62ac9ddp-63, -0x0.9245e6b003454p-1022, -0x0.9245c09c5fb5dp-1022, UNDERFLOW_EXCEPTION);
+  /* Sometimes the FE_UNDERFLOW is not set, so be prepared.  See Bug 14152.  */
+  TEST_fff_f (fma, -0x1.d2eaed6e8e9d3p-979, -0x1.4e066c62ac9ddp-63, -0x0.9245e6b003454p-1022, -0x0.9245c09c5fb5dp-1022, UNDERFLOW_EXCEPTION_OK);
   TEST_fff_f (fma, 0x1.153d650bb9f06p-907, 0x1.2d01230d48407p-125, -0x0.b278d5acfc3cp-1022, -0x0.b22757123bbe9p-1022, UNDERFLOW_EXCEPTION);
   TEST_fff_f (fma, -0x1.fffffffffffffp-711, 0x1.fffffffffffffp-275, 0x1.fffffe00007ffp-983, 0x1.7ffffe00007ffp-983);
 #endif

Modified: trunk/libc/sysdeps/ieee754/dbl-64/s_logb.c
==============================================================================
--- trunk/libc/sysdeps/ieee754/dbl-64/s_logb.c (original)
+++ trunk/libc/sysdeps/ieee754/dbl-64/s_logb.c Sat May 26 20:24:08 2012
@@ -34,10 +34,12 @@
     {
       /* POSIX specifies that denormal number is treated as
          though it were normalized.  */
-      int m1 = (ix == 0) ? 0 : __builtin_clz (ix);
-      int m2 = (lx == 0) ? 0 : __builtin_clz (lx);
-      int ma = (m1 == 0) ? m2 + 32 : m1;
-      return -1022.0 + (double)(11 - ma);
+      int ma;
+      if (ix == 0)
+	ma = __builtin_clz (lx) + 32;
+      else
+	ma = __builtin_clz (ix);
+      rix -= ma - 12;
     }
   return (double) (rix - 1023);
 }

Modified: trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_logb.c
==============================================================================
--- trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_logb.c (original)
+++ trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_logb.c Sat May 26 20:24:08 2012
@@ -36,8 +36,8 @@
     return x * x;
   if (__builtin_expect (ex == 0, 0))
     {
-      int m = (ix == 0) ? 0 : __builtin_clzll (ix);
-      return -1022.0 + (double)(11 -m);
+      int m = __builtin_clzll (ix);
+      ex -= m - 12;
     }
   return (double) (ex - 1023);
 }

Modified: trunk/libc/sysdeps/ieee754/flt-32/s_logbf.c
==============================================================================
--- trunk/libc/sysdeps/ieee754/flt-32/s_logbf.c (original)
+++ trunk/libc/sysdeps/ieee754/flt-32/s_logbf.c Sat May 26 20:24:08 2012
@@ -31,8 +31,7 @@
     {
       /* POSIX specifies that denormal number is treated as
          though it were normalized.  */
-      int m = (ix == 0) ? 0 : __builtin_clz (ix);
-      return -126.0 + (float)(8 - m);
+      rix -= __builtin_clz (ix) - 9;
     }
   return (float) (rix - 127);
 }

Modified: trunk/libc/sysdeps/ieee754/ldbl-128/s_logbl.c
==============================================================================
--- trunk/libc/sysdeps/ieee754/ldbl-128/s_logbl.c (original)
+++ trunk/libc/sysdeps/ieee754/ldbl-128/s_logbl.c Sat May 26 20:24:08 2012
@@ -41,10 +41,12 @@
     {
       /* POSIX specifies that denormal number is treated as
          though it were normalized.  */
-      int m1 = (hx == 0) ? 0 : __builtin_clzll (hx);
-      int m2 = (lx == 0) ? 0 : __builtin_clzll (lx);
-      int ma = (m1 == 0) ? m2 + 64 : m1;
-      return -16382.0 + (long double)(15 - ma);
+      int ma;
+      if (hx == 0)
+	ma = __builtin_clzll (lx) + 64;
+      else
+	ma = __builtin_clzll (hx);
+      ex -= ma - 16;
     }
   return (long double) (ex - 16383);
 }

Modified: trunk/libc/sysdeps/ieee754/ldbl-128ibm/s_logbl.c
==============================================================================
--- trunk/libc/sysdeps/ieee754/ldbl-128ibm/s_logbl.c (original)
+++ trunk/libc/sysdeps/ieee754/ldbl-128ibm/s_logbl.c Sat May 26 20:24:08 2012
@@ -30,7 +30,7 @@
 
   GET_LDOUBLE_WORDS64 (hx, lx, x);
   hx &= 0x7fffffffffffffffLL;	/* high |x| */
-  if ((hx | (lx & 0x7fffffffffffffffLL)) == 0)
+  if (hx == 0)
     return -1.0 / fabs (x);
   if (hx >= 0x7ff0000000000000LL)
     return x * x;
@@ -38,10 +38,7 @@
     {
       /* POSIX specifies that denormal number is treated as
          though it were normalized.  */
-      int m1 = (hx == 0) ? 0 : __builtin_clzll (hx);
-      int m2 = (lx == 0) ? 0 : __builtin_clzll (lx);
-      int ma = (m1 == 0) ? m2 + 64 : m1;
-      return -1022.0 + (long double)(11 - ma);
+      rhx -= __builtin_clzll (hx) - 12;
     }
   return (long double) (rhx - 1023);
 }

Modified: trunk/libc/sysdeps/ieee754/ldbl-96/s_logbl.c
==============================================================================
--- trunk/libc/sysdeps/ieee754/ldbl-96/s_logbl.c (original)
+++ trunk/libc/sysdeps/ieee754/ldbl-96/s_logbl.c Sat May 26 20:24:08 2012
@@ -38,10 +38,12 @@
     {
       /* POSIX specifies that denormal number is treated as
          though it were normalized.  */
-      int m1 = (ix == 0) ? 0 : __builtin_clz (ix);
-      int m2 = (lx == 0) ? 0 : __builtin_clz (lx);
-      int ma = (m1 == 0) ? m2 + 32 : m1;
-      return -16382.0 - (long double)(ma);
+      int ma;
+      if (ix == 0)
+	ma = __builtin_clz (lx) + 32;
+      else
+	ma = __builtin_clz (ix);
+      es -= ma - 1;
     }
   return (long double) (es - 16383);
 }

Modified: trunk/libc/sysdeps/powerpc/powerpc32/power7/fpu/s_logb.c
==============================================================================
--- trunk/libc/sysdeps/powerpc/powerpc32/power7/fpu/s_logb.c (original)
+++ trunk/libc/sysdeps/powerpc/powerpc32/power7/fpu/s_logb.c Sat May 26 20:24:08 2012
@@ -55,13 +55,14 @@
       /* POSIX specifies that denormal numbers are treated as
          though they were normalized.  */
       int32_t lx, ix;
-      int m1, m2, ma;
+      int ma;
 
-      EXTRACT_WORDS (ix , lx, x);
-      m1 = (ix == 0) ? 0 : __builtin_clz (ix);
-      m2 = (lx == 0) ? 0 : __builtin_clz (lx);
-      ma = (m1 == 0) ? m2 + 32 : m1;
-      return -1022.0 + (double)(11 - ma);
+      EXTRACT_WORDS (ix, lx, x);
+      if (ix == 0)
+	ma = __builtin_clz (lx) + 32;
+      else
+	ma = __builtin_clz (ix);
+      return (double) (-1023 - (ma - 12));
     }
   /* Test to avoid logb_downward (0.0) == -0.0.  */
   return ret == -0.0 ? 0.0 : ret;

Modified: trunk/libc/sysdeps/powerpc/powerpc32/power7/fpu/s_logbl.c
==============================================================================
--- trunk/libc/sysdeps/powerpc/powerpc32/power7/fpu/s_logbl.c (original)
+++ trunk/libc/sysdeps/powerpc/powerpc32/power7/fpu/s_logbl.c Sat May 26 20:24:08 2012
@@ -56,14 +56,12 @@
     return (xh * xh);
   else if (__builtin_expect (ret == two10m1, 0))
     {
+      /* POSIX specifies that denormal number is treated as
+         though it were normalized.  */
       int64_t lx, hx;
-      int m1, m2, ma;
 
       GET_LDOUBLE_WORDS64 (hx, lx, x);
-      m1 = (hx == 0) ? 0 : __builtin_clzll (hx);
-      m2 = (lx == 0) ? 0 : __builtin_clzll (lx);
-      ma = (m1 == 0) ? m2 + 64 : m1;
-      return -1022.0 + (double)(11 - ma);
+      return (long double) (-1023 - (__builtin_clzll (hx) - 12));
     }
   /* Test to avoid logb_downward (0.0) == -0.0.  */
   return ret == -0.0 ? 0.0 : ret;

Modified: trunk/ports/ChangeLog.arm
==============================================================================
--- trunk/ports/ChangeLog.arm (original)
+++ trunk/ports/ChangeLog.arm Sat May 26 20:24:08 2012
@@ -1,3 +1,8 @@
+2012-05-26  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/arm/syscalls.list (chown): New.
+	* sysdeps/unix/sysv/linux/arm/chown.c: Remove.
+
 2012-05-25  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/arm/kernel-features.h

Modified: trunk/ports/ChangeLog.mips
==============================================================================
--- trunk/ports/ChangeLog.mips (original)
+++ trunk/ports/ChangeLog.mips Sat May 26 20:24:08 2012
@@ -1,3 +1,22 @@
+2012-05-26  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/mips/mips32/nptl/libcidn.abilist: New
+	file.
+	* sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_compat.abilist:
+	Likewise.
+	* sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_db.abilist:
+	Likewise.
+	* sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_dns.abilist:
+	Likewise.
+	* sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_files.abilist:
+	Likewise.
+	* sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_hesiod.abilist:
+	Likewise.
+	* sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_nis.abilist:
+	Likewise.
+	* sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_nisplus.abilist:
+	Likewise.
+
 2012-05-25  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/mips/kernel-features.h

Propchange: trunk/ports/sysdeps/arm/bits/predefs.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 26 20:24:08 2012
@@ -1,2 +1,2 @@
-/fsf/trunk/ports/sysdeps/arm/bits/predefs.h:18166-18730
+/fsf/trunk/ports/sysdeps/arm/bits/predefs.h:18166-18761
 /fsf/trunk/ports/sysdeps/arm/eabi/bits/predefs.h:15224-17813

Removed: trunk/ports/sysdeps/unix/sysv/linux/arm/chown.c
==============================================================================
--- trunk/ports/sysdeps/unix/sysv/linux/arm/chown.c (original)
+++ trunk/ports/sysdeps/unix/sysv/linux/arm/chown.c (removed)
@@ -1,1 +1,0 @@
-#include <sysdeps/unix/sysv/linux/m68k/chown.c>

Modified: trunk/ports/sysdeps/unix/sysv/linux/arm/syscalls.list
==============================================================================
--- trunk/ports/sysdeps/unix/sysv/linux/arm/syscalls.list (original)
+++ trunk/ports/sysdeps/unix/sysv/linux/arm/syscalls.list Sat May 26 20:24:08 2012
@@ -1,4 +1,6 @@
 # File name	Caller	Syscall name	# args	Strong name	Weak names
+
+chown		-	chown32		i:sii	__chown		chown
 
 prlimit64	EXTRA	prlimit64	i:iipp	prlimit64
 

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits