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

[commits] r11248 - in /fsf/trunk/libc: ./ nptl/ nptl/sysdeps/unix/sysv/linux/i386/ sysdeps/i386/elf/ sysdeps/unix/sysv/linux/i386/ sys...



Author: eglibc
Date: Mon Aug 16 00:03:45 2010
New Revision: 11248

Log:
Import glibc-mainline for 2010-08-16

Added:
    fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/i386/Makefile   (with props)
    fsf/trunk/libc/sysdeps/i386/elf/Makefile   (with props)
Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/nptl/ChangeLog
    fsf/trunk/libc/nptl/tst-attr3.c
    fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/syscalls.list
    fsf/trunk/libc/sysdeps/unix/sysv/linux/sys/fanotify.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list
    fsf/trunk/libc/sysdeps/x86_64/multiarch/strcmp.S
    fsf/trunk/libc/sysdeps/x86_64/strcmp.S

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Mon Aug 16 00:03:45 2010
@@ -1,3 +1,20 @@
+2010-08-12  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	* sysdeps/i386/elf/Makefile: New file.
+
+2010-08-14  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/sys/fanotify.h: Remove third argument
+	from fanotify_init.
+	* sysdeps/unix/sysv/linux/i386/syscalls.list: Likewise.
+	* sysdeps/unix/sysv/linux/wordsize-64/syscalls.list: Likewise.
+
+2010-08-15  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* sysdeps/x86_64/strcmp.S: Use correct register for fourth parameter
+	of strncasecmp_l.
+	* sysdeps/multiarch/strcmp.S: Likewise.
+
 2010-08-14  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* sysdeps/x86_64/Makefile [subdir=string] (sysdep_routines): Add

Modified: fsf/trunk/libc/nptl/ChangeLog
==============================================================================
--- fsf/trunk/libc/nptl/ChangeLog (original)
+++ fsf/trunk/libc/nptl/ChangeLog Mon Aug 16 00:03:45 2010
@@ -1,3 +1,7 @@
+2010-08-12  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	* nptl/sysdeps/unix/sysv/linux/i386/Makefile: New file.
+
 2010-05-01  Alan Modra  <amodra@xxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h

Added: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/i386/Makefile
==============================================================================
Binary file - no diff available.

Propchange: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/i386/Makefile
------------------------------------------------------------------------------
    svn:mime-type = audio/x-669-mod

Modified: fsf/trunk/libc/nptl/tst-attr3.c
==============================================================================
--- fsf/trunk/libc/nptl/tst-attr3.c (original)
+++ fsf/trunk/libc/nptl/tst-attr3.c Mon Aug 16 00:03:45 2010
@@ -1,5 +1,5 @@
 /* pthread_getattr_np test.
-   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2010 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jakub Jelinek <jakub@xxxxxxxxxx>, 2003.
 
@@ -40,10 +40,10 @@
       ap = &a2;
       err = pthread_attr_init (ap);
       if (err)
-        {
-          error (0, err, "pthread_attr_init failed");
-          return tf;
-        }
+	{
+	  error (0, err, "pthread_attr_init failed");
+	  return tf;
+	}
     }
   else
     ap = (pthread_attr_t *) arg;
@@ -353,7 +353,7 @@
 	  result = 1;
 	}
       else if (ret != NULL)
-        result = 1;
+	result = 1;
     }
 
   err = pthread_attr_init (&a);
@@ -379,7 +379,7 @@
 	  result = 1;
 	}
       else if (ret != NULL)
-        result = 1;
+	result = 1;
     }
 
   err = pthread_attr_setguardsize (&a, 16 * sysconf (_SC_PAGESIZE));
@@ -405,7 +405,7 @@
 	  result = 1;
 	}
       else if (ret != NULL)
-        result = 1;
+	result = 1;
     }
 
   err = pthread_attr_destroy (&a);

Added: fsf/trunk/libc/sysdeps/i386/elf/Makefile
==============================================================================
Binary file - no diff available.

Propchange: fsf/trunk/libc/sysdeps/i386/elf/Makefile
------------------------------------------------------------------------------
    svn:mime-type = audio/x-669-mod

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/syscalls.list
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/syscalls.list (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/syscalls.list Mon Aug 16 00:03:45 2010
@@ -9,5 +9,5 @@
 
 prlimit64	EXTRA	prlimit64	i:iipp	prlimit64
 
-fanotify_init	EXTRA	fanotify_init	i:iii	fanotify_init
+fanotify_init	EXTRA	fanotify_init	i:ii	fanotify_init
 fanotify_mark	EXTRA	fanotify_mark	i:iiiiis	fanotify_mark

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/sys/fanotify.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/sys/fanotify.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/sys/fanotify.h Mon Aug 16 00:03:45 2010
@@ -26,8 +26,8 @@
 __BEGIN_DECLS
 
 /* Create and initialize fanotify group.  */
-extern int fanotify_init (unsigned int __flags, unsigned int __event_f_flags,
-			  int __priority) __THROW;
+extern int fanotify_init (unsigned int __flags, unsigned int __event_f_flags)
+  __THROW;
 
 /* Add, remove, or modify an fanotify mark on a filesystem object.  */
 extern int fanotify_mark (int __fanotify_fd, unsigned int __flags,

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list Mon Aug 16 00:03:45 2010
@@ -19,5 +19,5 @@
 open		-	open		Ci:siv	__libc_open	__open open __open64 open64
 prlimit		EXTRA	prlimit64	i:iipp	prlimit		prlimit64
 
-fanotify_init	EXTRA	fanotify_init	i:iii	fanotify_init
+fanotify_init	EXTRA	fanotify_init	i:ii	fanotify_init
 fanotify_mark	EXTRA	fanotify_mark	i:iiiis	fanotify_mark

Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/strcmp.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/strcmp.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/strcmp.S Mon Aug 16 00:03:45 2010
@@ -181,7 +181,7 @@
 # ifdef USE_AS_STRNCASECMP_L
 ENTRY (__strncasecmp_sse42)
 	movq	__libc_tsd_LOCALE@gottpoff(%rip),%rax
-	movq	%fs:(%rax),%r10
+	movq	%fs:(%rax),%rcx
 
 	// XXX 5 byte should be before the function
 	/* 5-byte NOP.  */
@@ -212,9 +212,9 @@
 	/* We have to fall back on the C implementation for locales
 	   with encodings not matching ASCII for single bytes.  */
 #  if LOCALE_T___LOCALES != 0 || LC_CTYPE != 0
-	movq	LOCALE_T___LOCALES+LC_CTYPE*8(%r10), %rax
+	movq	LOCALE_T___LOCALES+LC_CTYPE*8(%rcx), %rax
 #  else
-	movq	(%r10), %rax
+	movq	(%rcx), %rax
 #  endif
 	testl	$0, LOCALE_DATA_VALUES+_NL_CTYPE_NONASCII_CASE*SIZEOF_VALUES(%rax)
 	jne	__strncasecmp_l_nonascii

Modified: fsf/trunk/libc/sysdeps/x86_64/strcmp.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/strcmp.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/strcmp.S Mon Aug 16 00:03:45 2010
@@ -79,7 +79,7 @@
 #else
 # define UPDATE_STRNCMP_COUNTER
 # ifndef STRCMP
-#  define STRCMP strncasecmp
+#  define STRCMP strcmp
 # endif
 #endif
 
@@ -116,7 +116,7 @@
 
 ENTRY2 (__strncasecmp)
 	movq	__libc_tsd_LOCALE@gottpoff(%rip),%rax
-	movq	%fs:(%rax),%r10
+	movq	%fs:(%rax),%rcx
 
 	// XXX 5 byte should be before the function
 	/* 5-byte NOP.  */
@@ -163,9 +163,9 @@
 	/* We have to fall back on the C implementation for locales
 	   with encodings not matching ASCII for single bytes.  */
 #  if LOCALE_T___LOCALES != 0 || LC_CTYPE != 0
-	movq	LOCALE_T___LOCALES+LC_CTYPE*8(%r10), %rax
+	movq	LOCALE_T___LOCALES+LC_CTYPE*8(%rcx), %rax
 #  else
-	movq	(%r10), %rax
+	movq	(%rcx), %rax
 #  endif
 	testl	$0, LOCALE_DATA_VALUES+_NL_CTYPE_NONASCII_CASE*SIZEOF_VALUES(%rax)
 	jne	__strncasecmp_l_nonascii