From ce3c5eda0b8d664790bc633a1013193a3289dff0 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Sun, 26 Aug 2012 14:34:38 +0000 Subject: Sync toplevel files with GCC tree 2012-08-14 Diego Novillo Merge from cxx-conversion branch. * Makefile.tpl (STAGE[+id+]_CXXFLAGS): Remove POSTSTAGE1_CONFIGURE_FLAGS. * Makefile.in: Regenerate. * configure.ac (ENABLE_BUILD_WITH_CXX): Remove. Update all users. Force C++ when bootstrapping. * configure: Regenerate. 2012-07-06 Richard Guenther * Makefile.def (cloog): Pass $(HOST_GMPINC) and $(HOST_ISLINC) as CPPFLAGS, pass path to built gmp as LDFLAGS, always use --with-gmp=system. * Makefile.in: Regenerated. * configure: Likewise. 2012-07-06 Richard Guenther * configure.ac (extra_isl_gmp_configure_flags): Initialize and subst. * Makefile.def (isl): Use extra_isl_gmp_configure_flags and supply V=1 as extra_make_flags. * configure: Regenerated. * Makefile.in: Likewise. 2012-07-03 Richard Guenther * Makfile.def (isl): Remove not necessary extra_exports and extra_make_flags. (cloog): Use $$CPPFLAGS instead of ${CPPFLAGS}. * Makefile.in: Regenerated. 2012-07-03 Richard Guenther * Makefile.def (cloog): Add V=1 to extra_make_flags. * configure.ac: If either the ISL or the CLooG check failed do not try to build in-tree versions. * Makefile.in: Regenerated. * configure: Regenerated. 2012-07-02 Richard Guenther Michael Matz Tobias Grosser Sebastian Pop * Makefile.def: Add ISL host module, remove PPL host module. Adjust ClooG host module to use the proper ISL. * Makefile.tpl: Pass ISL include flags instead of PPL ones. * configure.ac: Include config/isl.m4. Add ISL host library, remove PPL. Remove PPL configury, add ISL configury, adjust ClooG configury. * Makefile.in: Regenerated. * configure: Likewise. 2012-07-02 Richard Guenther Merge from graphite branch 2011-07-21 Tobias Grosser * configure: Regenerated. * config/cloog.m4: Remove support for CLooG-ppl and CLooG-parma, both cloog.org and legacy versions. The only supported version will be CLooG with the isl backend. 2011-07-21 Tobias Grosser * configure: Regenerated. * configure.ac: Require cloog isl 0.17.0 2011-07-21 Tobias Grosser * configure: Regenerated. * config/cloog.m4: Do not define CLOOG_ORG 2012-06-29 Steven Bosscher * configure.ac: Skip C if explicitly selected. * configure: Regenerate. 2012-06-28 Christophe Lyon * configure.ac (CFLAGS_FOR_TARGET, CXXFLAGS_FOR_TARGET): Make sure they contain -O2. * configure: Regenerate. 2012-06-20 Jason Merrill * Makefile.tpl (check-target-libgomp-c++): New. (check-target-libitm-c++): New. * Makefile.def (c++): Add them. * Makefile.in: Regenerate. 2012-05-16 Olivier Hainque * Makefile.tpl (gcc-no-fixedincludes): Rename into ... (gcc-install-no-fixedincludes): Now forwarder to local target in gcc/ (install-no-fixedincludes): Adjust accordingly. * Makefile.in: Regenerate. 2012-05-09 Nick Clifton Paul Smith PR bootstrap/50461 * configure.ac (mpfr-dir): When using in-tree MPFR sources allow for the fact that from release v3.1.0 of MPFR the source files were moved into a src sub-directory. * configure: Regenerate. 2012-05-07 Janne Blomqvist * configure.ac: Bump minimum MPFR version to 2.4.0. * configure: Regenerated. 2012-05-01 Richard Henderson * Makefile.def (libatomic): New target_module. * configure.ac (target_libraries): Add libatomic. (noconfigdirs): Check if libatomic is supported. * Makefile.in, configure: Rebuild. config/ 2012-08-26 Art Haas * cloog.m4 (CLOOG_INIT_FLAGS): Use = instead of == in test. 2012-07-04 Tristan Gingold * isl.m4 (ISL_CHECK_VERSION): Set to yes if cross-compiling. Fix comments. 2012-07-03 Richard Guenther * cloog.m4: Remove debugging print. 2012-07-03 Rainer Orth * isl.m4 (ISL_CHECK_VERSION): Add -lisl to LIBS, not LDFLAGS. 2012-07-02 Richard Guenther * isl.m4 (_ISL_CHECK_CT_PROG): Omit main function header/footer. Fix version test. 2012-07-02 Richard Guenther Michael Matz Tobias Grosser Sebastian Pop * cloog.m4: Set up to work against ISL only. * isl.m4: New file. --- configure | 708 +++++++++++++++++++++----------------------------------------- 1 file changed, 236 insertions(+), 472 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 6079e6c0751..60e269e00e5 100755 --- a/configure +++ b/configure @@ -556,7 +556,6 @@ enable_option_checking=no ac_subst_vars='LTLIBOBJS LIBOBJS compare_exclusions -POSTSTAGE1_CONFIGURE_FLAGS stage2_werror_flag stage1_checking stage1_cflags @@ -646,12 +645,13 @@ stage1_languages extra_host_libiberty_configure_flags clooginc clooglibs -pplinc -ppllibs +islinc +isllibs poststage1_ldflags poststage1_libs stage1_libs stage1_ldflags +extra_isl_gmp_configure_flags extra_mpc_mpfr_configure_flags extra_mpc_gmp_configure_flags extra_mpfr_configure_flags @@ -752,8 +752,6 @@ enable_libada enable_libssp enable_static_libjava enable_bootstrap -enable_build_with_cxx -enable_build_poststage1_with_cxx with_mpc with_mpc_include with_mpc_lib @@ -770,14 +768,13 @@ with_stage1_ldflags with_stage1_libs with_boot_libs with_boot_ldflags -with_ppl -with_ppl_include -with_ppl_lib -enable_ppl_version_check +with_isl +with_isl_include +with_isl_lib +enable_isl_version_check with_cloog with_cloog_include with_cloog_lib -enable_cloog_backend enable_cloog_version_check enable_lto enable_stage1_languages @@ -1471,14 +1468,8 @@ Optional Features: --enable-static-libjava[=ARG] build static libjava [default=no] --enable-bootstrap enable bootstrapping [yes if native build] - --enable-build-with-cxx build with C++ compiler instead of C compiler - --enable-build-poststage1-with-cxx - build stages 2 and 3 with C++, not C - --disable-ppl-version-check - disable check for PPL version - --enable-cloog-backend[=BACKEND] - set the CLooG BACKEND used to either isl, ppl or - ppl-legacy (default) + --disable-isl-version-check + disable check for ISL version --disable-cloog-version-check disable check for CLooG version --enable-lto enable link time optimization support @@ -1530,12 +1521,12 @@ Optional Packages: --with-boot-libs=LIBS libraries for stage2 and later --with-boot-ldflags=FLAGS linker flags for stage2 and later - --with-ppl=PATH specify prefix directory for the installed PPL + --with-isl=PATH Specify prefix directory for the installed ISL package. Equivalent to - --with-ppl-include=PATH/include plus - --with-ppl-lib=PATH/lib - --with-ppl-include=PATH specify directory for installed PPL include files - --with-ppl-lib=PATH specify directory for the installed PPL library + --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-cloog=PATH Specify prefix directory for the installed CLooG-PPL package. Equivalent to --with-cloog-include=PATH/include plus @@ -1820,6 +1811,48 @@ fi return $ac_retval } # ac_fn_c_try_link + +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + return $ac_retval + +} # ac_fn_c_try_run cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. @@ -2666,7 +2699,7 @@ build_tools="build-texinfo build-flex build-bison build-m4 build-fixincludes" # these libraries are used by various programs built for the host environment # -host_libs="intl libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber gmp mpfr mpc ppl cloog libelf libiconv" +host_libs="intl libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber gmp mpfr mpc isl cloog libelf libiconv" # these tools are built for the host environment # Note, the powerpc-eabi build depends on sim occurring before gdb in order to @@ -2688,6 +2721,7 @@ target_libraries="target-libgcc \ target-libgloss \ target-newlib \ target-libgomp \ + target-libatomic \ target-libitm \ target-libstdc++-v3 \ target-libmudflap \ @@ -2869,7 +2903,7 @@ case "${ENABLE_GOLD}" in *-*-elf* | *-*-sysv4* | *-*-unixware* | *-*-eabi* | hppa*64*-*-hpux* \ | *-*-linux* | frv-*-uclinux* | *-*-irix5* | *-*-irix6* \ | *-*-netbsd* | *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* \ - | *-*-solaris2* | *-*-nto* | *-*-nacl*) + | *-*-solaris2* | *-*-nto*) case "${target}" in *-*-linux*aout* | *-*-linux*oldld*) ;; @@ -3064,6 +3098,25 @@ if test x$enable_libgomp = x ; then esac fi +# Disable libatomic on unsupported systems. +if test -d ${srcdir}/libatomic; then + if test x$enable_libatomic = x; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libatomic support" >&5 +$as_echo_n "checking for libatomic support... " >&6; } + if (srcdir=${srcdir}/libatomic; \ + . ${srcdir}/configure.tgt; \ + test -n "$UNSUPPORTED") + then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + noconfigdirs="$noconfigdirs target-libatomic" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + fi + fi +fi + # Disable libitm on unsupported systems. if test -d ${srcdir}/libitm; then if test x$enable_libitm = x; then @@ -3446,9 +3499,6 @@ case "${target}" in tic54x-*-*) noconfigdirs="$noconfigdirs target-libgloss gdb" ;; - cr16-*-*) - noconfigdirs="$noconfigdirs gdb" - ;; d10v-*-*) noconfigdirs="$noconfigdirs target-libgloss" ;; @@ -3498,7 +3548,8 @@ case "${target}" in noconfigdirs="$noconfigdirs libgui itcl ld" ;; ia64*-*-*vms*) - noconfigdirs="$noconfigdirs libgui itcl" + # No ld support yet. + noconfigdirs="$noconfigdirs libgui itcl ld" ;; i[3456789]86-w64-mingw*) ;; @@ -3662,9 +3713,6 @@ fi *-mingw*) host_makefile_frag="config/mh-mingw" ;; - *-interix*) - host_makefile_frag="config/mh-interix" - ;; hppa*-hp-hpux10*) host_makefile_frag="config/mh-pa-hpux10" ;; @@ -5055,24 +5103,6 @@ $as_echo "$as_me: WARNING: trying to bootstrap a cross compiler" >&2;} ;; esac -# See if we are building gcc with C++. -# Check whether --enable-build-with-cxx was given. -if test "${enable_build_with_cxx+set}" = set; then : - enableval=$enable_build_with_cxx; ENABLE_BUILD_WITH_CXX=$enableval -else - ENABLE_BUILD_WITH_CXX=no -fi - - -# Build stage1 with C and build stages 2 and 3 with C++. -# Check whether --enable-build-poststage1-with-cxx was given. -if test "${enable_build_poststage1_with_cxx+set}" = set; then : - enableval=$enable_build_poststage1_with_cxx; ENABLE_BUILD_POSTSTAGE1_WITH_CXX=$enableval -else - ENABLE_BUILD_POSTSTAGE1_WITH_CXX=yes -fi - - # Used for setting $lt_cv_objdir { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 $as_echo_n "checking for objdir... " >&6; } @@ -5250,6 +5280,7 @@ if test "x$with_gmp$with_gmp_include$with_gmp_lib" = x && test -d ${srcdir}/gmp; gmpinc='-I$$r/$(HOST_SUBDIR)/gmp -I$$s/gmp '"$gmpinc" extra_mpfr_configure_flags='--with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-gmp-lib=$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir" extra_mpc_gmp_configure_flags='--with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-gmp-lib=$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir" + extra_isl_gmp_configure_flags='--with-gmp-builddir=$$r/$(HOST_SUBDIR)/gmp' # Do not test the gmp version. Assume that it is sufficient, since # it is in the source tree, and the library has not been built yet # but it would be included on the link line in the version check below @@ -5327,7 +5358,7 @@ int main () { - #if MPFR_VERSION < MPFR_VERSION_NUM(2,3,1) + #if MPFR_VERSION < MPFR_VERSION_NUM(2,4,0) choke me #endif @@ -5470,7 +5501,7 @@ rm -f core conftest.err conftest.$ac_objext \ # The library versions listed in the error message below should match # the HARD-minimums enforced above. if test x$have_gmp != xyes; then - as_fn_error "Building GCC requires GMP 4.2+, MPFR 2.3.1+ and MPC 0.8.0+. + as_fn_error "Building GCC requires GMP 4.2+, MPFR 2.4.0+ and MPC 0.8.0+. Try the --with-gmp, --with-mpfr and/or --with-mpc options to specify their locations. Source code for these libraries can be found at their respective hosting sites as well as at @@ -5489,6 +5520,7 @@ fi + # Allow host libstdc++ to be specified for static linking with PPL. # Check whether --with-host-libstdcxx was given. @@ -5570,159 +5602,154 @@ fi -# Check for PPL -ppllibs= -pplinc= -pwllib= +# Check for ISL -# Check whether --with-ppl was given. -if test "${with_ppl+set}" = set; then : - withval=$with_ppl; +# Check whether --with-isl was given. +if test "${with_isl+set}" = set; then : + withval=$with_isl; fi -# Check whether --with-ppl-include was given. -if test "${with_ppl_include+set}" = set; then : - withval=$with_ppl_include; +# Check whether --with-isl-include was given. +if test "${with_isl_include+set}" = set; then : + withval=$with_isl_include; fi -# Check whether --with-ppl-lib was given. -if test "${with_ppl_lib+set}" = set; then : - withval=$with_ppl_lib; +# Check whether --with-isl-lib was given. +if test "${with_isl_lib+set}" = set; then : + withval=$with_isl_lib; fi -# Check whether --enable-ppl-version-check was given. -if test "${enable_ppl_version_check+set}" = set; then : - enableval=$enable_ppl_version_check; + # Check whether --enable-isl-version-check was given. +if test "${enable_isl_version_check+set}" = set; then : + enableval=$enable_isl_version_check; ENABLE_ISL_CHECK=$enableval +else + ENABLE_ISL_CHECK=yes fi -case $with_ppl in - yes | no | "") - ;; - *) - ppllibs="-L$with_ppl/lib" - pplinc="-I$with_ppl/include $pplinc" - if test -d "$with_ppl/lib" && test -d "$with_ppl/include"; then - with_ppl=yes - else - as_fn_error "cannot find directories \"$with_ppl/lib\" or \"$with_ppl/include\"" "$LINENO" 5 - fi - ;; -esac + # Initialize isllibs and islinc. + case $with_isl in + no) + isllibs= + islinc= + ;; + "" | yes) + ;; + *) + isllibs="-L$with_isl/lib" + islinc="-I$with_isl/include" + ;; + esac + if test "x${with_isl_include}" != x ; then + islinc="-I$with_isl_include" + fi + if test "x${with_isl_lib}" != x; then + isllibs="-L$with_isl_lib" + fi + if test "x${islinc}" = x && test "x${isllibs}" = x \ + && test -d ${srcdir}/isl; then + isllibs='-L$$r/$(HOST_SUBDIR)/isl/'"$lt_cv_objdir"' ' + islinc='-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include' + ENABLE_ISL_CHECK=no + fi -if test x"$with_ppl_include" != x; then - pplinc="-I$with_ppl_include $pplinc" - with_ppl=yes -fi + isllibs="${isllibs} -lisl" -if test "x$with_ppl_lib" != x; then - ppllibs="-L$with_ppl_lib" - with_ppl=yes -fi -if test x"$with_ppl$with_ppl_include$with_ppl_lib" = x && test -d ${srcdir}/ppl; then - if test x"$enable_watchdog" = xyes; then - pwllib="-lpwl" - fi - ppllibs='-L$$r/$(HOST_SUBDIR)/ppl/interfaces/C/'"$lt_cv_objdir"' -L$$r/$(HOST_SUBDIR)/ppl/src/'"$lt_cv_objdir" - pplinc='-I$$r/$(HOST_SUBDIR)/ppl/src -I$$r/$(HOST_SUBDIR)/ppl/interfaces/C ' - enable_ppl_version_check=no - with_ppl=yes -fi -if test "x$with_ppl" != xno; then - if test "x$pwllib" = x; then - saved_LIBS="$LIBS" - LIBS="$LIBS $ppllibs -lstdc++ -lm" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PWL_handle_timeout in -lpwl" >&5 -$as_echo_n "checking for PWL_handle_timeout in -lpwl... " >&6; } -if test "${ac_cv_lib_pwl_PWL_handle_timeout+set}" = set; then : + + +if test "x$with_isl" != "xno"; then + + if test "${ENABLE_ISL_CHECK}" = yes ; then + _isl_saved_CFLAGS=$CFLAGS + _isl_saved_LDFLAGS=$LDFLAGS + _isl_saved_LIBS=$LIBS + + CFLAGS="${_isl_saved_CFLAGS} ${islinc} ${gmpinc}" + LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}" + LIBS="${_isl_saved_LIBS} -lisl" + echo $CFLAGS + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.10 of ISL" >&5 +$as_echo_n "checking for version 0.10 of ISL... " >&6; } +if test "${gcc_cv_isl+set}" = set; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpwl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test "$cross_compiling" = yes; then : + gcc_cv_isl=yes +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char PWL_handle_timeout (); +#include + #include int main () { -return PWL_handle_timeout (); +if (strncmp (isl_version (), "isl-0.10", strlen ("isl-0.10")) != 0) + return 1; + ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_pwl_PWL_handle_timeout=yes +if ac_fn_c_try_run "$LINENO"; then : + gcc_cv_isl=yes else - ac_cv_lib_pwl_PWL_handle_timeout=no + gcc_cv_isl=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pwl_PWL_handle_timeout" >&5 -$as_echo "$ac_cv_lib_pwl_PWL_handle_timeout" >&6; } -if test "x$ac_cv_lib_pwl_PWL_handle_timeout" = x""yes; then : - pwllib="-lpwl" + fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_isl" >&5 +$as_echo "$gcc_cv_isl" >&6; } - LIBS="$saved_LIBS" + CFLAGS=$_isl_saved_CFLAGS + LDFLAGS=$_isl_saved_LDFLAGS + LIBS=$_isl_saved_LIBS fi - ppllibs="$ppllibs -lppl_c -lppl $pwllib -lgmpxx" - if test "$enable_ppl_version_check" != no; then - saved_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $pplinc $gmpinc" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.11 (revision 0 or later) of PPL" >&5 -$as_echo_n "checking for version 0.11 (revision 0 or later) of PPL... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include "ppl_c.h" -int -main () -{ - #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 11 - choke me - #endif - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; }; ppllibs= ; pplinc= ; with_ppl=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CFLAGS="$saved_CFLAGS" + + + + if test "x${with_isl}" = xno; then + graphite_requested=no + elif test "x${with_isl}" != x \ + || test "x${with_isl_include}" != x \ + || test "x${with_isl_lib}" != x ; then + graphite_requested=yes + else + graphite_requested=no fi -fi -# Flags needed for PPL + if test "${gcc_cv_isl}" = no ; then + isllibs= + islinc= + fi + if test "${graphite_requested}" = yes \ + && test "x${isllibs}" = x \ + && test "x${islinc}" = x ; then -# Check for CLOOG + as_fn_error "Unable to find a usable ISL. See config.log for details." "$LINENO" 5 + fi +fi + +# Check for CLOOG + # Check whether --with-cloog was given. if test "${with_cloog+set}" = set; then : @@ -5742,19 +5769,6 @@ if test "${with_cloog_lib+set}" = set; then : fi - # Check whether --enable-cloog-backend was given. -if test "${enable_cloog_backend+set}" = set; then : - enableval=$enable_cloog_backend; if test "x${enableval}" = "xisl"; then - cloog_backend=isl - elif test "x${enableval}" = "xppl"; then - cloog_backend=ppl - else - cloog_backend=ppl-legacy - fi -else - cloog_backend=ppl-legacy -fi - # Check whether --enable-cloog-version-check was given. if test "${enable_cloog_version_check+set}" = set; then : enableval=$enable_cloog_version_check; ENABLE_CLOOG_CHECK=$enableval @@ -5782,179 +5796,23 @@ fi if test "x${with_cloog_lib}" != x; then clooglibs="-L$with_cloog_lib" fi - - - - - -if test "x$with_ppl" = "xno"; then - - - - if test "x${with_cloog}" = xno; then - graphite_requested=no - elif test "x${with_cloog}" != x \ - || test "x${with_cloog_include}" != x \ - || test "x${with_cloog_lib}" != x ; then - graphite_requested=yes - else - graphite_requested=no + if test "x${clooginc}" = x && test "x${clooglibs}" = x \ + && test -d ${srcdir}/cloog; then + clooglibs='-L$$r/$(HOST_SUBDIR)/cloog/'"$lt_cv_objdir"' ' + clooginc='-I$$r/$(HOST_SUBDIR)/cloog/include -I$$s/cloog/include -I'${srcdir}'/cloog/include ' fi + clooginc="-DCLOOG_INT_GMP ${clooginc}" + clooglibs="${clooglibs} -lcloog-isl ${isllibs}" - if test "${graphite_requested}" = yes; then - as_fn_error "Unable to find a usable PPL. See config.log for details." "$LINENO" 5 - fi - with_cloog=no -fi -if test "x${with_cloog}" = x && test "x${with_cloog_include}" = x \ - && test "x${with_cloog_lib}" = x && test -d ${srcdir}/cloog; then - clooglibs='-L$$r/$(HOST_SUBDIR)/cloog/'"$lt_cv_objdir"' ' - clooginc='-I$$r/$(HOST_SUBDIR)/cloog/include -I$$s/cloog/include ' -fi -if test "x$with_cloog" != "xno"; then - - - - _cloog_saved_CFLAGS=$CFLAGS - _cloog_saved_CPPFLAGS=$CPPFLAGS - _cloog_saved_LDFLAGS=$LDFLAGS - _cloog_saved_LIBS=$LIBS - - _cloogorginc="-DCLOOG_INT_GMP -DCLOOG_ORG" - - CFLAGS="${CFLAGS} ${clooginc} ${gmpinc}" - CPPFLAGS="${CPPFLAGS} ${_cloogorginc}" - LDFLAGS="${LDFLAGS} ${clooglibs}" - - case $cloog_backend in - "ppl-legacy") - CFLAGS="${CFLAGS} ${pplinc}" - LDFLAGS="${LDFLAGS} ${ppllibs}" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for installed CLooG PPL Legacy" >&5 -$as_echo_n "checking for installed CLooG PPL Legacy... " >&6; } -if test "${gcc_cv_cloog_type+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - LIBS="-lcloog ${_cloog_saved_LIBS}" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include "cloog/cloog.h" -int -main () -{ -#ifndef CLOOG_PPL_BACKEND - choke me - #endif - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - gcc_cv_cloog_type="PPL Legacy" -else - gcc_cv_cloog_type=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog_type" >&5 -$as_echo "$gcc_cv_cloog_type" >&6; } - ;; - "isl") - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for installed CLooG ISL" >&5 -$as_echo_n "checking for installed CLooG ISL... " >&6; } -if test "${gcc_cv_cloog_type+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - LIBS="-lcloog-isl ${_cloog_saved_LIBS}" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include "cloog/cloog.h" -int -main () -{ -cloog_version () - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - gcc_cv_cloog_type="ISL" -else - gcc_cv_cloog_type=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog_type" >&5 -$as_echo "$gcc_cv_cloog_type" >&6; } - ;; - "ppl") - CFLAGS="${CFLAGS} ${pplinc}" - LDFLAGS="${LDFLAGS} ${ppllibs}" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for installed CLooG PPL" >&5 -$as_echo_n "checking for installed CLooG PPL... " >&6; } -if test "${gcc_cv_cloog_type+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - LIBS="-lcloog-ppl ${_cloog_saved_LIBS}" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include "cloog/cloog.h" - #include "cloog/ppl/cloog.h" -int -main () -{ -cloog_version () - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - gcc_cv_cloog_type="PPL" -else - gcc_cv_cloog_type=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog_type" >&5 -$as_echo "$gcc_cv_cloog_type" >&6; } - ;; - *) - gcc_cv_cloog_type="" - esac - case $gcc_cv_cloog_type in - "PPL Legacy") - clooginc="${clooginc}" - clooglibs="${clooglibs} -lcloog" - cloog_org=no - ;; - "ISL") - clooginc="${clooginc} ${_cloogorginc}" - clooglibs="${clooglibs} -lcloog-isl -lisl" - cloog_org=yes - ;; - "PPL") - clooginc="${clooginc} ${_cloogorginc}" - clooglibs="${clooglibs} -lcloog-ppl" - cloog_org=yes - ;; - *) - clooglibs= - clooginc= - cloog_org= - ;; - esac - LIBS=$_cloog_saved_LIBS - CFLAGS=$_cloog_saved_CFLAGS - CPPFLAGS=$_cloog_saved_CPPFLAGS - LDFLAGS=$_cloog_saved_LDFLAGS +if test "x$isllibs" = x && test "x$islinc" = x; then + clooglibs= + clooginc= +elif test "x$with_cloog" != "xno"; then @@ -5962,24 +5820,23 @@ $as_echo "$gcc_cv_cloog_type" >&6; } _cloog_saved_CFLAGS=$CFLAGS _cloog_saved_LDFLAGS=$LDFLAGS - CFLAGS="${_cloog_saved_CFLAGS} ${clooginc} ${pplinc} ${gmpinc}" - LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}" + CFLAGS="${_cloog_saved_CFLAGS} ${clooginc} ${islinc} ${gmpinc}" + LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${isllibs} ${gmplib}" - if test "${cloog_org}" = yes ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5 -$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; } -if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17.0 of CLooG" >&5 +$as_echo_n "checking for version 0.17.0 of CLooG... " >&6; } +if test "${gcc_cv_cloog+set}" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include "cloog/cloog.h" +#include "cloog/version.h" int main () { #if CLOOG_VERSION_MAJOR != 0 \ - || CLOOG_VERSION_MINOR != 16 \ - || CLOOG_VERSION_REVISION < 1 + || CLOOG_VERSION_MINOR != 17 \ + || CLOOG_VERSION_REVISION < 0 choke me #endif ; @@ -5987,65 +5844,14 @@ main () } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - gcc_cv_cloog_ct_0_14_0=yes + gcc_cv_cloog=yes else - gcc_cv_cloog_ct_0_14_0=no + gcc_cv_cloog=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog_ct_0_14_0" >&5 -$as_echo "$gcc_cv_cloog_ct_0_14_0" >&6; } - elif test "${cloog_org}" = no ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.15.5 (or later revision) of CLooG" >&5 -$as_echo_n "checking for version 0.15.5 (or later revision) of CLooG... " >&6; } -if test "${gcc_cv_cloog_ct_0_15_5+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include "cloog/cloog.h" -int -main () -{ -#if CLOOG_VERSION_MAJOR != 0 \ - || CLOOG_VERSION_MINOR != 15 \ - || CLOOG_VERSION_REVISION < 5 - choke me - #endif - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include "cloog/cloog.h" -int -main () -{ -#if CLOOG_VERSION_MAJOR != 0 \ - || CLOOG_VERSION_MINOR != 15 \ - || CLOOG_VERSION_REVISION < 9 - choke me - #endif - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gcc_cv_cloog_ct_0_15_5=yes -else - gcc_cv_cloog_ct_0_15_5="buggy but acceptable" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - gcc_cv_cloog_ct_0_15_5=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog_ct_0_15_5" >&5 -$as_echo "$gcc_cv_cloog_ct_0_15_5" >&6; } - fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog" >&5 +$as_echo "$gcc_cv_cloog" >&6; } CFLAGS=$_cloog_saved_CFLAGS LDFLAGS=$_cloog_saved_LDFLAGS @@ -6069,9 +5875,7 @@ $as_echo "$gcc_cv_cloog_ct_0_15_5" >&6; } - if test "${gcc_cv_cloog_ct_0_14_0}" = no \ - || test "${gcc_cv_cloog_rt_0_14_0}" = no \ - || test "${gcc_cv_cloog_ct_0_15_5}" = no; then + if test "${gcc_cv_cloog}" = no ; then clooglibs= clooginc= fi @@ -6086,6 +5890,12 @@ $as_echo "$gcc_cv_cloog_ct_0_15_5" >&6; } fi +# If either the ISL or the CLooG check failed, disable builds of in-tree +# variants of both +if test "x$clooglibs" = x && test "x$clooginc" = x; then + noconfigdirs="$noconfigdirs cloog isl" +fi + # Check for LTO support. # Check whether --enable-lto was given. if test "${enable_lto+set}" = set; then : @@ -6146,7 +5956,7 @@ fi -# By default, C is the only stage 1 language. +# By default, C and C++ are the only stage 1 languages. stage1_languages=,c, # Target libraries that we bootstrap. @@ -6184,15 +5994,14 @@ if test -d ${srcdir}/gcc; then ;; esac - # If bootstrapping, then using --enable-build-with-cxx or - # --enable-build-poststage1-with-cxx requires enabling C++. - case ",$enable_languages,:,$ENABLE_BUILD_WITH_CXX,$ENABLE_BUILD_POSTSTAGE1_WITH_CXX,:$enable_bootstrap" in - *,c++,*:*:*) ;; - *:*,yes,*:yes) + # If bootstrapping, C++ must be enabled. + case ",$enable_languages,:$enable_bootstrap" in + *,c++,*:*) ;; + *:yes) if test -f ${srcdir}/gcc/cp/config-lang.in; then enable_languages="${enable_languages},c++" else - as_fn_error "bootstrapping with --enable-build-with-cxx or --enable-build-poststage1-with-cxx requires c++ sources" "$LINENO" 5 + as_fn_error "bootstrapping requires c++ sources" "$LINENO" 5 fi ;; esac @@ -6287,16 +6096,16 @@ if test -d ${srcdir}/gcc; then fi if test "$language" = "c++"; then - if test "$ENABLE_BUILD_WITH_CXX" = "yes" \ - || test "$ENABLE_BUILD_POSTSTAGE1_WITH_CXX" = "yes"; then - boot_language=yes - fi + boot_language=yes fi case ,${enable_languages}, in *,${language},*) - # Language was explicitly selected; include it. - add_this_lang=yes + # Language was explicitly selected; include it + # unless it is C, which is enabled by default. + if test "$language" != "c"; then + add_this_lang=yes + fi ;; *,all,*) # 'all' was selected, select it if it is a default language @@ -6472,6 +6281,14 @@ case ,${enable_languages},:${enable_objc_gc} in ;; esac +# Disable libitm if we're not building C++ +case ,${enable_languages}, in + *,c++,*) ;; + *) + noconfigdirs="$noconfigdirs target-libitm" + ;; +esac + # Remove the entries in $skipdirs and $noconfigdirs from $configdirs, # $build_configdirs and $target_configdirs. # If we have the source for $noconfigdirs entries, add them to $notsupp. @@ -6838,10 +6655,6 @@ case "${target}" in extra_arflags_for_target=" -X32_64" extra_nmflags_for_target=" -B -X32_64" ;; - *-*-darwin[3-9]*) - # ranlib before Darwin10 requires the -c flag to look at common symbols. - extra_ranlibflags_for_target=" -c" - ;; esac alphaieee_frag=/dev/null @@ -7211,7 +7024,7 @@ do case $lib in - mpc | mpfr | gmp | ppl | cloog) + mpc | mpfr | gmp | cloog) # If we're processing --with-$lib, --with-$lib-include or # --with-$lib-lib, for one of the libs above, and target is # different from host, don't pass the current argument to any @@ -14374,43 +14187,6 @@ case $build in esac ;; esac -# This is aimed to mimic bootstrap with a non-GCC compiler to catch problems. -if test "$GCC" = yes -a "$ENABLE_BUILD_WITH_CXX" != yes; then - saved_CFLAGS="$CFLAGS" - - # Pass -fkeep-inline-functions for stage 1 if the GCC version supports it. - CFLAGS="$CFLAGS -fkeep-inline-functions" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -fkeep-inline-functions is supported" >&5 -$as_echo_n "checking whether -fkeep-inline-functions is supported... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#if (__GNUC__ < 3) \ - || (__GNUC__ == 3 && (__GNUC_MINOR__ < 3 \ - || (__GNUC_MINOR__ == 3 && __GNUC_PATCHLEVEL__ < 1))) -#error http://gcc.gnu.org/PR29382 -#endif - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; stage1_cflags="$stage1_cflags -fkeep-inline-functions" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - CFLAGS="$saved_CFLAGS" -fi - # Enable --enable-checking in stage1 of the compiler. @@ -14445,15 +14221,6 @@ case ${enable_werror} in esac -# If using ENABLE_BUILD_POSTSTAGE1_WITH_CXX, pass -# --enable-build-with-cxx after stage1. -if test "$ENABLE_BUILD_POSTSTAGE1_WITH_CXX" = "yes"; then - POSTSTAGE1_CONFIGURE_FLAGS=--enable-build-with-cxx -else - POSTSTAGE1_CONFIGURE_FLAGS= -fi - - # Specify what files to not compare during bootstrap. compare_exclusions="gcc/cc*-checksum\$(objext) | gcc/ada/*tools/*" @@ -14461,9 +14228,6 @@ case "$target" in hppa*64*-*-hpux*) ;; hppa*-*-hpux*) compare_exclusions="gcc/cc*-checksum\$(objext) | */libgcc/lib2funcs* | gcc/ada/*tools/*" ;; esac -case " $configdirs " in -*" ppl "*) compare_exclusions="$compare_exclusions | ppl/src/ppl-config.o" ;; -esac ac_config_files="$ac_config_files Makefile" -- cgit v1.2.1