OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cloog.m4: Remove debugging print. 

2012-07-03  Richard Guenther  <rguenther@suse.de>

	config/
	* cloog.m4: Remove debugging print.

	* 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.

From-SVN: r189209
This commit is contained in:
Richard Guenther 2012-07-03 09:44:53 +00:00 committed by Richard Biener
parent 90d4f2330e
commit 32d024bfd2
7 changed files with 60 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2012-07-03 Richard Guenther <rguenther@suse.de>
* 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-03 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* configure: Regenerate.

2
Makefile.def
View File

@ -69,7 +69,7 @@ host_modules= { module= isl; lib_path=.libs; bootstrap=true;
host_modules= { module= cloog; lib_path=.libs; bootstrap=true;
extra_configure_flags='--disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp --with-isl=system';
extra_exports='CPPFLAGS="-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include ${CPPFLAGS}"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS; ';
extra_make_flags='CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS"';
extra_make_flags='CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" V=1';
no_install= true; };
host_modules= { module= libelf; lib_path=.libs; bootstrap=true;
extra_configure_flags='--disable-shared';

54
Makefile.in
View File

@ -14141,7 +14141,7 @@ all-cloog: configure-cloog
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) CPPFLAGS="-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include ${CPPFLAGS}"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS; \
(cd $(HOST_SUBDIR)/cloog && \
$(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" \
$(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" V=1 \
$(TARGET-cloog))
@endif cloog
@ -14169,7 +14169,7 @@ all-stage1-cloog: configure-stage1-cloog
CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
$(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" \
$(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" V=1 \
TFLAGS="$(STAGE1_TFLAGS)" \
$(TARGET-stage1-cloog)
@ -14184,7 +14184,7 @@ clean-stage1-cloog:
fi; \
cd $(HOST_SUBDIR)/cloog && \
$(MAKE) $(EXTRA_HOST_FLAGS) \
CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" clean
CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" V=1 clean
@endif cloog-bootstrap
@ -14211,7 +14211,7 @@ all-stage2-cloog: configure-stage2-cloog
CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" \
$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" V=1 \
TFLAGS="$(STAGE2_TFLAGS)" \
$(TARGET-stage2-cloog)
@ -14227,7 +14227,7 @@ clean-stage2-cloog:
cd $(HOST_SUBDIR)/cloog && \
$(MAKE) $(EXTRA_HOST_FLAGS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" clean
CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" V=1 clean
@endif cloog-bootstrap
@ -14254,7 +14254,7 @@ all-stage3-cloog: configure-stage3-cloog
CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" \
$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" V=1 \
TFLAGS="$(STAGE3_TFLAGS)" \
$(TARGET-stage3-cloog)
@ -14270,7 +14270,7 @@ clean-stage3-cloog:
cd $(HOST_SUBDIR)/cloog && \
$(MAKE) $(EXTRA_HOST_FLAGS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" clean
CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" V=1 clean
@endif cloog-bootstrap
@ -14297,7 +14297,7 @@ all-stage4-cloog: configure-stage4-cloog
CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" \
$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" V=1 \
TFLAGS="$(STAGE4_TFLAGS)" \
$(TARGET-stage4-cloog)
@ -14313,7 +14313,7 @@ clean-stage4-cloog:
cd $(HOST_SUBDIR)/cloog && \
$(MAKE) $(EXTRA_HOST_FLAGS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" clean
CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" V=1 clean
@endif cloog-bootstrap
@ -14340,7 +14340,7 @@ all-stageprofile-cloog: configure-stageprofile-cloog
CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" \
$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" V=1 \
TFLAGS="$(STAGEprofile_TFLAGS)" \
$(TARGET-stageprofile-cloog)
@ -14356,7 +14356,7 @@ clean-stageprofile-cloog:
cd $(HOST_SUBDIR)/cloog && \
$(MAKE) $(EXTRA_HOST_FLAGS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" clean
CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" V=1 clean
@endif cloog-bootstrap
@ -14383,7 +14383,7 @@ all-stagefeedback-cloog: configure-stagefeedback-cloog
CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" \
$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" V=1 \
TFLAGS="$(STAGEfeedback_TFLAGS)" \
$(TARGET-stagefeedback-cloog)
@ -14399,7 +14399,7 @@ clean-stagefeedback-cloog:
cd $(HOST_SUBDIR)/cloog && \
$(MAKE) $(EXTRA_HOST_FLAGS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" clean
CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" V=1 clean
@endif cloog-bootstrap
@ -14417,7 +14417,7 @@ check-cloog:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/cloog && \
$(MAKE) $(FLAGS_TO_PASS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" check)
$(MAKE) $(FLAGS_TO_PASS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" V=1 check)
@endif cloog
@ -14452,7 +14452,7 @@ info-cloog: \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS"; do \
for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" V=1; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing info in cloog" ; \
@ -14477,7 +14477,7 @@ dvi-cloog: \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS"; do \
for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" V=1; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing dvi in cloog" ; \
@ -14502,7 +14502,7 @@ pdf-cloog: \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS"; do \
for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" V=1; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing pdf in cloog" ; \
@ -14527,7 +14527,7 @@ html-cloog: \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS"; do \
for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" V=1; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing html in cloog" ; \
@ -14552,7 +14552,7 @@ TAGS-cloog: \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS"; do \
for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" V=1; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing TAGS in cloog" ; \
@ -14578,7 +14578,7 @@ install-info-cloog: \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS"; do \
for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" V=1; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing install-info in cloog" ; \
@ -14604,7 +14604,7 @@ install-pdf-cloog: \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS"; do \
for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" V=1; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing install-pdf in cloog" ; \
@ -14630,7 +14630,7 @@ install-html-cloog: \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS"; do \
for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" V=1; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing install-html in cloog" ; \
@ -14655,7 +14655,7 @@ installcheck-cloog: \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS"; do \
for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" V=1; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing installcheck in cloog" ; \
@ -14679,7 +14679,7 @@ mostlyclean-cloog:
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS"; do \
for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" V=1; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing mostlyclean in cloog" ; \
@ -14703,7 +14703,7 @@ clean-cloog:
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS"; do \
for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" V=1; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing clean in cloog" ; \
@ -14727,7 +14727,7 @@ distclean-cloog:
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS"; do \
for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" V=1; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing distclean in cloog" ; \
@ -14751,7 +14751,7 @@ maintainer-clean-cloog:
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS"; do \
for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS}" LDFLAGS="$$LDFLAGS" V=1; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing maintainer-clean in cloog" ; \

4
config/ChangeLog
View File

@ -1,3 +1,7 @@
2012-07-03 Richard Guenther <rguenther@suse.de>
* cloog.m4: Remove debugging print.
2012-07-03 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* isl.m4 (ISL_CHECK_VERSION): Add -lisl to LIBS, not LDFLAGS.

1
config/cloog.m4
View File

@ -67,7 +67,6 @@ AC_DEFUN([CLOOG_INIT_FLAGS],
dnl source, set up flags to use that.
if test "x${clooginc}" == x && test "x${clooglibs}" == x \
&& test -d ${srcdir}/cloog; then
echo FooBar
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

12
configure vendored
View File

@ -5822,7 +5822,6 @@ fi
fi
if test "x${clooginc}" == x && test "x${clooglibs}" == x \
&& test -d ${srcdir}/cloog; then
echo FooBar
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
@ -5834,7 +5833,10 @@ fi
if test "x$with_cloog" != "xno"; then
if test "x$isllibs" = x && test "x$islinc" = x; then
clooglibs=
clooginc=
elif test "x$with_cloog" != "xno"; then
@ -5912,6 +5914,12 @@ $as_echo "$gcc_cv_cloog" >&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 :

11
configure.ac
View File

@ -1535,7 +1535,10 @@ fi
dnl Provide configure switches and initialize clooginc & clooglibs
dnl with user input.
CLOOG_INIT_FLAGS
if test "x$with_cloog" != "xno"; then
if test "x$isllibs" = x && test "x$islinc" = x; then
clooglibs=
clooginc=
elif test "x$with_cloog" != "xno"; then
dnl The minimal version of CLooG required for Graphite.
dnl
dnl If we use CLooG-Legacy, the provided version information is
@ -1547,6 +1550,12 @@ if test "x$with_cloog" != "xno"; then
AC_MSG_ERROR([Unable to find a usable CLooG. See config.log for details.])])
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.
AC_ARG_ENABLE(lto,
[AS_HELP_STRING([--enable-lto], [enable link time optimization support])],