From a05c2c752e1b7cfc30f8b857720f61a5dd3c048f Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Tue, 14 Jul 2015 15:22:24 +0000 Subject: [PATCH] Sync toplevel configure with binutils-gdb Sync with binutils-gdb: 2015-05-13 John David Anglin * configure.ac: Disable configuration of GDB for HPUX targets. * configure: Regenerate. 2015-04-01 H.J. Lu * configure.ac: Add --with-system-zlib. * configure: Regenerated. 2015-01-28 James Bowman * configure.ac: Add FT32 support. * configure: Regenerate. 2015-01-12 Anthony Green * configure.ac: Don't disable gprof for moxie. * configure: Rebuild. From-SVN: r225777 --- ChangeLog | 23 +++++++++++++++++++++++ configure | 27 ++++++++++++++++++++++----- configure.ac | 21 ++++++++++++++++----- 3 files changed, 61 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 719fa2d917c..27edb460dbc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,26 @@ +2015-07-14 H.J. Lu + + Sync with binutils-gdb: + 2015-05-13 John David Anglin + + * configure.ac: Disable configuration of GDB for HPUX targets. + * configure: Regenerate. + + 2015-04-01 H.J. Lu + + * configure.ac: Add --with-system-zlib. + * configure: Regenerated. + + 2015-01-28 James Bowman + + * configure.ac: Add FT32 support. + * configure: Regenerate. + + 2015-01-12 Anthony Green + + * configure.ac: Don't disable gprof for moxie. + * configure: Rebuild. + 2015-07-14 H.J. Lu Sync with binutils-gdb: diff --git a/configure b/configure index d7bc62fa9fb..f0609865f6f 100755 --- a/configure +++ b/configure @@ -748,6 +748,7 @@ ospace_frag' ac_user_opts=' enable_option_checking with_build_libsubdir +with_system_zlib enable_as_accelerator_for enable_offload_targets enable_gold @@ -1519,6 +1520,7 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-build-libsubdir=DIR Directory where to find libraries for build system + --with-system-zlib use installed libz --with-mpc=PATH specify prefix directory for installed MPC package. Equivalent to --with-mpc-include=PATH/include plus --with-mpc-lib=PATH/lib @@ -2855,6 +2857,12 @@ if test x$with_gnu_as = xno ; then fi use_included_zlib= + +# Check whether --with-system-zlib was given. +if test "${with_system_zlib+set}" = set; then : + withval=$with_system_zlib; +fi + # Make sure we don't let ZLIB be added if we didn't want it. if test x$with_system_zlib = xyes ; then use_included_zlib=no @@ -3521,6 +3529,9 @@ case "${target}" in rs6000-*-aix*) noconfigdirs="$noconfigdirs ${libgcj}" ;; + ft32-*-*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; *-*-lynxos*) noconfigdirs="$noconfigdirs ${libgcj}" ;; @@ -3754,8 +3765,11 @@ case "${target}" in fr30-*-elf*) noconfigdirs="$noconfigdirs gdb" ;; + ft32-*-*) + noconfigdirs="$noconfigdirs target-rda gprof" + ;; moxie-*-*) - noconfigdirs="$noconfigdirs gprof" + noconfigdirs="$noconfigdirs" ;; h8300*-*-*) noconfigdirs="$noconfigdirs target-libgloss" @@ -3765,6 +3779,12 @@ case "${target}" in ;; hppa1.1-*-osf* | hppa1.1-*-bsd* ) ;; + hppa*64*-*-hpux*) + noconfigdirs="$noconfigdirs gdb" + ;; + hppa*-*-hpux11*) + noconfigdirs="$noconfigdirs gdb ld" + ;; hppa*64*-*-linux*) ;; hppa*-*-linux*) @@ -3774,9 +3794,6 @@ case "${target}" in hppa*-*-openbsd* | \ hppa*64*-*-*) ;; - hppa*-hp-hpux11*) - noconfigdirs="$noconfigdirs ld" - ;; hppa*-*-pro*) ;; hppa*-*-*) @@ -3791,7 +3808,7 @@ case "${target}" in ;; ia64*-**-hpux*) # No ld support yet. - noconfigdirs="$noconfigdirs libgui itcl ld" + noconfigdirs="$noconfigdirs gdb libgui itcl ld" ;; ia64*-*-*vms*) # No ld support yet. diff --git a/configure.ac b/configure.ac index dfc7e75f6d4..603bdf6f9fb 100644 --- a/configure.ac +++ b/configure.ac @@ -245,6 +245,8 @@ if test x$with_gnu_as = xno ; then fi use_included_zlib= +AC_ARG_WITH(system-zlib, +[AS_HELP_STRING([--with-system-zlib], [use installed libz])]) # Make sure we don't let ZLIB be added if we didn't want it. if test x$with_system_zlib = xyes ; then use_included_zlib=no @@ -867,6 +869,9 @@ case "${target}" in rs6000-*-aix*) noconfigdirs="$noconfigdirs ${libgcj}" ;; + ft32-*-*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; *-*-lynxos*) noconfigdirs="$noconfigdirs ${libgcj}" ;; @@ -1100,8 +1105,11 @@ case "${target}" in fr30-*-elf*) noconfigdirs="$noconfigdirs gdb" ;; + ft32-*-*) + noconfigdirs="$noconfigdirs target-rda gprof" + ;; moxie-*-*) - noconfigdirs="$noconfigdirs gprof" + noconfigdirs="$noconfigdirs" ;; h8300*-*-*) noconfigdirs="$noconfigdirs target-libgloss" @@ -1111,6 +1119,12 @@ case "${target}" in ;; hppa1.1-*-osf* | hppa1.1-*-bsd* ) ;; + hppa*64*-*-hpux*) + noconfigdirs="$noconfigdirs gdb" + ;; + hppa*-*-hpux11*) + noconfigdirs="$noconfigdirs gdb ld" + ;; hppa*64*-*-linux*) ;; hppa*-*-linux*) @@ -1120,9 +1134,6 @@ case "${target}" in hppa*-*-openbsd* | \ hppa*64*-*-*) ;; - hppa*-hp-hpux11*) - noconfigdirs="$noconfigdirs ld" - ;; hppa*-*-pro*) ;; hppa*-*-*) @@ -1137,7 +1148,7 @@ case "${target}" in ;; ia64*-**-hpux*) # No ld support yet. - noconfigdirs="$noconfigdirs libgui itcl ld" + noconfigdirs="$noconfigdirs gdb libgui itcl ld" ;; ia64*-*-*vms*) # No ld support yet. -- 2.30.2