Updated to fedora-glibc-20060204T0758

diff --git a/ChangeLog b/ChangeLog
index 1e0e640a40ebc95897b8f691029d01f2ee065d03..c568f7c388c69ffc5749b04dfc23f07a187246a7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,23 +1,34 @@
-2006-02-03  Jakub Jelinek  <jakub@redhat.com>
+2006-02-03  Ulrich Drepper  <drepper@redhat.com>
 
-       * stdlib/bits/stdlib-ldbl.h (qecvt, qfcvt, qgcvt, qecvt_r,
-       qfcvt_r): Guard with #if defined __USE_SVID || defined
-       __USE_XOPEN_EXTENDED.
+       * manual/stdio.texi (Formatted Output Functions): Fix make_message
+       example.  Patch by NIIBE Yutaka <gniibe@m17n.org>.
 
-       * sysdeps/unix/sysv/linux/futimesat.c (futimesat): If
-       file == NULL, use __futimes unconditionally.
+2006-02-03  Roland McGrath  <roland@redhat.com>
 
-       * manual/filesys.texi (futimes): Fix prototype.
+       [BZ #2268]
+       * sysdeps/posix/profil.c (__profil): Use __profile_frequency to choose
+       timer interval, don't assume smallest possible interval is it.
+
+2006-02-03  Jakub Jelinek  <jakub@redhat.com>
+
+       * sysdeps/powerpc/fpu/bits/fenvinline.h (fegetround): Make asm
+       volatile.
+
+       * stdlib/bits/stdlib-ldbl.h (qecvt, qfcvt, qgcvt, qecvt_r, qfcvt_r):
+       Guard with [__USE_SVID || __USE_XOPEN_EXTENDED].
 
-2006-02-02  Jakub Jelinek  <jakub@redhat.com>
+       * math/math.h [__LDBL_COMPAT && __USE_ISOC99] (nexttowardl): New
+       prototype.
 
        * math/math.h (__nldbl_nexttowardf): Put __THROW before
        __attribute__ ((__const__)).
        (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT
        followed by __THROW.
 
-       * math/math.h [__LDBL_COMPAT && __USE_ISOC99] (nexttowardl): New
-       prototype.
+       * sysdeps/unix/sysv/linux/futimesat.c (futimesat): If
+       file == NULL, use __futimes unconditionally.
+
+       * manual/filesys.texi (futimes): Fix prototype.
 
 2006-02-02  Ulrich Drepper  <drepper@redhat.com>
 

diff --git a/fedora/branch.mk b/fedora/branch.mk
index cef0bb059e11bc30e6a6950cb90b8f4e28921909..644327ec67902f7a158f21182c8f978bb969b23f 100644 (file)
--- a/fedora/branch.mk
+++ b/fedora/branch.mk
@@ -3,5 +3,5 @@ glibc-branch := fedora
 glibc-base := HEAD
 DIST_BRANCH := devel
 COLLECTION := dist-fc4
-fedora-sync-date := 2006-02-03 09:32 UTC
-fedora-sync-tag := fedora-glibc-20060203T0932
+fedora-sync-date := 2006-02-04 07:58 UTC
+fedora-sync-tag := fedora-glibc-20060204T0758

diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 9eaa8c6cda33241ae9ead099232242db0ec016bb..5fe6f2da1da11989ea074f09a896969d891daaf3 100644 (file)
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -1,4 +1,4 @@
-%define glibcrelease 35
+%define glibcrelease 36
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define prelinkarches noarch
 %define xenarches i686 athlon
@@ -1240,6 +1240,11 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Sat Feb  4 2006 Jakub Jelinek <jakub@redhat.com> 2.3.90-36
+- update from CVS
+  - fix frequency setting for ITIMER_PROF (BZ #2268)
+  - fix powerpc inline fegetround ()
+
 * Fri Feb  3 2006 Jakub Jelinek <jakub@redhat.com> 2.3.90-35
 - update from CVS
   - handle futimesat (fd, NULL, tvp) as futimes (fd, tvp)

diff --git a/manual/stdio.texi b/manual/stdio.texi
index e4278b7a32f8522b2e457a579995575f28eb3ade..c471209134fee3f4d5db12cad749280337ee778d 100644 (file)
--- a/manual/stdio.texi
+++ b/manual/stdio.texi
@@ -2357,7 +2357,8 @@ make_message (char *name, char *value)
     @{
       /* @r{Reallocate buffer now that we know
          how much space is needed.} */
-      buffer = (char *) xrealloc (buffer, nchars + 1);
+      size = nchars + 1;
+      buffer = (char *) xrealloc (buffer, size);
 
       if (buffer != NULL)
         /* @r{Try again.} */

diff --git a/nptl_db/ChangeLog b/nptl_db/ChangeLog
index 52c8491384705a5fdaf72bad0eaa7e701f2df987..2bb82f488cc23c479d4cd0f9fe4b89cb0e14c366 100644 (file)
--- a/nptl_db/ChangeLog
+++ b/nptl_db/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-03  Roland McGrath  <roland@redhat.com>
+
+       * structs.def: Add a descriptor for pointer.val field of dtv_t.
+       * td_thr_tlsbase.c (td_thr_tlsbase): Extract pointer.val field from
+       DTV slot.
+
 2004-09-09  Roland McGrath  <roland@redhat.com>
 
        * td_ta_map_lwp2thr.c (td_ta_map_lwp2thr): Don't abort if inferior's

diff --git a/nptl_db/structs.def b/nptl_db/structs.def
index b17a628e0a7c13859e0010c5311858461b856f86..823af5cba21a4264f953d83dbe0c19ffdd607d49 100644 (file)
--- a/nptl_db/structs.def
+++ b/nptl_db/structs.def
@@ -1,5 +1,5 @@
 /* List of types and symbols in libpthread examined by libthread_db.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006 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
@@ -74,6 +74,8 @@ DB_STRUCT_FIELD (link_map, l_tls_modid)
 
 #if !defined IS_IN_libpthread || USE_TLS
 DB_STRUCT_ARRAY_FIELD (dtv, dtv)
+# define pointer_val pointer.val /* Field of anonymous struct in dtv_t.  */
+DB_STRUCT_FIELD (dtv_t, pointer_val)
 #endif
 #if !defined IS_IN_libpthread || TLS_TCB_AT_TP
 DB_STRUCT_FIELD (pthread, dtvp)

diff --git a/nptl_db/td_thr_tlsbase.c b/nptl_db/td_thr_tlsbase.c
index c57009a73ca23669891917ba927e623b0631f9e6..aaeda6f3c618eecb93e4928df3e78572f1396393 100644 (file)
--- a/nptl_db/td_thr_tlsbase.c
+++ b/nptl_db/td_thr_tlsbase.c
@@ -1,5 +1,5 @@
 /* Locate TLS data for a thread.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006 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
@@ -25,7 +25,7 @@ td_thr_tlsbase (const td_thrhandle_t *th,
                psaddr_t *base)
 {
   td_err_e err;
-  psaddr_t dtv, dtvptr;
+  psaddr_t dtv, dtvslot, dtvptr;
 
   if (modid < 1)
     return TD_NOTLS;
@@ -35,8 +35,13 @@ td_thr_tlsbase (const td_thrhandle_t *th,
   if (err != TD_OK)
     return err;
 
-  /* Get the corresponding entry in the DTV.  */
-  err = DB_GET_FIELD (dtvptr, th->th_ta_p, dtv, dtv, dtv, modid);
+  /* Find the corresponding entry in the DTV.  */
+  err = DB_GET_FIELD_ADDRESS (dtvslot, th->th_ta_p, dtv, dtv, dtv, modid);
+  if (err != TD_OK)
+    return err;
+
+  /* Extract the TLS block address from that DTV slot.  */
+  err = DB_GET_FIELD (dtvptr, th->th_ta_p, dtvslot, dtv_t, pointer_val, 0);
   if (err != TD_OK)
     return err;
 

diff --git a/sysdeps/posix/profil.c b/sysdeps/posix/profil.c
index f40faee33d1155f2e7a703dee88d5238d4da14cd..281b53bf6a958ed88a46d0be1dcd5a765e8fd6a2 100644 (file)
--- a/sysdeps/posix/profil.c
+++ b/sysdeps/posix/profil.c
@@ -1,5 +1,6 @@
 /* Low-level statistical profiling support function.  Mostly POSIX.1 version.
-   Copyright (C) 1996,97,98,2002, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1996,1997,1998,2002,2004,2005,2006
+       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
@@ -22,6 +23,7 @@
 #include <errno.h>
 #include <signal.h>
 #include <sys/time.h>
+#include <libc-internal.h>
 
 #ifndef SIGPROF
 
@@ -110,7 +112,7 @@ __profil (u_short *sample_buffer, size_t size, size_t offset, u_int scale)
     return -1;
 
   timer.it_value.tv_sec = 0;
-  timer.it_value.tv_usec = 1;
+  timer.it_value.tv_usec = 1000000 / __profile_frequency ();
   timer.it_interval = timer.it_value;
   return __setitimer (ITIMER_PROF, &timer, otimer_ptr);
 }

diff --git a/sysdeps/powerpc/fpu/bits/fenvinline.h b/sysdeps/powerpc/fpu/bits/fenvinline.h
index 552c8c9db7d4e20d55c804008fc8ba2edbbe0f86..f7700a49e78a2d3a4cd536b5ae003584bbbc14d4 100644 (file)
--- a/sysdeps/powerpc/fpu/bits/fenvinline.h
+++ b/sysdeps/powerpc/fpu/bits/fenvinline.h
@@ -1,5 +1,6 @@
 /* Inline floating-point environment handling functions for powerpc.
-   Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2006
+   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
@@ -22,8 +23,9 @@
 /* Inline definition for fegetround.  */
 # define fegetround() \
   (__extension__  ({ int __fegetround_result;                                \
-                    __asm__ ("mcrfs 7,7 ; mfcr %0"                           \
-                            : "=r"(__fegetround_result) : : "cr7");          \
+                    __asm__ __volatile__                                     \
+                      ("mcrfs 7,7 ; mfcr %0"                                 \
+                       : "=r"(__fegetround_result) : : "cr7");               \
                     __fegetround_result & 3; }))
 
 /* The weird 'i#*X' constraints on the following suppress a gcc