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.14-431-g10d005f


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  10d005f77f0dfb5b7abaf4e78b875964ceaa7ed4 (commit)
       via  2fa2ae85cadef6af47826dcddfb4e6d8a4c8b5a3 (commit)
      from  fc2ee42abe595bbf6b8bbf0637648ad8b5d4faab (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=10d005f77f0dfb5b7abaf4e78b875964ceaa7ed4

commit 10d005f77f0dfb5b7abaf4e78b875964ceaa7ed4
Author: Ulrich Drepper <drepper@gmail.com>
Date:   Sun Oct 23 16:31:09 2011 -0400

    Remove unnecessary include from x86-32 tls.h

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 7ff2516..7b06763 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,6 +1,10 @@
+2011-10-23  Ulrich Drepper  <drepper@gmail.com>
+
+	* sysdeps/i386/tls.h: Remove #include <list.h>.
+
 2011-10-15  Ulrich Drepper  <drepper@gmail.com>
 
-	* pthread_create.c (start_thread): Ca;; __ctype_init.
+	* pthread_create.c (start_thread): Call __ctype_init.
 
 2011-09-15  Andreas Schwab  <schwab@redhat.com>
 
diff --git a/nptl/sysdeps/i386/tls.h b/nptl/sysdeps/i386/tls.h
index 428f203..3d74338 100644
--- a/nptl/sysdeps/i386/tls.h
+++ b/nptl/sysdeps/i386/tls.h
@@ -26,7 +26,6 @@
 # include <stddef.h>
 # include <stdint.h>
 # include <stdlib.h>
-//# include <list.h>
 # include <sysdep.h>
 # include <kernel-features.h>
 

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

commit 2fa2ae85cadef6af47826dcddfb4e6d8a4c8b5a3
Author: Ulrich Drepper <drepper@gmail.com>
Date:   Sun Oct 23 16:30:40 2011 -0400

    Fix strnlen change

diff --git a/ChangeLog b/ChangeLog
index c538e40..c41dfd8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-10-23  Ulrich Drepper  <drepper@gmail.com>
 
+	* string/strnlen.c: Don't define STRNLEN, reverse logic.
+	Remove unused variable magic_bits.
+	* sysdeps/i386/i686/multiarch/rtld-strnlen.c: New file.
+
 	* string/strnlen.c: Define and use STRNLEN macro.
 	* sysdeps/i386/i686/multiarch/Makefile [string] (sysdep_routines):
 	Add strnlen-sse2, strnlen-c, wcslen-sse2, and wcslen-c.
diff --git a/nptl/sysdeps/i386/tls.h b/nptl/sysdeps/i386/tls.h
index 3f597a9..428f203 100644
--- a/nptl/sysdeps/i386/tls.h
+++ b/nptl/sysdeps/i386/tls.h
@@ -26,7 +26,7 @@
 # include <stddef.h>
 # include <stdint.h>
 # include <stdlib.h>
-# include <list.h>
+//# include <list.h>
 # include <sysdep.h>
 # include <kernel-features.h>
 
diff --git a/string/strnlen.c b/string/strnlen.c
index 3f52c49..d083ec2 100644
--- a/string/strnlen.c
+++ b/string/strnlen.c
@@ -27,16 +27,16 @@
 /* Find the length of S, but scan at most MAXLEN characters.  If no
    '\0' terminator is found in that many characters, return MAXLEN.  */
 
-#ifndef STRNLEN
-# define STRNLEN __strnlen
+#ifdef STRNLEN
+# define __strnlen STRNLEN
 #endif
 
 size_t
-STRNLEN (const char *str, size_t maxlen)
+__strnlen (const char *str, size_t maxlen)
 {
   const char *char_ptr, *end_ptr = str + maxlen;
   const unsigned long int *longword_ptr;
-  unsigned long int longword, magic_bits, himagic, lomagic;
+  unsigned long int longword, himagic, lomagic;
 
   if (maxlen == 0)
     return 0;
@@ -70,14 +70,12 @@ STRNLEN (const char *str, size_t maxlen)
 
      The 1-bits make sure that carries propagate to the next 0-bit.
      The 0-bits provide holes for carries to fall into.  */
-  magic_bits = 0x7efefeffL;
   himagic = 0x80808080L;
   lomagic = 0x01010101L;
   if (sizeof (longword) > 4)
     {
       /* 64-bit version of the magic.  */
       /* Do the shift in two steps to avoid a warning if long has 32 bits.  */
-      magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL;
       himagic = ((himagic << 16) << 16) | himagic;
       lomagic = ((lomagic << 16) << 16) | lomagic;
     }
diff --git a/sysdeps/i386/i686/multiarch/rtld-strnlen.c b/sysdeps/i386/i686/multiarch/rtld-strnlen.c
new file mode 100644
index 0000000..1aa5440
--- /dev/null
+++ b/sysdeps/i386/i686/multiarch/rtld-strnlen.c
@@ -0,0 +1 @@
+#include <string/strnlen.c>

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

Summary of changes:
 ChangeLog                                  |    4 ++++
 nptl/ChangeLog                             |    6 +++++-
 nptl/sysdeps/i386/tls.h                    |    1 -
 string/strnlen.c                           |   10 ++++------
 sysdeps/i386/i686/multiarch/rtld-strnlen.c |    1 +
 5 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 sysdeps/i386/i686/multiarch/rtld-strnlen.c


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]