[Commits] r20215 - in /branches/eglibc-2_16: ./ libc/ libc/string/ libc/sunrpc/ libc/sysdeps/i386/i686/multiarch/ ports/sysdeps/arm/bits/

[joseph@xxxxxxxxxx]

Author: joseph
Date: Fri Aug 17 19:42:20 2012
New Revision: 20215

Log:
Merge changes between r19921 and r20214 from /fsf/glibc-2_16-branch.

Modified:
    branches/eglibc-2_16/   (props changed)
    branches/eglibc-2_16/libc/ChangeLog
    branches/eglibc-2_16/libc/NEWS
    branches/eglibc-2_16/libc/string/test-strncasecmp.c
    branches/eglibc-2_16/libc/sunrpc/rpc_clntout.c
    branches/eglibc-2_16/libc/sysdeps/i386/i686/multiarch/strcmp-ssse3.S
    branches/eglibc-2_16/ports/sysdeps/arm/bits/predefs.h   (props changed)

Propchange: branches/eglibc-2_16/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 17 19:42:20 2012
@@ -1,2 +1,2 @@
-/fsf/glibc-2_16-branch:19382-19921
+/fsf/glibc-2_16-branch:19382-20214
 /fsf/trunk:15224-19381

Modified: branches/eglibc-2_16/libc/ChangeLog
==============================================================================
--- branches/eglibc-2_16/libc/ChangeLog (original)
+++ branches/eglibc-2_16/libc/ChangeLog Fri Aug 17 19:42:20 2012
@@ -1,3 +1,17 @@
+2012-08-15  Liubov Dmitrieva  <liubov.dmitrieva@xxxxxxxxx>
+
+	[BZ #14195]
+	* sysdeps/i386/i686/multiarch/strcmp-sssse3.S: Fix
+	segmentation fault for a case of two empty input strings.
+	* string/test-strncasecmp.c (check1): Renamed to...
+	(bz12205): ...this.
+	(bz14195): Add new testcase for two empty input strings and N > 0.
+	(test_main): Call new testcase, adapt for renamed function.
+
+2012-07-06  Mike Frysinger  <vapier@xxxxxxxxxx>
+
+	* sunrpc/rpc_clntout.c: Change <rpc/types.h> to "rpc/types.h".
+
 2012-07-16  Andreas Jaeger  <aj@xxxxxxx>
 
 	* po/ru.po: Update from translation team.

Modified: branches/eglibc-2_16/libc/NEWS
==============================================================================
--- branches/eglibc-2_16/libc/NEWS (original)
+++ branches/eglibc-2_16/libc/NEWS Fri Aug 17 19:42:20 2012
@@ -5,6 +5,12 @@
 Please send GNU C library bug reports via <http://sources.redhat.com/bugzilla/>
 using `glibc' in the "product" field.
 
+Version 2.16.1
+
+* The following bugs are resolved with this release:
+
+  14195
+
 Version 2.16
 
 * The following bugs are resolved with this release:

Modified: branches/eglibc-2_16/libc/string/test-strncasecmp.c
==============================================================================
--- branches/eglibc-2_16/libc/string/test-strncasecmp.c (original)
+++ branches/eglibc-2_16/libc/string/test-strncasecmp.c Fri Aug 17 19:42:20 2012
@@ -1,5 +1,5 @@
 /* Test and measure strncasecmp functions.
-   Copyright (C) 1999, 2002, 2003, 2005, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1999-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Jakub Jelinek <jakub@xxxxxxxxxx>, 1999.
 
@@ -251,9 +251,9 @@
     }
 }
 
-
-static void
-check1 (void)
+/* Regression test for BZ #12205 */
+static void
+bz12205 (void)
 {
   static char cp [4096+16] __attribute__ ((aligned(4096)));
   static char gotrel[4096] __attribute__ ((aligned(4096)));
@@ -270,6 +270,15 @@
     check_result (impl, s1, s2, n, exp_result);
 }
 
+/* Regression test for BZ #14195 */
+static void
+bz14195 (void)
+{
+  const char *empty_string  = "";
+  FOR_EACH_IMPL (impl, 0)
+    check_result (impl, empty_string, "", 5, 0);
+}
+
 int
 test_main (void)
 {
@@ -277,7 +286,8 @@
 
   test_init ();
 
-  check1 ();
+  bz12205 ();
+  bz14195 ();
 
   printf ("%23s", "");
   FOR_EACH_IMPL (impl, 0)

Modified: branches/eglibc-2_16/libc/sunrpc/rpc_clntout.c
==============================================================================
--- branches/eglibc-2_16/libc/sunrpc/rpc_clntout.c (original)
+++ branches/eglibc-2_16/libc/sunrpc/rpc_clntout.c Fri Aug 17 19:42:20 2012
@@ -31,7 +31,7 @@
  */
 #include <stdio.h>
 #include <string.h>
-#include <rpc/types.h>
+#include "rpc/types.h"
 #include "rpc_parse.h"
 #include "rpc_util.h"
 #include "proto.h"

Modified: branches/eglibc-2_16/libc/sysdeps/i386/i686/multiarch/strcmp-ssse3.S
==============================================================================
--- branches/eglibc-2_16/libc/sysdeps/i386/i686/multiarch/strcmp-ssse3.S (original)
+++ branches/eglibc-2_16/libc/sysdeps/i386/i686/multiarch/strcmp-ssse3.S Fri Aug 17 19:42:20 2012
@@ -2445,7 +2445,7 @@
 # endif
 	jne	L(neq_sncmp)
 	test	%cl, %cl
-	je	L(eq)
+	je	L(eq_sncmp)
 
 	cmp	$1, REM
 	je	L(eq_sncmp)

Propchange: branches/eglibc-2_16/ports/sysdeps/arm/bits/predefs.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 17 19:42:20 2012
@@ -1,3 +1,3 @@
-/fsf/glibc-2_16-branch/ports/sysdeps/arm/bits/predefs.h:19382-19921
+/fsf/glibc-2_16-branch/ports/sysdeps/arm/bits/predefs.h:19382-20214
 /fsf/trunk/ports/sysdeps/arm/bits/predefs.h:18166-19381
 /fsf/trunk/ports/sysdeps/arm/eabi/bits/predefs.h:15224-17813

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