This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch, master, updated. glibc-2.11-136-g21dfc00


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  21dfc00031ebb523314475a7ed5141eace23404b (commit)
       via  6a7007d7be6dd34fff897a3bf0d22221b895d7d3 (commit)
       via  cd5c5f7051b72c57cf77c03f55f774776a2fd920 (commit)
       via  c589e093e17a46c659a79f09d766f301ef8ef64f (commit)
       via  402cd98775db1478f64c9b0dbe00664b89eb2773 (commit)
      from  35e6599946c142e1685c9dc46cff55e4ae6aac37 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=21dfc00031ebb523314475a7ed5141eace23404b

commit 21dfc00031ebb523314475a7ed5141eace23404b
Merge: 6a7007d 35e6599
Author: Ulrich Drepper <drepper@redhat.com>
Date:   Thu Jan 14 16:25:15 2010 -0800

    Merge branch 'master' of ssh://sources.redhat.com/git/glibc

diff --cc ChangeLog
index a8aa8f1,d6b0ca8..9cd9250
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,15 -1,11 +1,21 @@@
+ 2010-01-14  Ryan S. Arnold  <rsa@us.ibm.com>
+ 
+ 	* Makeconfig (+prector, +postctor, +prectorS, +postctorS): Add
+ 	$(sysdep-LDFLAGS) to pre and post ctors so that the proper .o
+ 	files are found by GCC.
+ 
  2010-01-14  Ulrich Drepper  <drepper@redhat.com>
  
 +	* posix/unistd.h: Relax conditions for ualarm, usleep, getwd, vfork,
 +	brk, and sbrk.
 +
 +	* string/strings.h: Relax condition for bcmp, bcopy, bzero, ffs,
 +	index, and rindex.
 +
 +	* stdlib/stdlib.h: Relax conditions for *cvt functions and valloc.
 +
 +	* Versions.def: Add GLIBC_2.12 for libpthread.
 +
  	[BZ #11126]
  	* malloc/malloc.c (malloc_info): Initialize malloc if not already
  	done.  Handle empty bin lists.

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=6a7007d7be6dd34fff897a3bf0d22221b895d7d3

commit 6a7007d7be6dd34fff897a3bf0d22221b895d7d3
Author: Ulrich Drepper <drepper@redhat.com>
Date:   Thu Jan 14 16:23:47 2010 -0800

    Relax conditions in unistd.h.

diff --git a/ChangeLog b/ChangeLog
index 6a9f5b2..a8aa8f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-01-14  Ulrich Drepper  <drepper@redhat.com>
 
+	* posix/unistd.h: Relax conditions for ualarm, usleep, getwd, vfork,
+	brk, and sbrk.
+
 	* string/strings.h: Relax condition for bcmp, bcopy, bzero, ffs,
 	index, and rindex.
 
diff --git a/posix/unistd.h b/posix/unistd.h
index d134ecf..f8b84e3 100644
--- a/posix/unistd.h
+++ b/posix/unistd.h
@@ -440,8 +440,8 @@ extern unsigned int alarm (unsigned int __seconds) __THROW;
    __THROW.  */
 extern unsigned int sleep (unsigned int __seconds);
 
-#if ((defined __USE_BSD || defined __USE_XOPEN_EXTENDED)	\
-     && !defined __USE_XOPEN2K8) || defined __USE_GNU
+#if (defined __USE_XOPEN_EXTENDED && !defined __USE_XOPEN2K8) \
+    || defined __USE_BSD
 /* Set an alarm to go off (generating a SIGALRM signal) in VALUE
    microseconds.  If INTERVAL is nonzero, when the alarm goes off, the
    timer is reset to go off every INTERVAL microseconds thereafter.
@@ -514,8 +514,8 @@ extern char *getcwd (char *__buf, size_t __size) __THROW __wur;
 extern char *get_current_dir_name (void) __THROW;
 #endif
 
-#if ((defined __USE_BSD || defined __USE_XOPEN_EXTENDED)	\
-     && !defined __USE_XOPEN2K8) || defined __USE_GNU
+#if (defined __USE_XOPEN_EXTENDED && !defined __USE_XOPEN2K8) \
+    || defined __USE_BSD
 /* Put the absolute pathname of the current working directory in BUF.
    If successful, return BUF.  If not, put an error message in
    BUF and return NULL.  BUF should be at least PATH_MAX bytes long.  */
@@ -774,14 +774,14 @@ extern int setresgid (__gid_t __rgid, __gid_t __egid, __gid_t __sgid)
    and the process ID of the new process to the old process.  */
 extern __pid_t fork (void) __THROW;
 
-#if ((defined __USE_BSD || defined __USE_XOPEN_EXTENDED)	\
-     && !defined __USE_XOPEN2K8) || defined __USE_GNU
+#if (defined __USE_XOPEN_EXTENDED && !defined __USE_XOPEN2K8) \
+    || defined __USE_BSD
 /* Clone the calling process, but without copying the whole address space.
    The calling process is suspended until the new process exits or is
    replaced by a call to `execve'.  Return -1 for errors, 0 to the new process,
    and the process ID of the new process to the old process.  */
 extern __pid_t vfork (void) __THROW;
-#endif /* Use BSD. */
+#endif /* Use BSD or XPG < 7. */
 
 
 /* Return the pathname of the terminal FD is open on, or NULL on errors.
@@ -1039,8 +1039,8 @@ extern int ftruncate64 (int __fd, __off64_t __length) __THROW __wur;
 #endif /* Use BSD || X/Open Unix || POSIX 2003.  */
 
 
-#if (defined __USE_MISC || defined __USE_XOPEN_EXTENDED) \
-    && !defined __USE_XOPEN2K
+#if (defined __USE_XOPEN_EXTENDED && !defined __USE_XOPEN2K) \
+    || defined __USE_MISC
 
 /* Set the end of accessible data space (aka "the break") to ADDR.
    Returns zero on success and -1 for errors (with errno set).  */

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=cd5c5f7051b72c57cf77c03f55f774776a2fd920

commit cd5c5f7051b72c57cf77c03f55f774776a2fd920
Author: Ulrich Drepper <drepper@redhat.com>
Date:   Thu Jan 14 16:16:21 2010 -0800

    Relax onditions in strings.h.

diff --git a/ChangeLog b/ChangeLog
index 9b078a0..6a9f5b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-01-14  Ulrich Drepper  <drepper@redhat.com>
 
+	* string/strings.h: Relax condition for bcmp, bcopy, bzero, ffs,
+	index, and rindex.
+
 	* stdlib/stdlib.h: Relax conditions for *cvt functions and valloc.
 
 	* Versions.def: Add GLIBC_2.12 for libpthread.
diff --git a/string/strings.h b/string/strings.h
index a3dde71..2ab83ca 100644
--- a/string/strings.h
+++ b/string/strings.h
@@ -36,7 +36,7 @@
 
 __BEGIN_DECLS
 
-# if !defined __USE_XOPEN2K8 || defined __USE_GNU
+# if defined __USE_MISC || !defined __USE_XOPEN2K8
 /* Compare N bytes of S1 and S2 (same as memcmp).  */
 extern int bcmp (__const void *__s1, __const void *__s2, size_t __n)
      __THROW __attribute_pure__;
@@ -104,7 +104,7 @@ extern char *rindex (__const char *__s, int __c)
 #  endif
 # endif
 
-#if !defined __USE_XOPEN2K8 || defined __USE_XOPEN2K8XSI
+#if defined __USE_MISC || !defined __USE_XOPEN2K8 || defined __USE_XOPEN2K8XSI
 /* Return the position of the first bit set in I, or 0 if none are set.
    The least-significant bit is position 1, the most-significant 32.  */
 extern int ffs (int __i) __THROW __attribute__ ((const));

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=c589e093e17a46c659a79f09d766f301ef8ef64f

commit c589e093e17a46c659a79f09d766f301ef8ef64f
Author: Ulrich Drepper <drepper@redhat.com>
Date:   Thu Jan 14 16:07:58 2010 -0800

    elax some conditions in stdlib.h.

diff --git a/ChangeLog b/ChangeLog
index 518cdc7..9b078a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2010-01-14  Ulrich Drepper  <drepper@redhat.com>
 
+	* stdlib/stdlib.h: Relax conditions for *cvt functions and valloc.
+
 	* Versions.def: Add GLIBC_2.12 for libpthread.
 
 	[BZ #11126]
diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h
index 248aa33..d1f3841 100644
--- a/stdlib/stdlib.h
+++ b/stdlib/stdlib.h
@@ -497,8 +497,8 @@ extern void cfree (void *__ptr) __THROW;
 # include <alloca.h>
 #endif /* Use GNU, BSD, or misc.  */
 
-#if ((defined __USE_BSD || defined __USE_XOPEN_EXTENDED)	\
-     && !defined __USE_XOPEN2K) || defined __USE_GNU
+#if (defined __USE_XOPEN_EXTENDED && !defined __USE_XOPEN2K) \
+    || defined __USE_BSD
 /* Allocate SIZE bytes on a page boundary.  The storage cannot be freed.  */
 extern void *valloc (size_t __size) __THROW __attribute_malloc__ __wur;
 #endif
@@ -797,8 +797,8 @@ __END_NAMESPACE_C99
 #endif
 
 
-#if ((defined __USE_SVID || defined __USE_XOPEN_EXTENDED)	\
-     && !defined __USE_XOPEN2K) || defined __USE_GNU
+#if (defined __USE_XOPEN_EXTENDED && !defined __USE_XOPEN2K) \
+    || defined __USE_SVID
 /* Convert floating point numbers to strings.  The returned values are
    valid only until another call to the same function.  */
 

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=402cd98775db1478f64c9b0dbe00664b89eb2773

commit 402cd98775db1478f64c9b0dbe00664b89eb2773
Author: Ulrich Drepper <drepper@redhat.com>
Date:   Thu Jan 14 15:52:46 2010 -0800

    Actually define pthread_mutex_consistent.

diff --git a/ChangeLog b/ChangeLog
index db85d0c..518cdc7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2010-01-14  Ulrich Drepper  <drepper@redhat.com>
 
+	* Versions.def: Add GLIBC_2.12 for libpthread.
+
 	[BZ #11126]
 	* malloc/malloc.c (malloc_info): Initialize malloc if not already
 	done.  Handle empty bin lists.
diff --git a/Versions.def b/Versions.def
index 70de1c1..eab006b 100644
--- a/Versions.def
+++ b/Versions.def
@@ -91,6 +91,7 @@ libpthread {
   GLIBC_2.4
   GLIBC_2.6
   GLIBC_2.11
+  GLIBC_2.12
   GLIBC_PRIVATE
 }
 libresolv {
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index aa28d82..66f5255 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-14  Ulrich Drepper  <drepper@redhat.com>
+
+	* Versions: Add pthread_mutex_consistent for GLIBC_2.12.
+	* pthread_mutex_consistent.c: Define alias pthread_mutex_consistent.
+
 2010-01-12  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/pthread/pthread.h: Cleanup.  Fix up for XPG7.
diff --git a/nptl/Versions b/nptl/Versions
index 09098bf..dcdd5eb 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -244,6 +244,10 @@ libpthread {
     pthread_sigqueue;
   };
 
+  GLIBC_2.12 {
+    pthread_mutex_consistent;
+  };
+
   GLIBC_PRIVATE {
     __pthread_initialize_minimal;
     __pthread_clock_gettime; __pthread_clock_settime;
diff --git a/nptl/pthread_mutex_consistent.c b/nptl/pthread_mutex_consistent.c
index d4f287b..9ca3e13 100644
--- a/nptl/pthread_mutex_consistent.c
+++ b/nptl/pthread_mutex_consistent.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2005, 2006, 2010 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2005.
 
@@ -22,7 +22,7 @@
 
 
 int
-pthread_mutex_consistent_np (mutex)
+pthread_mutex_consistent (mutex)
      pthread_mutex_t *mutex;
 {
   /* Test whether this is a robust mutex with a dead owner.  */
@@ -34,3 +34,4 @@ pthread_mutex_consistent_np (mutex)
 
   return 0;
 }
+weak_alias (pthread_mutex_consistent, pthread_mutex_consistent_np)

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                       |   10 ++++++++++
 Versions.def                    |    1 +
 nptl/ChangeLog                  |    5 +++++
 nptl/Versions                   |    4 ++++
 nptl/pthread_mutex_consistent.c |    5 +++--
 posix/unistd.h                  |   18 +++++++++---------
 stdlib/stdlib.h                 |    8 ++++----
 string/strings.h                |    4 ++--
 8 files changed, 38 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]