@@ -646,7 +646,6 @@ extra_host_libiberty_configure_flags
646646clooginc
647647clooglibs
648648islinc
649- isllibs
650649poststage1_ldflags
651650poststage1_libs
652651stage1_libs
@@ -768,11 +767,11 @@ with_stage1_ldflags
768767with_stage1_libs
769768with_boot_libs
770769with_boot_ldflags
770+ with_cloog
771771with_isl
772772with_isl_include
773773with_isl_lib
774774enable_isl_version_check
775- with_cloog
776775with_cloog_include
777776with_cloog_lib
778777enable_cloog_version_check
@@ -1521,16 +1520,16 @@ Optional Packages:
15211520 --with-boot-libs=LIBS libraries for stage2 and later
15221521 --with-boot-ldflags=FLAGS
15231522 linker flags for stage2 and later
1523+ --with-cloog=PATH Specify prefix directory for the installed CLooG-ISL
1524+ package. Equivalent to
1525+ --with-cloog-include=PATH/include plus
1526+ --with-cloog-lib=PATH/lib
15241527 --with-isl=PATH Specify prefix directory for the installed ISL
15251528 package. Equivalent to
15261529 --with-isl-include=PATH/include plus
15271530 --with-isl-lib=PATH/lib
15281531 --with-isl-include=PATH Specify directory for installed ISL include files
15291532 --with-isl-lib=PATH Specify the directory for the installed ISL library
1530- --with-cloog=PATH Specify prefix directory for the installed CLooG-PPL
1531- package. Equivalent to
1532- --with-cloog-include=PATH/include plus
1533- --with-cloog-lib=PATH/lib
15341533 --with-cloog-include=PATH
15351534 Specify directory for installed CLooG include files
15361535 --with-cloog-lib=PATH Specify the directory for the installed CLooG
@@ -3163,6 +3162,13 @@ case "${target}" in
31633162 ;;
31643163esac
31653164
3165+ # Disable libquadmath for some systems.
3166+ case " ${target} " in
3167+ avr-* -* )
3168+ noconfigdirs=" $noconfigdirs target-libquadmath"
3169+ ;;
3170+ esac
3171+
31663172# Disable libstdc++-v3 for some systems.
31673173case " ${target} " in
31683174 * -* -vxworks* )
@@ -3503,6 +3509,13 @@ case "${target}" in
35033509 arm-* -riscix* )
35043510 noconfigdirs=" $noconfigdirs ld target-libgloss"
35053511 ;;
3512+ avr-* -rtems* )
3513+ ;;
3514+ avr-* -* )
3515+ if test x${with_avrlibc} ! = xno; then
3516+ noconfigdirs=" $noconfigdirs target-newlib target-libgloss"
3517+ fi
3518+ ;;
35063519 c4x-* -* | tic4x-* -* )
35073520 noconfigdirs=" $noconfigdirs target-libgloss"
35083521 ;;
@@ -5315,7 +5328,7 @@ main ()
53155328
53165329 #define GCC_GMP_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
53175330 #define GCC_GMP_VERSION GCC_GMP_VERSION_NUM(__GNU_MP_VERSION,__GNU_MP_VERSION_MINOR,__GNU_MP_VERSION_PATCHLEVEL)
5318- #if GCC_GMP_VERSION < GCC_GMP_VERSION_NUM(4,2,0 )
5331+ #if GCC_GMP_VERSION < GCC_GMP_VERSION_NUM(4,2,3 )
53195332 choke me
53205333 #endif
53215334
@@ -5612,7 +5625,15 @@ fi
56125625
56135626
56145627
5615- # Check for ISL
5628+ # GCC GRAPHITE dependences, ISL and CLOOG which in turn requires ISL.
5629+ # Basic setup is inlined here, actual checks are in config/cloog.m4 and
5630+ # config/isl.m4
5631+
5632+
5633+ # Check whether --with-cloog was given.
5634+ if test " ${with_cloog+set} " set ; then :
5635+ withval=$with_cloog ;
5636+ fi
56165637
56175638
56185639# Check whether --with-isl was given.
@@ -5621,6 +5642,13 @@ if test "${with_isl+set}" = set; then :
56215642fi
56225643
56235644
5645+ # Treat either --without-cloog or --without-isl as a request to disable
5646+ # GRAPHITE support and skip all following checks.
5647+ if test " x$with_isl " ! = " xno" &&
5648+ test " x$with_cloog " ! = " xno" ; then
5649+ # Check for ISL
5650+
5651+
56245652# Check whether --with-isl-include was given.
56255653if test " ${with_isl_include+set} " set ; then :
56265654 withval=$with_isl_include ;
@@ -5667,14 +5695,8 @@ fi
56675695 ENABLE_ISL_CHECK=no
56685696 fi
56695697
5670- isllibs=" ${isllibs} -lisl"
5671-
56725698
56735699
5674-
5675-
5676- if test " x$with_isl " ! = " xno" ; then
5677-
56785700 if test " ${ENABLE_ISL_CHECK} " ; then
56795701 _isl_saved_CFLAGS=$CFLAGS
56805702 _isl_saved_LDFLAGS=$LDFLAGS
@@ -5730,7 +5752,6 @@ $as_echo "$gcc_cv_isl" >&6; }
57305752
57315753
57325754
5733-
57345755 if test " x${with_isl} " ; then
57355756 graphite_requested=no
57365757 elif test " x${with_isl} " ! = x \
@@ -5756,15 +5777,9 @@ $as_echo "$gcc_cv_isl" >&6; }
57565777 fi
57575778
57585779
5759- fi
5760-
5761- # Check for CLOOG
5762-
57635780
5764- # Check whether --with-cloog was given.
5765- if test " ${with_cloog+set} " set ; then :
5766- withval=$with_cloog ;
5767- fi
5781+ if test " x$gcc_cv_isl " ! = " xno" ; then
5782+ # Check for CLOOG
57685783
57695784
57705785# Check whether --with-cloog-include was given.
@@ -5813,16 +5828,9 @@ fi
58135828 fi
58145829
58155830 clooginc=" -DCLOOG_INT_GMP ${clooginc} "
5816- clooglibs=" ${clooglibs} -lcloog-isl ${isllibs} "
5817-
5818-
5819-
5831+ clooglibs=" ${clooglibs} -lcloog-isl ${isllibs} -lisl"
58205832
58215833
5822- if test " x$isllibs " && test " x$islinc " ; then
5823- clooglibs=
5824- clooginc=
5825- elif test " x$with_cloog " ! = " xno" ; then
58265834
58275835
58285836
@@ -5894,18 +5902,30 @@ $as_echo "$gcc_cv_cloog" >&6; }
58945902 && test " x${clooglibs} "
58955903 && test " x${clooginc} " ; then
58965904
5897- as_fn_error " Unable to find a usable CLooG. See config.log for details." " $LINENO "
5905+ as_fn_error " Unable to find a usable CLooG. See config.log for details." " $LINENO "
58985906 fi
58995907
59005908
5909+ fi
59015910fi
59025911
59035912# If either the ISL or the CLooG check failed, disable builds of in-tree
59045913# variants of both
5905- if test " x$clooglibs " && test " x$clooginc " ; then
5914+ if test " x$with_isl " ||
5915+ test " x$with_cloog " ||
5916+ test " x$gcc_cv_cloog " ||
5917+ test " x$gcc_cv_isl " ; then
59065918 noconfigdirs=" $noconfigdirs cloog isl"
5919+ islinc=
5920+ clooginc=
5921+ clooglibs=
59075922fi
59085923
5924+
5925+
5926+
5927+
5928+
59095929# Check for LTO support.
59105930# Check whether --enable-lto was given.
59115931if test " ${enable_lto+set} " set ; then :
@@ -6109,6 +6129,7 @@ if test -d ${srcdir}/gcc; then
61096129 boot_language=yes
61106130 fi
61116131
6132+ add_this_lang=no
61126133 case ,${enable_languages} , in
61136134 * ,${language} ,* )
61146135 # Language was explicitly selected; include it
@@ -6119,10 +6140,9 @@ if test -d ${srcdir}/gcc; then
61196140 ;;
61206141 * ,all,* )
61216142 # 'all' was selected, select it if it is a default language
6122- add_this_lang=${build_by_default}
6123- ;;
6124- * )
6125- add_this_lang=no
6143+ if test " $language " ! = " c" ; then
6144+ add_this_lang=${build_by_default}
6145+ fi
61266146 ;;
61276147 esac
61286148
0 commit comments