merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 5633af0..b536611 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -2,6 +2,11 @@
 
        * configure: Regenerate.
 
+2011-12-20  Tristan Gingold  <gingold@adacore.com>
+
+       * aclocal.m4: Assume strncmp works in cross case.
+       * configure: Regenerate
+
 2011-12-19  Andreas Schwab  <schwab@linux-m68k.org>
 
        * configure: Regenerate.

diff --git a/libiberty/aclocal.m4 b/libiberty/aclocal.m4
index a528604..bf8a907 100644 (file)
--- a/libiberty/aclocal.m4
+++ b/libiberty/aclocal.m4
@@ -72,7 +72,7 @@ main ()
   exit (0);
 }
 ], ac_cv_func_strncmp_works=yes, ac_cv_func_strncmp_works=no,
-  ac_cv_func_strncmp_works=no)
+  ac_cv_func_strncmp_works=yes)
 rm -f core core.* *.core])
 if test $ac_cv_func_strncmp_works = no ; then
   AC_LIBOBJ([strncmp])

diff --git a/libiberty/configure b/libiberty/configure
index 9bccb8e..9bdea73 100755 (executable)
--- a/libiberty/configure
+++ b/libiberty/configure
@@ -6824,7 +6824,7 @@ if test "${ac_cv_func_strncmp_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
-  ac_cv_func_strncmp_works=no
+  ac_cv_func_strncmp_works=yes
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */