[Commits] r15674 - in /fsf/trunk/libc: ChangeLog bits/ioctl-types.h sysdeps/x86_64/multiarch/strcmp-sse42.S sysdeps/x86_64/strcmp.S

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Thu Nov  3 00:02:22 2011
New Revision: 15674

Log:
Import glibc-mainline for 2011-11-03

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/bits/ioctl-types.h
    fsf/trunk/libc/sysdeps/x86_64/multiarch/strcmp-sse42.S
    fsf/trunk/libc/sysdeps/x86_64/strcmp.S

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Thu Nov  3 00:02:22 2011
@@ -1,3 +1,7 @@
+2011-11-02  Samuel Thibault  <samuel.thibault@xxxxxxxxxxxx>
+
+	* bits/ioctl-types.h (_IOT_sgttyb): Set number of chars to 4.
+
 2011-11-01  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
 
 	* include/alloca.h (stackinfo_alloca_round): Define.
@@ -11,6 +15,9 @@
 	* nscd/Makefile (extra-objs): Make recursively expanded.
 
 2011-11-01  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	* sysdeps/x86_64/strcmp.S: Fix test for non-ASCII locales.
+	* sysdeps/x86_64/multiarch/strcmp-sse42.S: Likewise.
 
 	* posix/tst-rfc3484.c: Add missing __free_in6ai dummy function.
 	* posix/tst-rfc3484-2.c: Likewise.

Modified: fsf/trunk/libc/bits/ioctl-types.h
==============================================================================
--- fsf/trunk/libc/bits/ioctl-types.h (original)
+++ fsf/trunk/libc/bits/ioctl-types.h Thu Nov  3 00:02:22 2011
@@ -1,5 +1,5 @@
 /* Structure types for pre-termios terminal ioctls.  Generic Unix version.
-   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1996,1997,2011 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
@@ -64,7 +64,7 @@
 };
 
 #define	_IOT_sgttyb	/* Hurd ioctl type field.  */ \
-  _IOT (_IOTS (char), 6, _IOTS (short int), 1, 0, 0)
+  _IOT (_IOTS (char), 4, _IOTS (short int), 1, 0, 0)
 
 #if defined TIOCGWINSZ || defined TIOCSWINSZ
 /* Type of ARG for TIOCGWINSZ and TIOCSWINSZ requests.  */

Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/strcmp-sse42.S
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/strcmp-sse42.S (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/strcmp-sse42.S Thu Nov  3 00:02:22 2011
@@ -104,7 +104,7 @@
 # else
 	movq	(%rdx), %rax
 # endif
-	testl	$0, LOCALE_DATA_VALUES+_NL_CTYPE_NONASCII_CASE*SIZEOF_VALUES(%rax)
+	testl	$1, LOCALE_DATA_VALUES+_NL_CTYPE_NONASCII_CASE*SIZEOF_VALUES(%rax)
 	jne	__strcasecmp_l_nonascii
 #endif
 #ifdef USE_AS_STRNCASECMP_L
@@ -115,7 +115,7 @@
 # else
 	movq	(%rcx), %rax
 # endif
-	testl	$0, LOCALE_DATA_VALUES+_NL_CTYPE_NONASCII_CASE*SIZEOF_VALUES(%rax)
+	testl	$1, LOCALE_DATA_VALUES+_NL_CTYPE_NONASCII_CASE*SIZEOF_VALUES(%rax)
 	jne	__strncasecmp_l_nonascii
 #endif
 

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 Thu Nov  3 00:02:22 2011
@@ -1,5 +1,5 @@
 /* Highly optimized version for x86-64.
-   Copyright (C) 1999, 2000, 2002, 2003, 2005, 2009, 2010
+   Copyright (C) 1999, 2000, 2002, 2003, 2005, 2009, 2010, 2011
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Based on i686 version contributed by Ulrich Drepper
@@ -157,7 +157,7 @@
 #  else
 	movq	(%rdx), %rax
 #  endif
-	testl	$0, LOCALE_DATA_VALUES+_NL_CTYPE_NONASCII_CASE*SIZEOF_VALUES(%rax)
+	testl	$1, LOCALE_DATA_VALUES+_NL_CTYPE_NONASCII_CASE*SIZEOF_VALUES(%rax)
 	jne	__strcasecmp_l_nonascii
 # elif defined USE_AS_STRNCASECMP_L
 	/* We have to fall back on the C implementation for locales
@@ -167,7 +167,7 @@
 #  else
 	movq	(%rcx), %rax
 #  endif
-	testl	$0, LOCALE_DATA_VALUES+_NL_CTYPE_NONASCII_CASE*SIZEOF_VALUES(%rax)
+	testl	$1, LOCALE_DATA_VALUES+_NL_CTYPE_NONASCII_CASE*SIZEOF_VALUES(%rax)
 	jne	__strncasecmp_l_nonascii
 # endif
 

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits