* opts.c (target_handle_option): Do not assert that loc ==

[pf3gnuchains/gcc-fork.git] / configure

diff --git a/configure b/configure
index 0e4f1ed..04a623c 100755 (executable)
--- a/configure
+++ b/configure
@@ -765,6 +765,7 @@ enable_ppl_version_check
 with_cloog
 with_cloog_include
 with_cloog_lib
+enable_cloog_backend
 enable_cloog_version_check
 enable_lto
 enable_stage1_languages
@@ -1451,6 +1452,10 @@ Optional Features:
   --enable-libssp         build libssp directory
   --enable-build-with-cxx build with C++ compiler instead of C compiler
   --disable-ppl-version-check    disable check for PPL version
+  --enable-cloog-backend=backend
+                               isl: The cloog.org isl backend
+                               ppl-legacy: The legacy ppl backend - default
+                               ppl: The cloog.org ppl backend
   --disable-cloog-version-check
                           disable check for CLooG version
   --enable-lto            enable link time optimization support
@@ -2691,6 +2696,7 @@ target_libraries="target-libgcc \
                target-libstdc++-v3 \
                target-libmudflap \
                target-libssp \
+               target-libquadmath \
                target-libgfortran \
                target-boehm-gc \
                ${libgcj} \
@@ -5118,13 +5124,13 @@ if test "${with_mpc+set}" = set; then :
 fi
 
 
-# Check whether --with-mpc_include was given.
+# Check whether --with-mpc-include was given.
 if test "${with_mpc_include+set}" = set; then :
   withval=$with_mpc_include;
 fi
 
 
-# Check whether --with-mpc_lib was given.
+# Check whether --with-mpc-lib was given.
 if test "${with_mpc_lib+set}" = set; then :
   withval=$with_mpc_lib;
 fi
@@ -5167,13 +5173,13 @@ if test "${with_mpfr+set}" = set; then :
 fi
 
 
-# Check whether --with-mpfr_include was given.
+# Check whether --with-mpfr-include was given.
 if test "${with_mpfr_include+set}" = set; then :
   withval=$with_mpfr_include;
 fi
 
 
-# Check whether --with-mpfr_lib was given.
+# Check whether --with-mpfr-lib was given.
 if test "${with_mpfr_lib+set}" = set; then :
   withval=$with_mpfr_lib;
 fi
@@ -5216,13 +5222,13 @@ if test "${with_gmp+set}" = set; then :
 fi
 
 
-# Check whether --with-gmp_include was given.
+# Check whether --with-gmp-include was given.
 if test "${with_gmp_include+set}" = set; then :
   withval=$with_gmp_include;
 fi
 
 
-# Check whether --with-gmp_lib was given.
+# Check whether --with-gmp-lib was given.
 if test "${with_gmp_lib+set}" = set; then :
   withval=$with_gmp_lib;
 fi
@@ -5575,13 +5581,13 @@ if test "${with_ppl+set}" = set; then :
 fi
 
 
-# Check whether --with-ppl_include was given.
+# Check whether --with-ppl-include was given.
 if test "${with_ppl_include+set}" = set; then :
   withval=$with_ppl_include;
 fi
 
 
-# Check whether --with-ppl_lib was given.
+# Check whether --with-ppl-lib was given.
 if test "${with_ppl_lib+set}" = set; then :
   withval=$with_ppl_lib;
 fi
@@ -5664,18 +5670,31 @@ if test "${with_cloog+set}" = set; then :
 fi
 
 
-# Check whether --with-cloog_include was given.
+# Check whether --with-cloog-include was given.
 if test "${with_cloog_include+set}" = set; then :
   withval=$with_cloog_include;
 fi
 
 
-# Check whether --with-cloog_lib was given.
+# Check whether --with-cloog-lib was given.
 if test "${with_cloog_lib+set}" = set; then :
   withval=$with_cloog_lib;
 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
@@ -5727,17 +5746,21 @@ if test "x$with_cloog" != "xno"; then
 
   _cloogorginc="-DCLOOG_INT_GMP -DCLOOG_ORG"
 
-    CFLAGS="${CFLAGS} ${clooginc} ${pplinc} ${gmpinc}"
+    CFLAGS="${CFLAGS} ${clooginc} ${gmpinc}"
   CPPFLAGS="${CPPFLAGS} ${_cloogorginc}"
-  LDFLAGS="${LDFLAGS} ${clooglibs} ${ppllibs}"
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for installed CLooG" >&5
-$as_echo_n "checking for installed CLooG... " >&6; }
+  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
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include "cloog/cloog.h"
 int
@@ -5753,8 +5776,22 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   gcc_cv_cloog_type="PPL Legacy"
 else
-  LIBS="-lcloog-isl -lisl ${_cloog_saved_LIBS}"
-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  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
@@ -5766,12 +5803,29 @@ cloog_version ()
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  gcc_cv_cloog_type=ISL
+  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
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include "cloog/cloog.h"
+   #include "cloog/ppl/cloog.h"
 int
 main ()
 {
@@ -5781,21 +5835,19 @@ cloog_version ()
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  gcc_cv_cloog_type=PPL
+  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
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-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")
@@ -7318,7 +7370,7 @@ case " $target_configdirs " in
        # to it.  This is right: we don't want to search that directory
        # for binaries, but we want the header files in there, so add
        # them explicitly.
-       FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -isystem $$r/$(HOST_SUBDIR)/gcc/include'
+       FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -isystem $$r/$(HOST_SUBDIR)/gcc/include -isystem $$r/$(HOST_SUBDIR)/gcc/include-fixed'
 
        # Someone might think of using the pre-installed headers on
        # Canadian crosses, in case the installed compiler is not fully