GNU C Library master sources branch master updated. glibc-2.20-399-g95dee05

[cmetcalf at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  95dee05f17563f737e5a34fde97bdc7fa02a5185 (commit)
      from  0c73b4ea0c5cd6a82e7acace1ae6a6335ca02e2c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=95dee05f17563f737e5a34fde97bdc7fa02a5185

commit 95dee05f17563f737e5a34fde97bdc7fa02a5185
Author: Chris Metcalf <cmetcalf@ezchip.com>
Date:   Fri Dec 19 22:46:52 2014 -0500

    tilegx: fix strstr to build and link better
    
    The two_way_short_needle() routine included from str-two-way.h
    is not used, so mark it so to avoid compiler warnings.
    
    Calling strnlen() breaks linknamespace tests, so change it
    to __strnlen().

diff --git a/ChangeLog b/ChangeLog
index 4c8bcb4..68a8531 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-19  Chris Metcalf  <cmetcalf@ezchip.com>
+
+	* sysdeps/tile/tilegx/strstr.c (STRSTR): Call __strnlen, not
+	strnlen.
+
 2014-12-19  OndÅ?ej Bílka  <neleai@seznam.cz>
 
 	* string/strncat.c (STRNCAT): Simplify implementation.
diff --git a/sysdeps/tile/tilegx/strstr.c b/sysdeps/tile/tilegx/strstr.c
index 3e72789..d04f129 100644
--- a/sysdeps/tile/tilegx/strstr.c
+++ b/sysdeps/tile/tilegx/strstr.c
@@ -27,6 +27,7 @@
   (!memchr ((h) + (h_l), '\0', (j) + (n_l) - (h_l))	\
    && ((h_l) = (j) + (n_l)))
 #include "str-two-way.h"
+typeof(two_way_short_needle) two_way_short_needle __attribute__((unused));
 
 #undef strstr
 
@@ -238,7 +239,7 @@ STRSTR (const char *haystack_start, const char *needle_start)
     }
 
   /* Fail if NEEDLE is longer than HAYSTACK.  */
-  if (strnlen (haystack, needle_len) < needle_len)
+  if (__strnlen (haystack, needle_len) < needle_len)
     return NULL;
 
   /* Perform the search.  Abstract memory is considered to be an array

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                    |    5 +++++
 sysdeps/tile/tilegx/strstr.c |    3 ++-
 2 files changed, 7 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources