[commits] r1227 - in /fsf/trunk/libc: ChangeLog nptl/ChangeLog nptl/pthread_join.c nptl/tst-initializers1.c scripts/gen-as-const.awk

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Fri Jan 19 00:01:51 2007
New Revision: 1227

Log:
Import glibc-mainline for 2007-01-19

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/nptl/ChangeLog
    fsf/trunk/libc/nptl/pthread_join.c
    fsf/trunk/libc/nptl/tst-initializers1.c
    fsf/trunk/libc/scripts/gen-as-const.awk

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Fri Jan 19 00:01:51 2007
@@ -1,3 +1,8 @@
+2007-01-18  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* scripts/gen-as-const.awk: Add cast to long to avoid int promotion
+	of values on 64-bit platforms which are too large.
+
 2007-01-12  Steven Munroe  <sjmunroe@xxxxxxxxxx>
 	    Joe Kerian  <jkerian@xxxxxxxxxxxxx>
 

Modified: fsf/trunk/libc/nptl/ChangeLog
==============================================================================
--- fsf/trunk/libc/nptl/ChangeLog (original)
+++ fsf/trunk/libc/nptl/ChangeLog Fri Jan 19 00:01:51 2007
@@ -1,3 +1,10 @@
+2007-01-18  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* tst-initializers1.c: We want to test the initializers as seen
+	outside of libc, so undefined _LIBC.
+
+	* pthread_join.c (cleanup): Avoid warning.
+
 2007-01-17  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/x86_64/lowlevellock.S

Modified: fsf/trunk/libc/nptl/pthread_join.c
==============================================================================
--- fsf/trunk/libc/nptl/pthread_join.c (original)
+++ fsf/trunk/libc/nptl/pthread_join.c Fri Jan 19 00:01:51 2007
@@ -30,8 +30,8 @@
   /* If we already changed the waiter ID, reset it.  The call cannot
      fail for any reason but the thread not having done that yet so
      there is no reason for a loop.  */
-  atomic_compare_and_exchange_bool_acq ((struct pthread **) arg, NULL,
-					THREAD_SELF);
+  (void) atomic_compare_and_exchange_bool_acq ((struct pthread **) arg, NULL,
+					       THREAD_SELF);
 }
 
 

Modified: fsf/trunk/libc/nptl/tst-initializers1.c
==============================================================================
--- fsf/trunk/libc/nptl/tst-initializers1.c (original)
+++ fsf/trunk/libc/nptl/tst-initializers1.c Fri Jan 19 00:01:51 2007
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jakub Jelinek <jakub@xxxxxxxxxx>, 2005.
 
@@ -16,6 +16,9 @@
    License along with the GNU C Library; if not, write to the Free
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
+
+/* We test the code undef conditions outside of glibc.  */
+#undef _LIBC
 
 #include <pthread.h>
 

Modified: fsf/trunk/libc/scripts/gen-as-const.awk
==============================================================================
--- fsf/trunk/libc/scripts/gen-as-const.awk (original)
+++ fsf/trunk/libc/scripts/gen-as-const.awk Fri Jan 19 00:01:51 2007
@@ -38,7 +38,7 @@
   if (test)
     print "  TEST (" name ", \"" FILENAME ":" FNR "\", " $0 ")";
   else
-    printf "asm (\"@@@name@@@%s@@@value@@@%%0@@@end@@@\" : : \"i\" (%s));\n",
+    printf "asm (\"@@@name@@@%s@@@value@@@%%0@@@end@@@\" : : \"i\" ((long) %s));\n",
       name, $0;
 }