[Commits] r15746 - in /fsf/trunk/libc: ChangeLog intl/localealias.c locale/findlocale.c sysdeps/i386/i686/multiarch/strcmp-ssse3.S

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Wed Nov  9 00:02:07 2011
New Revision: 15746

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

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/intl/localealias.c
    fsf/trunk/libc/locale/findlocale.c
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcmp-ssse3.S

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Wed Nov  9 00:02:07 2011
@@ -1,3 +1,11 @@
+2011-11-08  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	* locale/findlocale.c (_nl_find_locale): Use __strcasecmp_l.
+	* intl/localealias.c (strcasecmp): Define using __strcasecmp_l.
+
+	* sysdeps/i386/i686/multiarch/strcmp-ssse3.S: Remove unnecessary
+	instructions.
+
 2011-11-07  Andreas Schwab  <schwab@xxxxxxxxxx>
 
 	* libio/genops.c (_IO_flush_all_lockp): Only register cleanup

Modified: fsf/trunk/libc/intl/localealias.c
==============================================================================
--- fsf/trunk/libc/intl/localealias.c (original)
+++ fsf/trunk/libc/intl/localealias.c Wed Nov  9 00:02:07 2011
@@ -1,5 +1,5 @@
 /* Handle aliases for locale names.
-   Copyright (C) 1995-2002, 2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1995-2002, 2003, 2005, 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 @@
 /* Rename the non ANSI C functions.  This is required by the standard
    because some ANSI C functions will require linking with this object
    file and the name space must not be polluted.  */
-# define strcasecmp __strcasecmp
+# define strcasecmp(s1, s2) __strcasecmp_l (s1, s2, _nl_C_locobj_ptr)
 
 # ifndef mempcpy
 #  define mempcpy __mempcpy

Modified: fsf/trunk/libc/locale/findlocale.c
==============================================================================
--- fsf/trunk/libc/locale/findlocale.c (original)
+++ fsf/trunk/libc/locale/findlocale.c Wed Nov  9 00:02:07 2011
@@ -258,7 +258,8 @@
     }
 
   /* Determine whether the user wants transliteration or not.  */
-  if (modifier != NULL && __strcasecmp (modifier, "TRANSLIT") == 0)
+  if (modifier != NULL
+      && __strcasecmp_l (modifier, "TRANSLIT", _nl_C_locobj_ptr) == 0)
     ((struct __locale_data *) locale_file->data)->use_translit = 1;
 
   /* Increment the usage count.  */

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcmp-ssse3.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcmp-ssse3.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcmp-ssse3.S Wed Nov  9 00:02:07 2011
@@ -1,5 +1,5 @@
 /* strcmp with SSSE3
-   Copyright (C) 2010 Free Software Foundation, Inc.
+   Copyright (C) 2010, 2011 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.
 
@@ -2201,8 +2201,6 @@
 	movzbl	15(%eax), %ecx
 	cmpb	%cl, 15(%edx)
 	jne	L(neq)
-	test	%cl, %cl
-	je	L(eq)
 
 	POP	(%ebp)
 	xor	%eax, %eax

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