Skip to content

R
riscv-gcc-1
Commit d789184e by Sebastian Pop Committed by Sebastian Pop
Options

configure.ac (--with-cloog-polylib): New. 

2008-09-03  Sebastian Pop  <sebastian.pop@amd.com>

	* configure.ac (--with-cloog-polylib): New.
	(--disable-cloog-version-check): New.
	(--disable-ppl-version-check): New.
	* configure: Re-generate.

From-SVN: r139973
parent 0da366c7
Showing with 146 additions and 89 deletions
ChangeLog
2008-09-03 Sebastian Pop <sebastian.pop@amd.com>
* configure.ac (--with-cloog-polylib): New.
(--disable-cloog-version-check): New.
(--disable-ppl-version-check): New.
* configure: Re-generate.
2008-09-03 Richard Guenther <rguenther@suse.de> 2008-09-03 Richard Guenther <rguenther@suse.de>
* configure.ac: Always pass -DCLOOG_PPL_BACKEND to the * configure.ac: Always pass -DCLOOG_PPL_BACKEND to the
......
configure
...@@ -935,6 +935,8 @@ Optional Features: ...@@ -935,6 +935,8 @@ Optional Features:
--enable-gold use gold instead of ld --enable-gold use gold instead of ld
--enable-libada build libada directory --enable-libada build libada directory
--enable-libssp build libssp directory --enable-libssp build libssp directory
--disable-ppl-version-check disable check for PPL version
--disable-cloog-version-check disable check for CLooG version
--enable-stage1-languages[=all] choose additional languages to build during --enable-stage1-languages[=all] choose additional languages to build during
stage1. Mostly useful for compiler development. stage1. Mostly useful for compiler development.
--enable-objc-gc enable use of Boehm's garbage collector with the --enable-objc-gc enable use of Boehm's garbage collector with the
...@@ -972,11 +974,12 @@ Optional Packages: ...@@ -972,11 +974,12 @@ Optional Packages:
plus --with-ppl-lib=PATH/lib plus --with-ppl-lib=PATH/lib
--with-ppl-include=PATH Specify directory for installed PPL include files --with-ppl-include=PATH Specify directory for installed PPL include files
--with-ppl-lib=PATH Specify the directory for the installed PPL library --with-ppl-lib=PATH Specify the directory for the installed PPL library
--with-cloog=PATH Specify prefix directory for the installed CLOOG package --with-cloog=PATH Specify prefix directory for the installed CLooG-PPL package
Equivalent to --with-cloog-include=PATH/include Equivalent to --with-cloog-include=PATH/include
plus --with-cloog-lib=PATH/lib plus --with-cloog-lib=PATH/lib
--with-cloog-include=PATH Specify directory for installed CLOOG include files --with-cloog-include=PATH Specify directory for installed CLooG include files
--with-cloog-lib=PATH Specify the directory for the installed CLOOG library --with-cloog-lib=PATH Specify the directory for the installed CLooG library
--with-cloog-polylib=PATH Specify prefix directory for the installed CLooG-PolyLib package
--with-build-sysroot=SYSROOT --with-build-sysroot=SYSROOT
use sysroot as the system root during the build use sysroot as the system root during the build
--with-debug-prefix-map='A=B C=D ...' --with-debug-prefix-map='A=B C=D ...'
...@@ -4845,58 +4848,20 @@ if test "x$with_ppl$with_ppl_include$with_ppl_lib" = x && test -d ${srcdir}/ppl; ...@@ -4845,58 +4848,20 @@ if test "x$with_ppl$with_ppl_include$with_ppl_lib" = x && test -d ${srcdir}/ppl;
LIBS="$ppllibs $LIBS" LIBS="$ppllibs $LIBS"
fi fi
# Flags needed for PPL # Check whether --enable-ppl-version-check or --disable-ppl-version-check was given.
if test "${enable_ppl_version_check+set}" = set; then
enableval="$enable_ppl_version_check"
ENABLE_PPL_CHECK=$enableval
else
# Check for CLOOG ENABLE_PPL_CHECK=yes
clooglibs=
clooginc=
# Check whether --with-cloog or --without-cloog was given.
if test "${with_cloog+set}" = set; then
withval="$with_cloog"
fi;
# Check whether --with-cloog_include or --without-cloog_include was given.
if test "${with_cloog_include+set}" = set; then
withval="$with_cloog_include"
fi;
# Check whether --with-cloog_lib or --without-cloog_lib was given.
if test "${with_cloog_lib+set}" = set; then
withval="$with_cloog_lib"
fi; fi;
if test "x$with_cloog" != x; then if test "${ENABLE_PPL_CHECK}" = "yes"; then
clooglibs="-L$with_cloog/lib -lcloog" saved_CFLAGS="$CFLAGS"
clooginc="-I$with_cloog/include -DCLOOG_PPL_BACKEND " CFLAGS="$CFLAGS $pplinc $gmpinc"
LIBS="$clooglibs $LIBS" echo "$as_me:$LINENO: checking for version $ppl_major_version.$ppl_minor_version of PPL" >&5
fi
if test "x$with_cloog_include" != x; then
clooginc="-I$with_cloog_include -DCLOOG_PPL_BACKEND "
fi
if test "x$with_cloog_lib" != x; then
clooglibs="-L$with_cloog_lib -lcloog"
LIBS="$clooglibs $LIBS"
fi
if test "x$with_cloog$with_cloog_include$with_cloog_lib" = x && test -d ${srcdir}/cloog; then
clooglibs='-L$$r/$(HOST_SUBDIR)/cloog/.libs -L$$r/$(HOST_SUBDIR)/cloog/_libs -lcloog '
clooginc='-I$$r/$(HOST_SUBDIR)/cloog/include -I$$s/cloog/include -DCLOOG_PPL_BACKEND '
LIBS="$clooglibs $LIBS"
fi
saved_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $pplinc $gmpinc"
echo "$as_me:$LINENO: checking for version $ppl_major_version.$ppl_minor_version of PPL" >&5
echo $ECHO_N "checking for version $ppl_major_version.$ppl_minor_version of PPL... $ECHO_C" >&6 echo $ECHO_N "checking for version $ppl_major_version.$ppl_minor_version of PPL... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF
cat confdefs.h >>conftest.$ac_ext cat confdefs.h >>conftest.$ac_ext
...@@ -4907,9 +4872,9 @@ int ...@@ -4907,9 +4872,9 @@ int
main () main ()
{ {
#if PPL_VERSION_MAJOR != $ppl_major_version || PPL_VERSION_MINOR != $ppl_minor_version #if PPL_VERSION_MAJOR != $ppl_major_version || PPL_VERSION_MINOR != $ppl_minor_version
choke me choke me
#endif #endif
; ;
return 0; return 0;
...@@ -4944,17 +4909,83 @@ else ...@@ -4944,17 +4909,83 @@ else
sed 's/^/| /' conftest.$ac_ext >&5 sed 's/^/| /' conftest.$ac_ext >&5
echo "$as_me:$LINENO: result: no" >&5 echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; clooglibs= ; clooginc= echo "${ECHO_T}no" >&6; ppllibs= ; pplinc=
fi fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS="$saved_CFLAGS" CFLAGS="$saved_CFLAGS"
fi
# Flags needed for PPL
saved_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $clooginc -DCLOOG_PPL_BACKEND $gmpinc $pplinc"
echo "$as_me:$LINENO: checking for correct version of CLooG" >&5 # Check for CLOOG
clooglibs=
clooginc=" -DCLOOG_PPL_BACKEND "
# Check whether --with-cloog or --without-cloog was given.
if test "${with_cloog+set}" = set; then
withval="$with_cloog"
fi;
# Check whether --with-cloog_include or --without-cloog_include was given.
if test "${with_cloog_include+set}" = set; then
withval="$with_cloog_include"
fi;
# Check whether --with-cloog_lib or --without-cloog_lib was given.
if test "${with_cloog_lib+set}" = set; then
withval="$with_cloog_lib"
fi;
# Check whether --with-cloog-polylib or --without-cloog-polylib was given.
if test "${with_cloog_polylib+set}" = set; then
withval="$with_cloog_polylib"
fi;
if test "x$with_cloog" != x; then
clooglibs="-L$with_cloog/lib -lcloog"
clooginc="-I$with_cloog/include -DCLOOG_PPL_BACKEND "
LIBS="$clooglibs $LIBS"
fi
if test "x$with_cloog_polylib" != x; then
clooglibs="-L$with_cloog/lib -lcloog"
clooginc="-I$with_cloog/include "
LIBS="$clooglibs $LIBS"
fi
if test "x$with_cloog_include" != x; then
clooginc="-I$with_cloog_include -DCLOOG_PPL_BACKEND "
fi
if test "x$with_cloog_lib" != x; then
clooglibs="-L$with_cloog_lib -lcloog"
LIBS="$clooglibs $LIBS"
fi
if test "x$with_cloog$with_cloog_include$with_cloog_lib" = x && test -d ${srcdir}/cloog; then
clooglibs='-L$$r/$(HOST_SUBDIR)/cloog/.libs -L$$r/$(HOST_SUBDIR)/cloog/_libs -lcloog '
clooginc='-I$$r/$(HOST_SUBDIR)/cloog/include -I$$s/cloog/include -DCLOOG_PPL_BACKEND '
LIBS="$clooglibs $LIBS"
fi
# Check whether --enable-cloog-version-check or --disable-cloog-version-check was given.
if test "${enable_cloog_version_check+set}" = set; then
enableval="$enable_cloog_version_check"
ENABLE_CLOOG_CHECK=$enableval
else
ENABLE_CLOOG_CHECK=yes
fi;
if test "${ENABLE_CLOOG_CHECK}" = "yes"; then
saved_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $clooginc $gmpinc $pplinc"
echo "$as_me:$LINENO: checking for correct version of CLooG" >&5
echo $ECHO_N "checking for correct version of CLooG... $ECHO_C" >&6 echo $ECHO_N "checking for correct version of CLooG... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF
cat confdefs.h >>conftest.$ac_ext cat confdefs.h >>conftest.$ac_ext
...@@ -4965,9 +4996,9 @@ int ...@@ -4965,9 +4996,9 @@ int
main () main ()
{ {
#if CLOOG_VERSION_MAJOR != 0 || CLOOG_VERSION_MINOR != 15 #if CLOOG_VERSION_MAJOR != 0 || CLOOG_VERSION_MINOR != 15
choke me choke me
#endif #endif
; ;
return 0; return 0;
...@@ -5005,7 +5036,8 @@ echo "$as_me:$LINENO: result: no" >&5 ...@@ -5005,7 +5036,8 @@ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; clooglibs= ; clooginc= echo "${ECHO_T}no" >&6; clooglibs= ; clooginc=
fi fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS="$saved_CFLAGS" CFLAGS="$saved_CFLAGS"
fi
# Flags needed for CLOOG # Flags needed for CLOOG
......
configure.ac
...@@ -1341,6 +1341,23 @@ if test "x$with_ppl$with_ppl_include$with_ppl_lib" = x && test -d ${srcdir}/ppl; ...@@ -1341,6 +1341,23 @@ if test "x$with_ppl$with_ppl_include$with_ppl_lib" = x && test -d ${srcdir}/ppl;
LIBS="$ppllibs $LIBS" LIBS="$ppllibs $LIBS"
fi fi
AC_ARG_ENABLE(ppl-version-check,
[ --disable-ppl-version-check disable check for PPL version],
ENABLE_PPL_CHECK=$enableval,
ENABLE_PPL_CHECK=yes)
if test "${ENABLE_PPL_CHECK}" = "yes"; then
saved_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $pplinc $gmpinc"
AC_MSG_CHECKING([for version $ppl_major_version.$ppl_minor_version of PPL])
AC_TRY_COMPILE([#include "ppl_c.h"],[
#if PPL_VERSION_MAJOR != $ppl_major_version || PPL_VERSION_MINOR != $ppl_minor_version
choke me
#endif
], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); ppllibs= ; pplinc= ])
CFLAGS="$saved_CFLAGS"
fi
# Flags needed for PPL # Flags needed for PPL
AC_SUBST(ppllibs) AC_SUBST(ppllibs)
AC_SUBST(pplinc) AC_SUBST(pplinc)
...@@ -1348,19 +1365,25 @@ AC_SUBST(pplinc) ...@@ -1348,19 +1365,25 @@ AC_SUBST(pplinc)
# Check for CLOOG # Check for CLOOG
clooglibs= clooglibs=
clooginc= clooginc=" -DCLOOG_PPL_BACKEND "
AC_ARG_WITH(cloog, [ --with-cloog=PATH Specify prefix directory for the installed CLOOG package AC_ARG_WITH(cloog, [ --with-cloog=PATH Specify prefix directory for the installed CLooG-PPL package
Equivalent to --with-cloog-include=PATH/include Equivalent to --with-cloog-include=PATH/include
plus --with-cloog-lib=PATH/lib]) plus --with-cloog-lib=PATH/lib])
AC_ARG_WITH(cloog_include, [ --with-cloog-include=PATH Specify directory for installed CLOOG include files]) AC_ARG_WITH(cloog_include, [ --with-cloog-include=PATH Specify directory for installed CLooG include files])
AC_ARG_WITH(cloog_lib, [ --with-cloog-lib=PATH Specify the directory for the installed CLOOG library]) AC_ARG_WITH(cloog_lib, [ --with-cloog-lib=PATH Specify the directory for the installed CLooG library])
AC_ARG_WITH(cloog-polylib, [ --with-cloog-polylib=PATH Specify prefix directory for the installed CLooG-PolyLib package])
if test "x$with_cloog" != x; then if test "x$with_cloog" != x; then
clooglibs="-L$with_cloog/lib -lcloog" clooglibs="-L$with_cloog/lib -lcloog"
clooginc="-I$with_cloog/include -DCLOOG_PPL_BACKEND " clooginc="-I$with_cloog/include -DCLOOG_PPL_BACKEND "
LIBS="$clooglibs $LIBS" LIBS="$clooglibs $LIBS"
fi fi
if test "x$with_cloog_polylib" != x; then
clooglibs="-L$with_cloog/lib -lcloog"
clooginc="-I$with_cloog/include "
LIBS="$clooglibs $LIBS"
fi
if test "x$with_cloog_include" != x; then if test "x$with_cloog_include" != x; then
clooginc="-I$with_cloog_include -DCLOOG_PPL_BACKEND " clooginc="-I$with_cloog_include -DCLOOG_PPL_BACKEND "
fi fi
...@@ -1374,27 +1397,22 @@ if test "x$with_cloog$with_cloog_include$with_cloog_lib" = x && test -d ${srcdir ...@@ -1374,27 +1397,22 @@ if test "x$with_cloog$with_cloog_include$with_cloog_lib" = x && test -d ${srcdir
LIBS="$clooglibs $LIBS" LIBS="$clooglibs $LIBS"
fi fi
saved_CFLAGS="$CFLAGS" AC_ARG_ENABLE(cloog-version-check,
CFLAGS="$CFLAGS $pplinc $gmpinc" [ --disable-cloog-version-check disable check for CLooG version],
ENABLE_CLOOG_CHECK=$enableval,
ENABLE_CLOOG_CHECK=yes)
AC_MSG_CHECKING([for version $ppl_major_version.$ppl_minor_version of PPL]) if test "${ENABLE_CLOOG_CHECK}" = "yes"; then
AC_TRY_COMPILE([#include "ppl_c.h"],[ saved_CFLAGS="$CFLAGS"
#if PPL_VERSION_MAJOR != $ppl_major_version || PPL_VERSION_MINOR != $ppl_minor_version CFLAGS="$CFLAGS $clooginc $gmpinc $pplinc"
choke me AC_MSG_CHECKING([for correct version of CLooG])
#endif AC_TRY_COMPILE([#include "cloog/cloog.h"],[
], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); clooglibs= ; clooginc= ]) #if CLOOG_VERSION_MAJOR != 0 || CLOOG_VERSION_MINOR != 15
CFLAGS="$saved_CFLAGS" choke me
#endif
saved_CFLAGS="$CFLAGS" ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); clooglibs= ; clooginc= ])
CFLAGS="$CFLAGS $clooginc -DCLOOG_PPL_BACKEND $gmpinc $pplinc" CFLAGS="$saved_CFLAGS"
fi
AC_MSG_CHECKING([for correct version of CLooG])
AC_TRY_COMPILE([#include "cloog/cloog.h"],[
#if CLOOG_VERSION_MAJOR != 0 || CLOOG_VERSION_MINOR != 15
choke me
#endif
], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); clooglibs= ; clooginc= ])
CFLAGS="$saved_CFLAGS"
# Flags needed for CLOOG # Flags needed for CLOOG
AC_SUBST(clooglibs) AC_SUBST(clooglibs)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment