aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2011-12-20 19:02:08 +0000
committerDJ Delorie <dj@redhat.com>2011-12-20 19:02:08 +0000
commit3fee530e50c58ab07cd3f6802ad6a31744a61005 (patch)
tree435e17661a392cf3283bd58e77ddc9e15ecfa83c
parentc0a512e26627ba94d3b6a0a02d8470c16f81f859 (diff)
downloadfsf-binutils-gdb-3fee530e50c58ab07cd3f6802ad6a31744a61005.zip
fsf-binutils-gdb-3fee530e50c58ab07cd3f6802ad6a31744a61005.tar.gz
fsf-binutils-gdb-3fee530e50c58ab07cd3f6802ad6a31744a61005.tar.bz2
merge from gcc
-rw-r--r--libiberty/ChangeLog5
-rw-r--r--libiberty/aclocal.m42
-rwxr-xr-xlibiberty/configure2
3 files changed, 7 insertions, 2 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 5633af0..b536611 100644
--- 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
--- 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
--- 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. */