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

[Commits] r17574 - in /fsf/trunk/libc: ./ nss/nss_db/ sysdeps/ieee754/dbl-64/ sysdeps/ieee754/dbl-64/wordsize-64/ sysdeps/ieee754/ldbl...



Author: eglibc
Date: Wed Mar 14 00:02:23 2012
New Revision: 17574

Log:
Import glibc-mainline for 2012-03-14

Added:
    fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/sparc64/dl-fxstatat64.c
Removed:
    fsf/trunk/libc/sysdeps/sparc/elf/rtld-global-offsets.sym
Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/nss/nss_db/db-init.c
    fsf/trunk/libc/sysdeps/ieee754/dbl-64/s_nearbyint.c
    fsf/trunk/libc/sysdeps/ieee754/dbl-64/s_rint.c
    fsf/trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_nearbyint.c
    fsf/trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_rint.c
    fsf/trunk/libc/sysdeps/ieee754/ldbl-128/s_expm1l.c
    fsf/trunk/libc/sysdeps/sparc/Makefile
    fsf/trunk/libc/sysdeps/sparc/sparc64/multiarch/memcpy.S
    fsf/trunk/libc/sysdeps/sparc/sparc64/multiarch/memset.S
    fsf/trunk/libc/sysdeps/unix/sysv/linux/openat.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Wed Mar 14 00:02:23 2012
@@ -1,3 +1,30 @@
+2012-03-13  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/ieee754/dbl-64/s_nearbyint.c (__nearbyint): Do not
+	manipulate bits before adding and subtracting TWO52[sx].
+	* sysdeps/ieee754/dbl-64/s_rint.c (__rint): Likewise.
+	* sysdeps/ieee754/dbl-64/wordsize-64/s_nearbyint.c (__nearbyint):
+	Likewise.
+	* sysdeps/ieee754/dbl-64/wordsize-64/s_rint.c (__rint): Likewise.
+
+2012-03-13  David S. Miller  <davem@xxxxxxxxxxxxx>
+
+	* sysdeps/sparc/Makefile: Remove rtld-global-offsets.sym handling.
+	* sysdeps/sparc/elf/rtld-global-offsets.sym: Delete.
+	* sysdeps/sparc/sparc64/multiarch/memcpy.S: Don't include
+	rtld-global-offsets.h
+	* sysdeps/sparc/sparc64/multiarch/memset.S: Likewise.
+
+	* sysdeps/ieee754/ldbl-128/s_expm1l.c (__expm1l): Use expl for
+	large parameters.
+
+	* sysdeps/unix/sysv/linux/sparc/sparc64/dl-fxstatat64.c: New file.
+
+	* sysdeps/unix/sysv/linux/openat.c (OPENAT_NOT_CANCEL): Declare syscall
+	'err' in the ifdef scope in which it is actually used.
+
+	* nss/nss_db/db-init.c: Include string.h
+
 2012-03-12  David S. Miller  <davem@xxxxxxxxxxxxx>
 
 	* sysdeps/generic/dl-osinfo.h (_dl_setup_stack_chk_guard): Fix

Modified: fsf/trunk/libc/nss/nss_db/db-init.c
==============================================================================
--- fsf/trunk/libc/nss/nss_db/db-init.c (original)
+++ fsf/trunk/libc/nss/nss_db/db-init.c Wed Mar 14 00:02:23 2012
@@ -1,5 +1,5 @@
 /* Initialization in nss_db module.
-   Copyright (C) 2011 Free Software Foundation, Inc.
+   Copyright (C) 2011, 2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -18,7 +18,7 @@
 
 #include <paths.h>
 #include <nscd/nscd.h>
-
+#include <string.h>
 
 static union
 {

Modified: fsf/trunk/libc/sysdeps/ieee754/dbl-64/s_nearbyint.c
==============================================================================
--- fsf/trunk/libc/sysdeps/ieee754/dbl-64/s_nearbyint.c (original)
+++ fsf/trunk/libc/sysdeps/ieee754/dbl-64/s_nearbyint.c Wed Mar 14 00:02:23 2012
@@ -38,18 +38,12 @@
 {
 	fenv_t env;
 	int32_t i0,j0,sx;
-	u_int32_t i,i1;
 	double w,t;
-	EXTRACT_WORDS(i0,i1,x);
+	GET_HIGH_WORD(i0,x);
 	sx = (i0>>31)&1;
 	j0 = ((i0>>20)&0x7ff)-0x3ff;
-	if(j0<20) {
+	if(j0<52) {
 	    if(j0<0) {
-		if(((i0&0x7fffffff)|i1)==0) return x;
-		i1 |= (i0&0x0fffff);
-		i0 &= 0xfffe0000;
-		i0 |= ((i1|-i1)>>12)&0x80000;
-		SET_HIGH_WORD(x,i0);
 		feholdexcept (&env);
 	        w = TWO52[sx]+x;
 	        t =  w-TWO52[sx];
@@ -57,32 +51,11 @@
 		GET_HIGH_WORD(i0,t);
 		SET_HIGH_WORD(t,(i0&0x7fffffff)|(sx<<31));
 	        return t;
-	    } else {
-		i = (0x000fffff)>>j0;
-		if(((i0&i)|i1)==0) return x; /* x is integral */
-		i>>=1;
-		if(((i0&i)|i1)!=0) {
-		  if (j0==19)
-		    i1 = 0x40000000;
-		  else if (j0<18)
-		    i0 = (i0&(~i))|((0x20000)>>j0);
-		  else
-		    {
-		      i0 &= ~i;
-		      i1 = 0x80000000;
-		    }
-		}
 	    }
-	} else if (j0>51) {
+	} else {
 	    if(j0==0x400) return x+x;	/* inf or NaN */
 	    else return x;		/* x is integral */
-	} else {
-	    i = ((u_int32_t)(0xffffffff))>>(j0-20);
-	    if((i1&i)==0) return x;	/* x is integral */
-	    i>>=1;
-	    if((i1&i)!=0) i1 = (i1&(~i))|((0x40000000)>>(j0-20));
 	}
-	INSERT_WORDS(x,i0,i1);
 	feholdexcept (&env);
 	w = TWO52[sx]+x;
 	t = w-TWO52[sx];

Modified: fsf/trunk/libc/sysdeps/ieee754/dbl-64/s_rint.c
==============================================================================
--- fsf/trunk/libc/sysdeps/ieee754/dbl-64/s_rint.c (original)
+++ fsf/trunk/libc/sysdeps/ieee754/dbl-64/s_rint.c Wed Mar 14 00:02:23 2012
@@ -33,49 +33,22 @@
 __rint(double x)
 {
 	int32_t i0,j0,sx;
-	u_int32_t i,i1;
 	double w,t;
-	EXTRACT_WORDS(i0,i1,x);
+	GET_HIGH_WORD(i0,x);
 	sx = (i0>>31)&1;
 	j0 = ((i0>>20)&0x7ff)-0x3ff;
-	if(j0<20) {
+	if(j0<52) {
 	    if(j0<0) {
-		if(((i0&0x7fffffff)|i1)==0) return x;
-		i1 |= (i0&0x0fffff);
-		i0 &= 0xfffe0000;
-		i0 |= ((i1|-i1)>>12)&0x80000;
-		SET_HIGH_WORD(x,i0);
 		w = TWO52[sx]+x;
 		t =  w-TWO52[sx];
 		GET_HIGH_WORD(i0,t);
 		SET_HIGH_WORD(t,(i0&0x7fffffff)|(sx<<31));
 		return t;
-	    } else {
-		i = (0x000fffff)>>j0;
-		if(((i0&i)|i1)==0) return x; /* x is integral */
-		i>>=1;
-		if(((i0&i)|i1)!=0) {
-		    if (j0==19)
-		      i1 = 0x40000000;
-		    else if (j0<18)
-		      i0 = (i0&(~i))|((0x20000)>>j0);
-		    else
-		      {
-			i0 &= ~i;
-			i1 = 0x80000000;
-		      }
-		}
 	    }
-	} else if (j0>51) {
+	} else {
 	    if(j0==0x400) return x+x;	/* inf or NaN */
 	    else return x;		/* x is integral */
-	} else {
-	    i = ((u_int32_t)(0xffffffff))>>(j0-20);
-	    if((i1&i)==0) return x;	/* x is integral */
-	    i>>=1;
-	    if((i1&i)!=0) i1 = (i1&(~i))|((0x40000000)>>(j0-20));
 	}
-	INSERT_WORDS(x,i0,i1);
 	w = TWO52[sx]+x;
 	return w-TWO52[sx];
 }

Modified: fsf/trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_nearbyint.c
==============================================================================
--- fsf/trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_nearbyint.c (original)
+++ fsf/trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_nearbyint.c Wed Mar 14 00:02:23 2012
@@ -41,29 +41,17 @@
 	j0 = ((i0>>52)&0x7ff)-0x3ff;
 	if(__builtin_expect(j0<52, 1)) {
 	    if(j0<0) {
-	      if((i0&UINT64_C(0x7fffffffffffffff))==0) return x;
-		uint64_t i = i0 & UINT64_C(0xfffffffffffff);
-		i0 &= UINT64_C(0xfffe000000000000);
-		i0 |= (((i|-i) >> 12) & UINT64_C(0x8000000000000));
-		INSERT_WORDS64(x,i0);
 		libc_feholdexcept (&env);
 		double w = TWO52[sx]+x;
 		double t =  w-TWO52[sx];
 		math_opt_barrier(t);
 		libc_fesetenv (&env);
 		return copysign(t, x);
-	    } else {
-		uint64_t i = UINT64_C(0x000fffffffffffff)>>j0;
-		if((i0&i)==0) return x; /* x is integral */
-		i>>=1;
-		if((i0&i)!=0)
-		    i0 = (i0&(~i))|(UINT64_C(0x4000000000000)>>j0);
 	    }
 	} else {
 	    if(j0==0x400) return x+x;	/* inf or NaN */
 	    else return x;		/* x is integral */
 	}
-	INSERT_WORDS64(x,i0);
 	libc_feholdexcept (&env);
 	double w = TWO52[sx]+x;
 	double t = w-TWO52[sx];

Modified: fsf/trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_rint.c
==============================================================================
--- fsf/trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_rint.c (original)
+++ fsf/trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_rint.c Wed Mar 14 00:02:23 2012
@@ -38,28 +38,16 @@
 	j0 = ((i0>>52)&0x7ff)-0x3ff;
 	if(j0<52) {
 	    if(j0<0) {
-		if((i0 & UINT64_C(0x7fffffffffffffff))==0) return x;
-		uint64_t i = i0 & UINT64_C(0xfffffffffffff);
-		i0 &= UINT64_C(0xfffe000000000000);
-		i0 |= (((i|-i) >> 12) & UINT64_C(0x8000000000000));
-		INSERT_WORDS64(x,i0);
 		double w = TWO52[sx]+x;
 		double t =  w-TWO52[sx];
 		EXTRACT_WORDS64(i0,t);
 		INSERT_WORDS64(t,(i0&UINT64_C(0x7fffffffffffffff))|(sx<<63));
 		return t;
-	    } else {
-		uint64_t i = UINT64_C(0x000fffffffffffff)>>j0;
-		if((i0&i)==0) return x; /* x is integral */
-		i>>=1;
-		if((i0&i)!=0)
-		    i0 = (i0&(~i))|(UINT64_C(0x4000000000000)>>j0);
 	    }
 	} else {
 	    if(j0==0x400) return x+x;	/* inf or NaN */
 	    else return x;		/* x is integral */
 	}
-	INSERT_WORDS64(x,i0);
 	double w = TWO52[sx]+x;
 	return w-TWO52[sx];
 }

Modified: fsf/trunk/libc/sysdeps/ieee754/ldbl-128/s_expm1l.c
==============================================================================
--- fsf/trunk/libc/sysdeps/ieee754/ldbl-128/s_expm1l.c (original)
+++ fsf/trunk/libc/sysdeps/ieee754/ldbl-128/s_expm1l.c Wed Mar 14 00:02:23 2012
@@ -102,6 +102,11 @@
   ix = u.parts32.w0;
   sign = ix & 0x80000000;
   ix &= 0x7fffffff;
+  if (!sign && ix >= 0x40060000)
+    {
+      /* If num is positive and exp >= 6 use plain exp.  */
+      return __expl (x);
+    }
   if (ix >= 0x7fff0000)
     {
       /* Infinity. */

Modified: fsf/trunk/libc/sysdeps/sparc/Makefile
==============================================================================
--- fsf/trunk/libc/sysdeps/sparc/Makefile (original)
+++ fsf/trunk/libc/sysdeps/sparc/Makefile Wed Mar 14 00:02:23 2012
@@ -12,8 +12,6 @@
 endif
 
 ifeq ($(subdir),csu)
-# get offset to rtld_global._dl_hwcap
-gen-as-const-headers += rtld-global-offsets.sym
 CPPFLAGS-crti.S += -fPIC
 CPPFLAGS-crtn.S += -fPIC
 endif

Removed: fsf/trunk/libc/sysdeps/sparc/elf/rtld-global-offsets.sym
==============================================================================
--- fsf/trunk/libc/sysdeps/sparc/elf/rtld-global-offsets.sym (original)
+++ fsf/trunk/libc/sysdeps/sparc/elf/rtld-global-offsets.sym (removed)
@@ -1,7 +1,0 @@
-#define SHARED 1
-
-#include <ldsodefs.h>
-
-#define rtld_global_ro_offsetof(mem) offsetof (struct rtld_global_ro, mem)
-
-RTLD_GLOBAL_RO_DL_HWCAP_OFFSET	rtld_global_ro_offsetof (_dl_hwcap)

Modified: fsf/trunk/libc/sysdeps/sparc/sparc64/multiarch/memcpy.S
==============================================================================
--- fsf/trunk/libc/sysdeps/sparc/sparc64/multiarch/memcpy.S (original)
+++ fsf/trunk/libc/sysdeps/sparc/sparc64/multiarch/memcpy.S Wed Mar 14 00:02:23 2012
@@ -18,7 +18,6 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include <rtld-global-offsets.h>
 
 #if !defined NOT_IN_libc
 	.text

Modified: fsf/trunk/libc/sysdeps/sparc/sparc64/multiarch/memset.S
==============================================================================
--- fsf/trunk/libc/sysdeps/sparc/sparc64/multiarch/memset.S (original)
+++ fsf/trunk/libc/sysdeps/sparc/sparc64/multiarch/memset.S Wed Mar 14 00:02:23 2012
@@ -18,7 +18,6 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include <rtld-global-offsets.h>
 
 #if !defined NOT_IN_libc
 	.text

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/openat.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/openat.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/openat.c Wed Mar 14 00:02:23 2012
@@ -84,7 +84,6 @@
   oflag |= MORE_OFLAGS;
 #endif
 
-  INTERNAL_SYSCALL_DECL (err);
   int res;
 
 #ifdef __NR_openat
@@ -104,6 +103,7 @@
 #endif
 
 #ifndef __ASSUME_ATFCTS
+  INTERNAL_SYSCALL_DECL (err);
   char *buf = NULL;
 
   if (fd != AT_FDCWD && file[0] != '/')

Added: fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/sparc64/dl-fxstatat64.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/sparc64/dl-fxstatat64.c (added)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/sparc64/dl-fxstatat64.c Wed Mar 14 00:02:23 2012
@@ -1,0 +1,6 @@
+/* In this implementation we do not really care whether the call fails
+   because of missing kernel support since we do not even call the
+   function in this case.  */
+#undef __ASSUME_ATFCTS
+#define __ASSUME_ATFCTS 1
+#include "fxstatat.c"

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