diff options
author | 2016-01-11 11:06:56 +0000 | |
---|---|---|
committer | 2016-01-11 11:06:56 +0000 | |
commit | 4849dfd8f454b9c595e6ee7477f6b7b25c31a499 (patch) | |
tree | 4d5110ecdae985a3c259c377a750d4f38fd8180b /configure | |
parent | sim: config: do not try to align settings (diff) | |
download | binutils-gdb-4849dfd8f454b9c595e6ee7477f6b7b25c31a499.tar.gz binutils-gdb-4849dfd8f454b9c595e6ee7477f6b7b25c31a499.tar.bz2 binutils-gdb-4849dfd8f454b9c595e6ee7477f6b7b25c31a499.zip |
Import changes made to files shared with the FSF GCC project.
Import the following changes from the GCC mainline:
2015-11-13 Tsvetkova Alexandra <aleksandra.tsvetkova@intel.com>
* configure.ac: Enable libmpx by default.
* configure: Regenerated.
2015-11-19 Martin Liska <mliska@suse.cz>
* .gitignore: Add .clang-format to ignored files.
* Makefile.tpl: Add clang-format.
* Makefile.in: Regenerate.
2015-12-01 Andreas Tobler <andreast@gcc.gnu.org>
PR libffi/65726
* Makefile.def (lang_env_dependencies): Make libffi depend
on cxx.
* Makefile.in: Regenerate.
2015-12-02 Ian Lance Taylor <iant@google.com>
PR go/66147
* Makefile.tpl (HOST_EXPORTS): Add XGCC_FLAGS_FOR_TARGET.
* Makefile.in: Regenerate.
2015-12-17 Nathan Sidwell <nathan@acm.org>
* config/isl.m4 (ISL_CHECK_VERSION): Add gmp libs.
* configure: Regenerate.
2015-12-17 Sebastian Pop <s.pop@samsung.com>
* Makefile.in: Replace ISL with isl.
* Makefile.tpl: Same.
* config/isl.m4: Same.
* configure.ac: Same.
* contrib/download_prerequisites: Same.
* configure: Regenerate.
2016-01-01 Ben Elliston <bje@gnu.org>
* config.guess: Import version 2016-01-01.
* config.sub: Likewise.
include 2016-01-07 Mike Frysinger <vapier@gentoo.org>
* longlong.h: Change !__SHMEDIA__ to
(!defined (__SHMEDIA__) || !__SHMEDIA__).
Change __SHMEDIA__ to defined (__SHMEDIA__) && __SHMEDIA__.
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/configure b/configure index 3bb1c038ae2..19eb2a4a44a 100755 --- a/configure +++ b/configure @@ -1492,7 +1492,7 @@ Optional Features: build static libjava [default=no] --enable-bootstrap enable bootstrapping [yes if native build] --disable-isl-version-check - disable check for ISL version + disable check for isl version --enable-lto enable link time optimization support --enable-linker-plugin-configure-flags=FLAGS additional flags for configuring linker plugins @@ -1549,12 +1549,12 @@ Optional Packages: --with-boot-libs=LIBS libraries for stage2 and later --with-boot-ldflags=FLAGS linker flags for stage2 and later - --with-isl=PATH Specify prefix directory for the installed ISL + --with-isl=PATH Specify prefix directory for the installed isl package. Equivalent to --with-isl-include=PATH/include plus --with-isl-lib=PATH/lib - --with-isl-include=PATH Specify directory for installed ISL include files - --with-isl-lib=PATH Specify the directory for the installed ISL library + --with-isl-include=PATH Specify directory for installed isl include files + --with-isl-lib=PATH Specify the directory for the installed isl library --with-build-sysroot=SYSROOT use sysroot as the system root during the build --with-debug-prefix-map='A=B C=D ...' @@ -3320,7 +3320,7 @@ fi # Enable libmpx on supported systems by request. if test -d ${srcdir}/libmpx; then - if test x$enable_libmpx = xyes; then + if test x$enable_libmpx = x; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libmpx support" >&5 $as_echo_n "checking for libmpx support... " >&6; } if (srcdir=${srcdir}/libmpx; \ @@ -3334,8 +3334,6 @@ $as_echo "no" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } fi - else - noconfigdirs="$noconfigdirs target-libmpx" fi fi @@ -5945,7 +5943,7 @@ fi -# GCC GRAPHITE dependency ISL. +# GCC GRAPHITE dependency isl. # Basic setup is inlined here, actual checks are in config/isl.m4 @@ -5958,7 +5956,7 @@ fi # Treat --without-isl as a request to disable # GRAPHITE support and skip all following checks. if test "x$with_isl" != "xno"; then - # Check for ISL + # Check for isl # Check whether --with-isl-include was given. @@ -6005,8 +6003,8 @@ fi isllibs='-L$$r/$(HOST_SUBDIR)/isl/'"$lt_cv_objdir"' ' islinc='-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include' ENABLE_ISL_CHECK=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using in-tree ISL, disabling version check" >&5 -$as_echo "$as_me: WARNING: using in-tree ISL, disabling version check" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using in-tree isl, disabling version check" >&5 +$as_echo "$as_me: WARNING: using in-tree isl, disabling version check" >&2;} fi isllibs="${isllibs} -lisl" @@ -6019,18 +6017,18 @@ $as_echo "$as_me: WARNING: using in-tree ISL, disabling version check" >&2;} _isl_saved_LIBS=$LIBS CFLAGS="${_isl_saved_CFLAGS} ${islinc} ${gmpinc}" - LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}" - LIBS="${_isl_saved_LIBS} -lisl" + LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs} ${gmplibs}" + LIBS="${_isl_saved_LIBS} -lisl -lgmp" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compatible ISL" >&5 -$as_echo_n "checking for compatible ISL... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isl 0.15 (or deprecated 0.14)" >&5 +$as_echo_n "checking for isl 0.15 (or deprecated 0.14)... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <isl/val.h> +#include <isl/ctx.h> int main () { -; +isl_ctx_get_max_operations (isl_ctx_alloc ()); ; return 0; } @@ -6045,6 +6043,11 @@ rm -f core conftest.err conftest.$ac_objext \ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_isl" >&5 $as_echo "$gcc_cv_isl" >&6; } + if test "${gcc_cv_isl}" = no ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: recommended isl version is 0.15, minimum required isl version 0.14 is deprecated" >&5 +$as_echo "recommended isl version is 0.15, minimum required isl version 0.14 is deprecated" >&6; } + fi + CFLAGS=$_isl_saved_CFLAGS LDFLAGS=$_isl_saved_LDFLAGS LIBS=$_isl_saved_LIBS @@ -6076,13 +6079,13 @@ $as_echo "$gcc_cv_isl" >&6; } && test "x${isllibs}" = x \ && test "x${islinc}" = x ; then - as_fn_error "Unable to find a usable ISL. See config.log for details." "$LINENO" 5 + as_fn_error "Unable to find a usable isl. See config.log for details." "$LINENO" 5 fi fi -# If the ISL check failed, disable builds of in-tree variant of ISL +# If the isl check failed, disable builds of in-tree variant of isl if test "x$with_isl" = xno || test "x$gcc_cv_isl" = xno; then noconfigdirs="$noconfigdirs isl" |