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

[commits] r14909 - in /fsf/trunk/libc: ./ dirent/ include/ intl/ sysdeps/unix/sysv/linux/i386/ sysdeps/unix/sysv/linux/ia64/sys/ sysde...



Author: eglibc
Date: Fri Aug 12 00:02:25 2011
New Revision: 14909

Log:
Import glibc-mainline for 2011-08-12

Added:
    fsf/trunk/libc/sysdeps/x86_64/l10nflist.c
Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/dirent/scandirat.c
    fsf/trunk/libc/dirent/scandirat64.c
    fsf/trunk/libc/include/dirent.h
    fsf/trunk/libc/intl/l10nflist.c
    fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/scandir64.c
    fsf/trunk/libc/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/sys/ptrace.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Fri Aug 12 00:02:25 2011
@@ -1,3 +1,27 @@
+2011-08-11  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	* intl/l10nflist.c: Allow architecture-specific pop function.
+	* sysdeps/x86_64/l10nflist.c: New file.
+
+	* intl/l10nflist.c (_nl_make_l10nflist): Use locale-independent
+	classification.
+
+2011-08-10  Andreas Schwab  <schwab@xxxxxxxxxx>
+
+	* include/dirent.h: Add libc_hidden_proto for scandirat and
+	scandirat64.  Don't declare __scandirat64.
+	* dirent/scandirat.c: Add libc_hidden_def.
+	* dirent/scandirat64.c (SCANDIRAT): Remove underscores.
+	* sysdeps/unix/sysv/linux/i386/scandir64.c (SCANDIRAT): Likewise.
+
+2011-08-10  David S. Miller  <davem@xxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/ia64/sys/ptrace.h: Add missing comma in
+	enum.
+	* sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h: Likewise.
+	* sysdeps/unix/sysv/linux/s390/sys/ptrace.h: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/sys/ptrace.h: Likewise.
+
 2011-08-09  Ulrich Drepper  <drepper@xxxxxxxxx>
 
 	* Versions.def [libc]: Add GLIBC_2.15.

Modified: fsf/trunk/libc/dirent/scandirat.c
==============================================================================
--- fsf/trunk/libc/dirent/scandirat.c (original)
+++ fsf/trunk/libc/dirent/scandirat.c Fri Aug 12 00:02:25 2011
@@ -141,3 +141,4 @@
 
   return c.cnt;
 }
+libc_hidden_def (SCANDIRAT)

Modified: fsf/trunk/libc/dirent/scandirat64.c
==============================================================================
--- fsf/trunk/libc/dirent/scandirat64.c (original)
+++ fsf/trunk/libc/dirent/scandirat64.c Fri Aug 12 00:02:25 2011
@@ -18,11 +18,9 @@
 
 #include <dirent.h>
 
-#define SCANDIRAT __scandirat64
+#define SCANDIRAT scandirat64
 #define READDIR __readdir64
 #define DIRENT_TYPE struct dirent64
 #define SKIP_SCANDIR_CANCEL 1
 
 #include "scandirat.c"
-
-weak_alias (__scandirat64, scandirat64)

Modified: fsf/trunk/libc/include/dirent.h
==============================================================================
--- fsf/trunk/libc/include/dirent.h (original)
+++ fsf/trunk/libc/include/dirent.h Fri Aug 12 00:02:25 2011
@@ -27,11 +27,6 @@
 			int (*__selector) (__const struct dirent64 *),
 			int (*__cmp) (__const struct dirent64 **,
 				      __const struct dirent64 **));
-extern int __scandirat64 (int __dfd, __const char * __dir,
-			  struct dirent64 *** __namelist,
-			  int (*__selector) (__const struct dirent64 *),
-			  int (*__cmp) (__const struct dirent64 **,
-					__const struct dirent64 **));
 extern __ssize_t __getdents (int __fd, char *__buf, size_t __nbytes)
      internal_function;
 extern __ssize_t __getdents64 (int __fd, char *__buf, size_t __nbytes)
@@ -47,5 +42,7 @@
 extern void __scandir_cancel_handler (void *arg);
 
 libc_hidden_proto (rewinddir)
+libc_hidden_proto (scandirat)
+libc_hidden_proto (scandirat64)
 
 #endif

Modified: fsf/trunk/libc/intl/l10nflist.c
==============================================================================
--- fsf/trunk/libc/intl/l10nflist.c (original)
+++ fsf/trunk/libc/intl/l10nflist.c Fri Aug 12 00:02:25 2011
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-2002, 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2002, 2004, 2005, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxxxxxx>, 1995.
 
@@ -134,7 +134,7 @@
   if (entry)
     {
       if (entry < argz + argz_len)
-        entry = strchr (entry, '\0') + 1;
+	entry = strchr (entry, '\0') + 1;
 
       return entry >= argz + argz_len ? NULL : (char *) entry;
     }
@@ -150,6 +150,7 @@
 
 
 /* Return number of bits set in X.  */
+#ifndef ARCH_POP
 static int pop PARAMS ((int x));
 
 static inline int
@@ -164,6 +165,7 @@
 
   return x;
 }
+#endif
 
 
 struct loaded_l10nfile *
@@ -334,11 +336,11 @@
   size_t cnt;
 
   for (cnt = 0; cnt < name_len; ++cnt)
-    if (isalnum ((unsigned char) codeset[cnt]))
+    if (__isalnum_l ((unsigned char) codeset[cnt], _nl_C_locobj_ptr))
       {
 	++len;
 
-	if (isalpha ((unsigned char) codeset[cnt]))
+	if (__isalpha_l ((unsigned char) codeset[cnt], _nl_C_locobj_ptr))
 	  only_digit = 0;
       }
 
@@ -352,9 +354,9 @@
 	wp = retval;
 
       for (cnt = 0; cnt < name_len; ++cnt)
-	if (isalpha ((unsigned char) codeset[cnt]))
+	if (__isalpha_l ((unsigned char) codeset[cnt], _nl_C_locobj_ptr))
 	  *wp++ = tolower ((unsigned char) codeset[cnt]);
-	else if (isdigit ((unsigned char) codeset[cnt]))
+	else if (__isdigit_l ((unsigned char) codeset[cnt], _nl_C_locobj_ptr))
 	  *wp++ = codeset[cnt];
 
       *wp = '\0';

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/scandir64.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/scandir64.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/scandir64.c Fri Aug 12 00:02:25 2011
@@ -19,7 +19,7 @@
 #include <dirent.h>
 
 #define SCANDIR __scandir64
-#define SCANDIRAT __scandirat64
+#define SCANDIRAT scandirat64
 #define READDIR __readdir64
 #define DIRENT_TYPE struct dirent64
 #define SKIP_SCANDIR_CANCEL 1

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h Fri Aug 12 00:02:25 2011
@@ -108,7 +108,7 @@
 #define PT_GETSIGINFO PTRACE_GETSIGINFO
 
   /* Set new siginfo for process.  */
-  PTRACE_SETSIGINFO = 0x4203
+  PTRACE_SETSIGINFO = 0x4203,
 #define PT_SETSIGINFO PTRACE_SETSIGINFO
 
   /* Get register content.  */

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h Fri Aug 12 00:02:25 2011
@@ -95,7 +95,7 @@
 #define PT_GETSIGINFO PTRACE_GETSIGINFO
 
   /* Set new siginfo for process.  */
-  PTRACE_SETSIGINFO = 0x4203
+  PTRACE_SETSIGINFO = 0x4203,
 #define PT_SETSIGINFO PTRACE_SETSIGINFO
 
   /* Get register content.  */

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/sys/ptrace.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/sys/ptrace.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/sys/ptrace.h Fri Aug 12 00:02:25 2011
@@ -134,7 +134,7 @@
 #define PT_GETSIGINFO PTRACE_GETSIGINFO
 
   /* Set new siginfo for process.  */
-  PTRACE_SETSIGINFO = 0x4203
+  PTRACE_SETSIGINFO = 0x4203,
 #define PT_SETSIGINFO PTRACE_SETSIGINFO
 
   /* Get register content.  */

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h Fri Aug 12 00:02:25 2011
@@ -179,7 +179,7 @@
 #define PT_GETSIGINFO PTRACE_GETSIGINFO
 
   /* Set new siginfo for process.  */
-  PTRACE_SETSIGINFO = 0x4203
+  PTRACE_SETSIGINFO = 0x4203,
 #define PT_SETSIGINFO PTRACE_SETSIGINFO
 
   /* Get register content.  */

Added: fsf/trunk/libc/sysdeps/x86_64/l10nflist.c
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/l10nflist.c (added)
+++ fsf/trunk/libc/sysdeps/x86_64/l10nflist.c Fri Aug 12 00:02:25 2011
@@ -1,0 +1,13 @@
+#ifdef __POPCNT__
+# include <popcntintrin.h>
+
+static inline unsigned int
+pop (unsigned int x)
+{
+  return _mm_popcnt_u32 (x);
+}
+# define ARCH_POP 1
+
+#endif
+
+#include <intl/l10nflist.c>