From: Thomas Schwinge <thomas@codesourcery.com>
Date: Tue, 10 Jun 2014 09:45:00 +0000 (+0200)
Subject: [PR lto/61334] Declare prototype for strnlen, if needed.
X-Git-Tag: releases/gcc-5.1.0~6991
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=35fa894ae37dc5efdaf05db965e65a0621f5beee;p=thirdparty%2Fgcc.git

[PR lto/61334] Declare prototype for strnlen, if needed.

	include/
	* libiberty.h [defined (HAVE_DECL_STRNLEN) &&
	!HAVE_DECL_STRNLEN] (strnlen): New prototype.
	gcc/
	* configure.ac: Use gcc_AC_CHECK_DECLS to check for strnlen
	prototype.
	* config.in: Regenerate.
	* configure: Likewise.

From-SVN: r211401
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4841582fb5e6..5d55985ce148 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2014-06-10  Thomas Schwinge  <thomas@codesourcery.com>
+
+	PR lto/61334
+	* configure.ac: Use gcc_AC_CHECK_DECLS to check for strnlen
+	prototype.
+	* config.in: Regenerate.
+	* configure: Likewise.
+
 2014-06-10  Jan Hubicka  <hubicka@ucw.cz>
 
 	* ipa-reference.c (is_proper_for_analysis): Exclude addressable and public
diff --git a/gcc/config.in b/gcc/config.in
index fb7bf954db22..0897bd404589 100644
--- a/gcc/config.in
+++ b/gcc/config.in
@@ -888,6 +888,13 @@
 #endif
 
 
+/* Define to 1 if we found a declaration for 'strnlen', otherwise define to 0.
+   */
+#ifndef USED_FOR_TARGET
+#undef HAVE_DECL_STRNLEN
+#endif
+
+
 /* Define to 1 if we found a declaration for 'strsignal', otherwise define to
    0. */
 #ifndef USED_FOR_TARGET
diff --git a/gcc/configure b/gcc/configure
index 6c35041b6a79..9ece2437656a 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -10525,7 +10525,7 @@ CFLAGS="$CFLAGS -I${srcdir} -I${srcdir}/../include $GMPINC"
 saved_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS="$CXXFLAGS -I${srcdir} -I${srcdir}/../include $GMPINC"
 for ac_func in getenv atol asprintf sbrk abort atof getcwd getwd \
-	strsignal strstr stpcpy strverscmp \
+	stpcpy strnlen strsignal strstr strverscmp \
 	errno snprintf vsnprintf vasprintf malloc realloc calloc \
 	free basename getopt clock getpagesize ffs clearerr_unlocked feof_unlocked   ferror_unlocked fflush_unlocked fgetc_unlocked fgets_unlocked   fileno_unlocked fprintf_unlocked fputc_unlocked fputs_unlocked   fread_unlocked fwrite_unlocked getchar_unlocked getc_unlocked   putchar_unlocked putc_unlocked
 do
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 2cec62a7eaea..a1cf90104744 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -1170,7 +1170,7 @@ CFLAGS="$CFLAGS -I${srcdir} -I${srcdir}/../include $GMPINC"
 saved_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS="$CXXFLAGS -I${srcdir} -I${srcdir}/../include $GMPINC"
 gcc_AC_CHECK_DECLS(getenv atol asprintf sbrk abort atof getcwd getwd \
-	strsignal strstr stpcpy strverscmp \
+	stpcpy strnlen strsignal strstr strverscmp \
 	errno snprintf vsnprintf vasprintf malloc realloc calloc \
 	free basename getopt clock getpagesize ffs gcc_UNLOCKED_FUNCS, , ,[
 #include "ansidecl.h"
diff --git a/include/ChangeLog b/include/ChangeLog
index ff33d291e74e..1cda0dc02b11 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-10  Thomas Schwinge  <thomas@codesourcery.com>
+
+	PR lto/61334
+	* libiberty.h [defined (HAVE_DECL_STRNLEN) &&
+	!HAVE_DECL_STRNLEN] (strnlen): New prototype.
+
 2014-05-21  John Marino  <gnugcc@marino.st>
 
 	* liberty.h: Use basename function on DragonFly.
diff --git a/include/libiberty.h b/include/libiberty.h
index 7fd07036b75a..56b8b43cb887 100644
--- a/include/libiberty.h
+++ b/include/libiberty.h
@@ -636,6 +636,10 @@ extern int snprintf (char *, size_t, const char *, ...) ATTRIBUTE_PRINTF_3;
 extern int vsnprintf (char *, size_t, const char *, va_list) ATTRIBUTE_PRINTF(3,0);
 #endif
 
+#if defined (HAVE_DECL_STRNLEN) && !HAVE_DECL_STRNLEN
+extern size_t strnlen (const char *, size_t);
+#endif
+
 #if defined(HAVE_DECL_STRVERSCMP) && !HAVE_DECL_STRVERSCMP
 /* Compare version strings.  */
 extern int strverscmp (const char *, const char *);