[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r15337 - in /fsf/trunk/libc: ./ nptl/ nptl/sysdeps/pthread/ nptl_db/ sysdeps/ieee754/dbl-64/wordsize-64/ sysdeps/powerpc/fpu...
- To: commits@xxxxxxxxxx
- Subject: [commits] r15337 - in /fsf/trunk/libc: ./ nptl/ nptl/sysdeps/pthread/ nptl_db/ sysdeps/ieee754/dbl-64/wordsize-64/ sysdeps/powerpc/fpu...
- From: eglibc@xxxxxxxxxx
- Date: Fri, 16 Sep 2011 07:02:21 -0000
Author: eglibc
Date: Fri Sep 16 00:02:20 2011
New Revision: 15337
Log:
Import glibc-mainline for 2011-09-16
Added:
fsf/trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_finite.c
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/nptl/ChangeLog
fsf/trunk/libc/nptl/allocatestack.c
fsf/trunk/libc/nptl/descr.h
fsf/trunk/libc/nptl/nptl-init.c
fsf/trunk/libc/nptl/sysdeps/pthread/list.h
fsf/trunk/libc/nptl_db/ChangeLog
fsf/trunk/libc/nptl_db/thread_dbP.h
fsf/trunk/libc/sysdeps/powerpc/fpu/e_hypot.c
fsf/trunk/libc/sysdeps/powerpc/fpu/e_hypotf.c
fsf/trunk/libc/sysdeps/powerpc/fpu/e_rem_pio2f.c
fsf/trunk/libc/sysdeps/powerpc/fpu/k_rem_pio2f.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/in.h
fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S
fsf/trunk/libc/sysdeps/unix/sysv/linux/ia64/____longjmp_chk.S
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S
fsf/trunk/libc/sysdeps/x86_64/fpu/bits/mathinline.h
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Fri Sep 16 00:02:20 2011
@@ -1,3 +1,36 @@
+2011-09-15 Ulrich Drepper <drepper@xxxxxxxxx>
+
+ * sysdeps/ieee754/dbl-64/wordsize-64/s_finite.c: New file.
+
+ * sysdeps/unix/sysv/linux/bits/in.h (IP_MULTICAST_ALL): Define.
+ Patch mostly by Neil Horman <nhorman@xxxxxxxxxxxxx>.
+
+2011-09-15 Roland McGrath <roland@xxxxxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/i386/____longjmp_chk.S
+ (CALL_FAIL): Use HIDDEN_JUMPTARGET for __fortify_fail.
+ * sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S
+ (CALL_FAIL): Likewise.
+ * sysdeps/unix/sysv/linux/ia64/____longjmp_chk.S (CHECK_RSP): Likewise.
+ (CALL_FAIL): Macro removed.
+ Patch mostly by Mike Frysinger <vapier@xxxxxxxxxx>.
+
+2011-09-15 Ulrich Drepper <drepper@xxxxxxxxx>
+
+ * sysdeps/x86_64/fpu/bits/mathinline.h: Add fmax and fmin optimizations
+ for __FINITE_MATH_ONLY__ == 1.
+
+2011-09-15 Andreas Schwab <schwab@xxxxxxxxxx>
+
+ * sysdeps/powerpc/fpu/e_hypot.c (__ieee754_hypot): Use
+ __ieee754_sqrt instead of sqrt.
+ * sysdeps/powerpc/fpu/e_hypotf.c (__ieee754_hypotf): Use
+ __ieee754_sqrtf instead of sqrtf.
+ * sysdeps/powerpc/fpu/e_rem_pio2f.c (__ieee754_rem_pio2f): Use
+ __floorf instead of floorf.
+ * sysdeps/powerpc/fpu/k_rem_pio2f.c (__fp_kernel_rem_pio2f): Use
+ __floorf, __truncf instead of floorf, truncf.
+
2011-09-14 Ulrich Drepper <drepper@xxxxxxxxx>
* sysdeps/x86_64/fpu/s_copysign.S [ELF]: Use correct section.
Modified: fsf/trunk/libc/nptl/ChangeLog
==============================================================================
--- fsf/trunk/libc/nptl/ChangeLog (original)
+++ fsf/trunk/libc/nptl/ChangeLog Fri Sep 16 00:02:20 2011
@@ -1,3 +1,12 @@
+2011-09-15 Andreas Schwab <schwab@xxxxxxxxxx>
+
+ * sysdeps/pthread/list.h: Define only list_t if __need_list_t is
+ defined.
+ (list_add): Add atomic_write_barrier.
+ * descr.h: Define __need_list_t before including <list.h>.
+ * nptl-init.c: Include <list.h>
+ * allocatestack.c: Likewise.
+
2011-09-11 Ulrich Drepper <drepper@xxxxxxxxx>
* sysdeps/i386/tls.h: Remove HAVE_TLS_SUPPORT test.
Modified: fsf/trunk/libc/nptl/allocatestack.c
==============================================================================
--- fsf/trunk/libc/nptl/allocatestack.c (original)
+++ fsf/trunk/libc/nptl/allocatestack.c Fri Sep 16 00:02:20 2011
@@ -28,6 +28,7 @@
#include <dl-sysdep.h>
#include <dl-tls.h>
#include <tls.h>
+#include <list.h>
#include <lowlevellock.h>
#include <kernel-features.h>
Modified: fsf/trunk/libc/nptl/descr.h
==============================================================================
--- fsf/trunk/libc/nptl/descr.h (original)
+++ fsf/trunk/libc/nptl/descr.h Fri Sep 16 00:02:20 2011
@@ -26,6 +26,7 @@
#include <stdbool.h>
#include <sys/types.h>
#include <hp-timing.h>
+#define __need_list_t
#include <list.h>
#include <lowlevellock.h>
#include <pthreaddef.h>
Modified: fsf/trunk/libc/nptl/nptl-init.c
==============================================================================
--- fsf/trunk/libc/nptl/nptl-init.c (original)
+++ fsf/trunk/libc/nptl/nptl-init.c Fri Sep 16 00:02:20 2011
@@ -29,6 +29,7 @@
#include <atomic.h>
#include <ldsodefs.h>
#include <tls.h>
+#include <list.h>
#include <fork.h>
#include <version.h>
#include <shlib-compat.h>
Modified: fsf/trunk/libc/nptl/sysdeps/pthread/list.h
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/pthread/list.h (original)
+++ fsf/trunk/libc/nptl/sysdeps/pthread/list.h Fri Sep 16 00:02:20 2011
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2009, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2002.
@@ -18,27 +18,39 @@
02111-1307 USA. */
#ifndef _LIST_H
-#define _LIST_H 1
+
+#ifndef __need_list_t
+# define _LIST_H 1
+#endif
/* The definitions of this file are adopted from those which can be
found in the Linux kernel headers to enable people familiar with
the latter find their way in these sources as well. */
+#if defined __need_list_t || defined _LIST_H
+# ifndef __list_t_defined
+# define __list_t_defined
/* Basic type for the double-link list. */
typedef struct list_head
{
struct list_head *next;
struct list_head *prev;
} list_t;
+# endif
+# undef __need_list_t
+#endif
+#ifdef _LIST_H
+
+# include <atomic.h>
/* Define a variable with the head and tail of the list. */
-#define LIST_HEAD(name) \
+# define LIST_HEAD(name) \
list_t name = { &(name), &(name) }
/* Initialize a new list head. */
-#define INIT_LIST_HEAD(ptr) \
+# define INIT_LIST_HEAD(ptr) \
(ptr)->next = (ptr)->prev = (ptr)
@@ -49,6 +61,7 @@
newp->next = head->next;
newp->prev = head;
head->next->prev = newp;
+ atomic_write_barrier ();
head->next = newp;
}
@@ -78,26 +91,28 @@
/* Get typed element from list at a given position. */
-#define list_entry(ptr, type, member) \
+# define list_entry(ptr, type, member) \
((type *) ((char *) (ptr) - (unsigned long) (&((type *) 0)->member)))
/* Iterate forward over the elements of the list. */
-#define list_for_each(pos, head) \
+# define list_for_each(pos, head) \
for (pos = (head)->next; pos != (head); pos = pos->next)
/* Iterate forward over the elements of the list. */
-#define list_for_each_prev(pos, head) \
+# define list_for_each_prev(pos, head) \
for (pos = (head)->prev; pos != (head); pos = pos->prev)
/* Iterate backwards over the elements list. The list elements can be
removed from the list while doing this. */
-#define list_for_each_prev_safe(pos, p, head) \
+# define list_for_each_prev_safe(pos, p, head) \
for (pos = (head)->prev, p = pos->prev; \
pos != (head); \
pos = p, p = pos->prev)
+#endif /* _LIST_H */
+
#endif /* list.h */
Modified: fsf/trunk/libc/nptl_db/ChangeLog
==============================================================================
--- fsf/trunk/libc/nptl_db/ChangeLog (original)
+++ fsf/trunk/libc/nptl_db/ChangeLog Fri Sep 16 00:02:20 2011
@@ -1,3 +1,7 @@
+2011-09-15 Andreas Schwab <schwab@xxxxxxxxxx>
+
+ * thread_dbP.h: Include <list.h>
+
2009-08-23 Roland McGrath <roland@xxxxxxxxxx>
* td_ta_map_lwp2thr.c (__td_ta_lookup_th_unique): Move ta_ok check
Modified: fsf/trunk/libc/nptl_db/thread_dbP.h
==============================================================================
--- fsf/trunk/libc/nptl_db/thread_dbP.h (original)
+++ fsf/trunk/libc/nptl_db/thread_dbP.h Fri Sep 16 00:02:20 2011
@@ -1,5 +1,5 @@
/* Private header for thread debug library
- Copyright (C) 2003, 2004, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004, 2007, 2011 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
@@ -29,6 +29,7 @@
#include "proc_service.h"
#include "thread_db.h"
#include "../nptl/pthreadP.h" /* This is for *_BITMASK only. */
+#include <list.h>
/* Indeces for the symbol names. */
enum
Added: fsf/trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_finite.c
==============================================================================
--- fsf/trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_finite.c (added)
+++ fsf/trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_finite.c Fri Sep 16 00:02:20 2011
@@ -1,0 +1,32 @@
+/*
+ * ====================================================
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunPro, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice
+ * is preserved.
+ * ====================================================
+ */
+
+/*
+ * finite(x) returns 1 is x is finite, else 0;
+ * no branching!
+ */
+
+#include "math.h"
+#include "math_private.h"
+
+int
+__finite(double x)
+{
+ int64_t lx;
+ EXTRACT_WORDS64(lx,x);
+ return (int)((uint64_t)((lx&INT64_C(0x7fffffffffffffff))-INT64_C(0x7ff0000000000000))>>63);
+}
+hidden_def (__finite)
+weak_alias (__finite, finite)
+#ifdef NO_LONG_DOUBLE
+strong_alias (__finite, __finitel)
+weak_alias (__finite, finitel)
+#endif
Modified: fsf/trunk/libc/sysdeps/powerpc/fpu/e_hypot.c
==============================================================================
--- fsf/trunk/libc/sysdeps/powerpc/fpu/e_hypot.c (original)
+++ fsf/trunk/libc/sysdeps/powerpc/fpu/e_hypot.c Fri Sep 16 00:02:20 2011
@@ -96,7 +96,7 @@
{
x *= twoM600;
y *= twoM600;
- return sqrt (x * x + y * y) / twoM600;
+ return __ieee754_sqrt (x * x + y * y) / twoM600;
}
if (y < twoM500)
{
@@ -104,14 +104,14 @@
{
x *= two1022;
y *= two1022;
- return sqrt (x * x + y * y) / two1022;
+ return __ieee754_sqrt (x * x + y * y) / two1022;
}
else
{
x *= two600;
y *= two600;
- return sqrt (x * x + y * y) / two600;
+ return __ieee754_sqrt (x * x + y * y) / two600;
}
}
- return sqrt (x * x + y * y);
+ return __ieee754_sqrt (x * x + y * y);
}
Modified: fsf/trunk/libc/sysdeps/powerpc/fpu/e_hypotf.c
==============================================================================
--- fsf/trunk/libc/sysdeps/powerpc/fpu/e_hypotf.c (original)
+++ fsf/trunk/libc/sysdeps/powerpc/fpu/e_hypotf.c Fri Sep 16 00:02:20 2011
@@ -97,7 +97,7 @@
{
x *= twoM60;
y *= twoM60;
- return sqrtf (x * x + y * y) / twoM60;
+ return __ieee754_sqrtf (x * x + y * y) / twoM60;
}
if (y < twoM50)
{
@@ -105,14 +105,14 @@
{
x *= two126;
y *= two126;
- return sqrtf (x * x + y * y) / two126;
+ return __ieee754_sqrtf (x * x + y * y) / two126;
}
else
{
x *= two60;
y *= two60;
- return sqrtf (x * x + y * y) / two60;
+ return __ieee754_sqrtf (x * x + y * y) / two60;
}
}
- return sqrtf (x * x + y * y);
+ return __ieee754_sqrtf (x * x + y * y);
}
Modified: fsf/trunk/libc/sysdeps/powerpc/fpu/e_rem_pio2f.c
==============================================================================
--- fsf/trunk/libc/sysdeps/powerpc/fpu/e_rem_pio2f.c (original)
+++ fsf/trunk/libc/sysdeps/powerpc/fpu/e_rem_pio2f.c Fri Sep 16 00:02:20 2011
@@ -112,7 +112,7 @@
}
if (ax <= pio2_2e7)
{
- n = floorf (ax * invpio2 + half);
+ n = __floorf (ax * invpio2 + half);
i = (int32_t) n;
r = ax - n * pio2_1;
w = n * pio2_1t; /* 1st round good to 40 bit */
@@ -168,11 +168,11 @@
e0 = __float_and8 (ax / 128.0);
z = ax / e0;
- tx[0] = floorf (z);
+ tx[0] = __floorf (z);
z = (z - tx[0]) * two8;
- tx[1] = floorf (z);
+ tx[1] = __floorf (z);
z = (z - tx[1]) * two8;
- tx[2] = floorf (z);
+ tx[2] = __floorf (z);
nx = 3;
while (tx[nx - 1] == zero)
Modified: fsf/trunk/libc/sysdeps/powerpc/fpu/k_rem_pio2f.c
==============================================================================
--- fsf/trunk/libc/sysdeps/powerpc/fpu/k_rem_pio2f.c (original)
+++ fsf/trunk/libc/sysdeps/powerpc/fpu/k_rem_pio2f.c Fri Sep 16 00:02:20 2011
@@ -135,16 +135,16 @@
/* distill q[] into iq[] reversingly */
for (i = 0, j = jz, z = q[jz]; j > 0; i++, j--)
{
- fw = truncf (twon8 * z);
+ fw = __truncf (twon8 * z);
iq[i] = (int32_t) (z - two8 * fw);
z = q[j - 1] + fw;
}
/* compute n */
z = __scalbnf (z, q0); /* actual value of z */
- z -= 8.0 * floorf (z * 0.125); /* trim off integer >= 8 */
+ z -= 8.0 * __floorf (z * 0.125); /* trim off integer >= 8 */
n = (int32_t) z;
- z -= truncf (z);
+ z -= __truncf (z);
ih = 0;
if (q0 > 0)
{ /* need iq[jz-1] to determine n */
@@ -234,7 +234,7 @@
z = __scalbnf (z, -q0);
if (z >= two8)
{
- fw = truncf (twon8 * z);
+ fw = __truncf (twon8 * z);
iq[jz] = (int32_t) (z - two8 * fw);
jz += 1;
q0 += 8;
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/in.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/in.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/in.h Fri Sep 16 00:02:20 2011
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1999, 2000, 2004, 2008, 2010 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2000,2004,2008,2010,2011 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
@@ -70,6 +70,7 @@
#define IP_XFRM_POLICY 17
#define IP_PASSSEC 18
#define IP_TRANSPARENT 19
+#define IP_MULTICAST_ALL 49 /* bool */
/* TProxy original addresses */
#define IP_ORIGDSTADDR 20
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S Fri Sep 16 00:02:20 2011
@@ -33,10 +33,10 @@
cfi_register(%ebx,%ecx); \
LOAD_PIC_REG (bx); \
leal longjmp_msg@GOTOFF(%ebx), %eax; \
- call __GI___fortify_fail@PLT
+ call HIDDEN_JUMPTARGET(__fortify_fail)
#else
# define CALL_FAIL movl $longjmp_msg, %eax; \
- call __fortify_fail
+ call HIDDEN_JUMPTARGET(__fortify_fail)
#endif
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/ia64/____longjmp_chk.S
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/ia64/____longjmp_chk.S (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/ia64/____longjmp_chk.S Fri Sep 16 00:02:20 2011
@@ -30,19 +30,13 @@
#define __longjmp ____longjmp_chk
-#ifdef PIC
-# define CALL_FAIL __GI___fortify_fail
-#else
-# define CALL_FAIL __fortify_fail
-#endif
-
#define CHECK_RSP(reg) \
cmp.ltu p0, p8 = reg, r12; \
(p8) br.cond.dpnt .Lok;; \
addl r28 = @ltoffx(longjmp_msg#), r1;; \
ld8.mov r28 = [r28], longjmp_msg#;; \
ld8 out0 = [r28]; \
- br.call.sptk.many b0 = CALL_FAIL#;; \
+ br.call.sptk.many b0 = HIDDEN_JUMPTARGET(__fortify_fail)#;; \
.Lok:
#include "__longjmp.S"
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S Fri Sep 16 00:02:20 2011
@@ -34,7 +34,7 @@
cfi_remember_state; \
cfi_def_cfa_offset(16); \
leaq longjmp_msg(%rip), %rdi; \
- call __GI___fortify_fail; \
+ call HIDDEN_JUMPTARGET(__fortify_fail); \
nop; \
cfi_restore_state
#else
@@ -42,7 +42,7 @@
cfi_remember_state; \
cfi_def_cfa_offset(16); \
movq $longjmp_msg, %rdi; \
- call __fortify_fail; \
+ call HIDDEN_JUMPTARGET(__fortify_fail); \
nop; \
cfi_restore_state
#endif
Modified: fsf/trunk/libc/sysdeps/x86_64/fpu/bits/mathinline.h
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/fpu/bits/mathinline.h (original)
+++ fsf/trunk/libc/sysdeps/x86_64/fpu/bits/mathinline.h Fri Sep 16 00:02:20 2011
@@ -64,8 +64,11 @@
return (__u.__i[2] & 0x8000) != 0;
}
+#ifdef __USE_ISOC99
+__BEGIN_NAMESPACE_C99
+
/* Round to nearest integer. */
-# if __WORDSIZE == 64 || defined __SSE_MATH__
+# if __WORDSIZE == 64 || defined __SSE_MATH__
__MATH_INLINE long int
__NTH (lrintf (float __x))
{
@@ -73,8 +76,8 @@
asm ("cvtss2si %1, %0" : "=r" (__res) : "xm" (__x));
return __res;
}
-# endif
-# if __WORDSIZE == 64 || defined __SSE2_MATH__
+# endif
+# if __WORDSIZE == 64 || defined __SSE2_MATH__
__MATH_INLINE long int
__NTH (lrint (double __x))
{
@@ -82,8 +85,8 @@
asm ("cvtsd2si %1, %0" : "=r" (__res) : "xm" (__x));
return __res;
}
-# endif
-# if __WORDSIZE == 64
+# endif
+# if __WORDSIZE == 64
__MATH_INLINE long long int
__NTH (llrintf (float __x))
{
@@ -98,6 +101,39 @@
asm ("cvtsd2si %1, %0" : "=r" (__res) : "xm" (__x));
return __res;
}
+# endif
+
+# if __FINITE_MATH_ONLY__ == 1 && (__WORDSIZE == 64 || defined __SSE2_MATH__)
+/* Determine maximum of two values. */
+__MATH_INLINE float
+__NTH (fmaxf (float __x, float __y))
+{
+ asm ("maxss %1, %0" : "+x" (__x) : "xm" (__y));
+ return __x;
+}
+__MATH_INLINE double
+__NTH (fmax (double __x, double __y))
+{
+ asm ("maxsd %1, %0" : "+x" (__x) : "xm" (__y));
+ return __x;
+}
+
+/* Determine minimum of two values. */
+__MATH_INLINE float
+__NTH (fminf (float __x, float __y))
+{
+ asm ("minss %1, %0" : "+x" (__x) : "xm" (__y));
+ return __x;
+}
+__MATH_INLINE double
+__NTH (fmin (double __x, double __y))
+{
+ asm ("minsd %1, %0" : "+x" (__x) : "xm" (__y));
+ return __x;
+}
+# endif
+
+__END_NAMESPACE_C99
# endif
#endif