aboutsummaryrefslogtreecommitdiff
path: root/binutils
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2015-08-17 12:01:58 +0930
committerAlan Modra <amodra@gmail.com>2015-08-17 12:07:12 +0930
commit2309f875707215e9b6dfbd9af866f6ead3ccaff5 (patch)
treeb4ea6b6e535ccc259f39b157ef82d6e1c71502d5 /binutils
parent919b75f7e28942fe320dc533759f88131f160bf3 (diff)
downloadgdb-2309f875707215e9b6dfbd9af866f6ead3ccaff5.zip
gdb-2309f875707215e9b6dfbd9af866f6ead3ccaff5.tar.gz
gdb-2309f875707215e9b6dfbd9af866f6ead3ccaff5.tar.bz2
Regen binutils/configure
Looks like previous regen wasn't using current sources. * configure: Regenerate.
Diffstat (limited to 'binutils')
-rw-r--r--binutils/ChangeLog4
-rwxr-xr-xbinutils/configure93
2 files changed, 30 insertions, 67 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index dde51c2..caa0829 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,7 @@
+2015-08-17 Alan Modra <amodra@gmail.com>
+
+ * configure: Regenerate.
+
2015-08-07 Andrew Burgess <andrew.burgess@embecosm.com>
* objcopy.c (is_specified_symbol_predicate): Don't stop at first
diff --git a/binutils/configure b/binutils/configure
index 82572e8..c47d0f8 100755
--- a/binutils/configure
+++ b/binutils/configure
@@ -14135,6 +14135,31 @@ fi
+ am_save_CPPFLAGS="$CPPFLAGS"
+
+ for element in $INCICONV; do
+ haveit=
+ for x in $CPPFLAGS; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X$element"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
+ fi
+ done
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
$as_echo_n "checking for iconv... " >&6; }
if test "${am_cv_func_iconv+set}" = set; then :
@@ -14143,8 +14168,6 @@ else
am_cv_func_iconv="no, consider installing GNU libiconv"
am_cv_lib_iconv=no
- am_save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $INCICONV"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
@@ -14164,49 +14187,8 @@ if ac_fn_c_try_link "$LINENO"; then :
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- CPPFLAGS="$am_save_CPPFLAGS"
-
- if test "$am_cv_func_iconv" != yes && test -d ../libiconv; then
- for _libs in .libs _libs; do
- am_save_CPPFLAGS="$CPPFLAGS"
- am_save_LIBS="$LIBS"
- CPPFLAGS="$CPPFLAGS -I../libiconv/include"
- LIBS="$LIBS ../libiconv/lib/$_libs/libiconv.a"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdlib.h>
-#include <iconv.h>
-int
-main ()
-{
-iconv_t cd = iconv_open("","");
- iconv(cd,NULL,NULL,NULL,NULL);
- iconv_close(cd);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- INCICONV="-I../libiconv/include"
- LIBICONV='${top_builddir}'/../libiconv/lib/$_libs/libiconv.a
- LTLIBICONV='${top_builddir}'/../libiconv/lib/libiconv.la
- am_cv_lib_iconv=yes
- am_cv_func_iconv=yes
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- CPPFLAGS="$am_save_CPPFLAGS"
- LIBS="$am_save_LIBS"
- if test "$am_cv_func_iconv" = "yes"; then
- break
- fi
- done
- fi
-
if test "$am_cv_func_iconv" != yes; then
- am_save_CPPFLAGS="$CPPFLAGS"
am_save_LIBS="$LIBS"
- CPPFLAGS="$LIBS $INCICONV"
LIBS="$LIBS $LIBICONV"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -14228,7 +14210,6 @@ if ac_fn_c_try_link "$LINENO"; then :
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- CPPFLAGS="$am_save_CPPFLAGS"
LIBS="$am_save_LIBS"
fi
@@ -14241,34 +14222,12 @@ $as_echo "#define HAVE_ICONV 1" >>confdefs.h
fi
if test "$am_cv_lib_iconv" = yes; then
-
- for element in $INCICONV; do
- haveit=
- for x in $CPPFLAGS; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X$element"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
- fi
- done
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
$as_echo_n "checking how to link with libiconv... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
$as_echo "$LIBICONV" >&6; }
else
+ CPPFLAGS="$am_save_CPPFLAGS"
LIBICONV=
LTLIBICONV=
fi