[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[commits] r7691 - in /fsf/trunk/libc: ./ localedata/ localedata/locales/ nptl/ nptl/sysdeps/pthread/ nss/nss_files/ sysdeps/unix/sysv/...



Author: eglibc
Date: Fri Jan  9 00:02:09 2009
New Revision: 7691

Log:
Import glibc-mainline for 2009-01-09

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/localedata/ChangeLog
    fsf/trunk/libc/localedata/locales/el_CY
    fsf/trunk/libc/localedata/locales/mt_MT
    fsf/trunk/libc/localedata/locales/sk_SK
    fsf/trunk/libc/nptl/ChangeLog
    fsf/trunk/libc/nptl/sysdeps/pthread/list.h
    fsf/trunk/libc/nss/nss_files/files-parse.c
    fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/resource.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/bits/resource.h

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Fri Jan  9 00:02:09 2009
@@ -1,13 +1,29 @@
+2009-01-08  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	[BZ #9706]
+	* nss/nss_files/files-parse.c (strtou32): New function.
+	(INT_FIELD): Use strotu32 instead of strtoul to unify behavior
+	across 32-bit and 64-bit platforms.
+	(INT_FIELD_MAYBE_NULL): Likewise.
+
+2009-01-08  Jakub Jelinek  <jakub@xxxxxxxxxx>
+
+	[BZ #9720]
+	* sysdeps/unix/sysv/linux/bits/resource.h (enum __rusage_who): Avoid
+	comma after RUSAGE_CHILDREN if not -D_GNU_SOURCE.
+	* sysdeps/unix/sysv/linux/sparc/bits/resource.h (enum __rusage_who):
+	Likewise.
+
 2009-01-05  Paolo Bonzini  <bonzini@xxxxxxx>
 
-	[BZ 697]
+	[BZ #697]
 	* posix/regexec.c (prune_impossible_nodes): Handle sifted_states[0]
 	being NULL also if there are no backreferences.
 	* posix/rxspencer/tests: Add testcases.
 
 2009-01-04  Paolo Bonzini  <bonzini@xxxxxxx>
 
-	[BZ 9697]
+	[BZ #9697]
 	* posix/bug-regex17.c: Add testcases.
 	* posix/regcomp.c (re_compile_fastmap_iter): Rewrite COMPLEX_BRACKET
 	handling.

Modified: fsf/trunk/libc/localedata/ChangeLog
==============================================================================
--- fsf/trunk/libc/localedata/ChangeLog (original)
+++ fsf/trunk/libc/localedata/ChangeLog Fri Jan  9 00:02:09 2009
@@ -1,3 +1,14 @@
+2009-01-08  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	[BZ #9701]
+	* locales/sk_SK: Slovakia uses the Euro.
+
+	[BZ #9704]
+	* locales/mt_MT: Malta uses the Euro.
+
+	[BZ #9705]
+	* locales/el_CY: Cyprus uses the Euro.
+
 2008-12-31  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* locales/iso14651_t1_common: Fix sorting of U+0AB3.

Modified: fsf/trunk/libc/localedata/locales/el_CY
==============================================================================
--- fsf/trunk/libc/localedata/locales/el_CY (original)
+++ fsf/trunk/libc/localedata/locales/el_CY Fri Jan  9 00:02:09 2009
@@ -44,8 +44,8 @@
 END LC_MESSAGES
 
 LC_MONETARY
-int_curr_symbol       "<U0043><U0059><U0050><U0020>"
-currency_symbol       "<U00A3>"
+int_curr_symbol       "<U0045><U0055><U0052><U0020>"
+currency_symbol       "<U20AC>"
 mon_decimal_point     "<U002C>"
 mon_thousands_sep     "<U002E>"
 mon_grouping          3

Modified: fsf/trunk/libc/localedata/locales/mt_MT
==============================================================================
--- fsf/trunk/libc/localedata/locales/mt_MT (original)
+++ fsf/trunk/libc/localedata/locales/mt_MT Fri Jan  9 00:02:09 2009
@@ -131,8 +131,8 @@
 % These are generated based on XML base Locale defintion file
 % for IBM Class for Unicode.
 %
-int_curr_symbol       "<U004D><U0054><U004C><U0020>"
-currency_symbol       "<U004C><U006D>"
+int_curr_symbol       "<U0045><U0055><U0052><U0020>"
+currency_symbol       "<U20AC>"
 mon_decimal_point     "<U002E>"
 mon_thousands_sep     "<U002C>"
 mon_grouping          3
@@ -140,9 +140,9 @@
 negative_sign         "<U002D>"
 int_frac_digits       2
 frac_digits           2
-p_cs_precedes         1
+p_cs_precedes         0
 p_sep_by_space        0
-n_cs_precedes         1
+n_cs_precedes         0
 n_sep_by_space        0
 p_sign_posn           1
 n_sign_posn           0

Modified: fsf/trunk/libc/localedata/locales/sk_SK
==============================================================================
--- fsf/trunk/libc/localedata/locales/sk_SK (original)
+++ fsf/trunk/libc/localedata/locales/sk_SK Fri Jan  9 00:02:09 2009
@@ -91,8 +91,8 @@
 
 LC_MONETARY
 
-int_curr_symbol		"<U0053><U004B><U004B><U0020>"
-currency_symbol		"<U0053><U006B>"
+int_curr_symbol		"<U0045><U0055><U0052><U0020>"
+currency_symbol		"<U20AC>"
 mon_decimal_point	"<U002C>"
 mon_thousands_sep	"<U00A0>"
 mon_grouping      	3;3

Modified: fsf/trunk/libc/nptl/ChangeLog
==============================================================================
--- fsf/trunk/libc/nptl/ChangeLog (original)
+++ fsf/trunk/libc/nptl/ChangeLog Fri Jan  9 00:02:09 2009
@@ -1,3 +1,8 @@
+2009-01-08  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* sysdeps/pthread/list.h (list_add): Initialize new element first.
+	(list_add_tail): Removed.
+
 2009-01-04  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* init.c (__pthread_initialize_minimal_internal): Optimize test

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 Jan  9 00:02:09 2009
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2009 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2002.
 
@@ -46,21 +46,10 @@
 static inline void
 list_add (list_t *newp, list_t *head)
 {
-  head->next->prev = newp;
   newp->next = head->next;
   newp->prev = head;
+  head->next->prev = newp;
   head->next = newp;
-}
-
-
-/* Add new element at the tail of the list.  */
-static inline void
-list_add_tail (list_t *newp, list_t *head)
-{
-  head->prev->next = newp;
-  newp->next = head;
-  newp->prev = head->prev;
-  head->prev = newp;
 }
 
 

Modified: fsf/trunk/libc/nss/nss_files/files-parse.c
==============================================================================
--- fsf/trunk/libc/nss/nss_files/files-parse.c (original)
+++ fsf/trunk/libc/nss/nss_files/files-parse.c Fri Jan  9 00:02:09 2009
@@ -1,5 +1,5 @@
 /* Common code for file-based database parsers in nss_files module.
-   Copyright (C) 1996-2000, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1996-2000, 2003, 2004, 2009 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
@@ -127,10 +127,24 @@
       }									      \
   }
 
+/* Helper function.  */
+static inline uint32_t
+__attribute__ ((always_inline))
+strtou32 (const char *nptr, char **endptr, int base)
+{
+  unsigned long int val = strtoul (nptr, endptr, base);
+
+  /* Match the 32-bit behavior on 64-bit platforms.  */
+  if (sizeof (long int) > 4 && val > 0xffffffff)
+    val = 0xffffffff;
+
+  return val;
+}
+
 # define INT_FIELD(variable, terminator_p, swallow, base, convert)	      \
   {									      \
     char *endp;								      \
-    variable = convert (strtoul (line, &endp, base));			      \
+    variable = convert (strtou32 (line, &endp, base));			      \
     if (endp == line)							      \
       return 0;								      \
     else if (terminator_p (*endp))					      \
@@ -148,7 +162,7 @@
     if (*line == '\0')							      \
       /* We expect some more input, so don't allow the string to end here. */ \
       return 0;								      \
-    variable = convert (strtoul (line, &endp, base));			      \
+    variable = convert (strtou32 (line, &endp, base));			      \
     if (endp == line)							      \
       variable = default;						      \
     if (terminator_p (*endp))						      \

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/resource.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/resource.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/resource.h Fri Jan  9 00:02:09 2009
@@ -1,5 +1,5 @@
 /* Bit values & structures for resource limits.  Linux version.
-   Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2004, 2005
+   Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2004, 2005, 2008, 2009
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -158,10 +158,11 @@
 #define RUSAGE_SELF RUSAGE_SELF
 
   /* All of its terminated child processes.  */
-  RUSAGE_CHILDREN = -1,
+  RUSAGE_CHILDREN = -1
 #define RUSAGE_CHILDREN RUSAGE_CHILDREN
 
 #ifdef __USE_GNU
+  ,
   /* The calling thread.  */
   RUSAGE_THREAD = 1
 # define RUSAGE_THREAD RUSAGE_THREAD

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/bits/resource.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/bits/resource.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/bits/resource.h Fri Jan  9 00:02:09 2009
@@ -1,5 +1,5 @@
 /* Bit values & structures for resource limits.  Linux/SPARC version.
-   Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2004, 2005
+   Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2004, 2005, 2008, 2009
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -174,10 +174,11 @@
 #define RUSAGE_SELF RUSAGE_SELF
 
   /* All of its terminated child processes.  */
-  RUSAGE_CHILDREN = -1,
+  RUSAGE_CHILDREN = -1
 #define RUSAGE_CHILDREN RUSAGE_CHILDREN
 
 #ifdef __USE_GNU
+  ,
   /* The calling thread.  */
   RUSAGE_THREAD = 1
 # define RUSAGE_THREAD RUSAGE_THREAD