drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync toplevel files with GCC tree 

2012-08-14   Diego Novillo  <dnovillo@google.com>

	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  <rguenther@suse.de>

	* 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  <rguenther@suse.de>

	* 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  <rguenther@suse.de>

	* 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  <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-02  Richard Guenther  <rguenther@suse.de>
	Michael Matz  <matz@suse.de>
	Tobias Grosser <tobias@grosser.es>
	Sebastian Pop <sebpop@gmail.com>

	* 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  <rguenther@suse.de>

	Merge from graphite branch
	2011-07-21  Tobias Grosser  <tobias@grosser.es>

	* 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  <tobias@grosser.es>

	* configure: Regenerated.
	* configure.ac: Require cloog isl 0.17.0

	2011-07-21  Tobias Grosser  <tobias@grosser.es>

	* configure: Regenerated.
	* config/cloog.m4: Do not define CLOOG_ORG

2012-06-29  Steven Bosscher  <steven@gcc.gnu.org>

	* configure.ac: Skip C if explicitly selected.
	* configure: Regenerate.

2012-06-28  Christophe Lyon <christophe.lyon@st.com>

	* configure.ac (CFLAGS_FOR_TARGET, CXXFLAGS_FOR_TARGET): Make sure
	they contain -O2.
	* configure: Regenerate.

2012-06-20  Jason Merrill  <jason@redhat.com>

	* 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  <hainque@adacore.com>

	* 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  <nickc@redhat.com>
	    Paul Smith  <psmith@gnu.org>

	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  <jb@gcc.gnu.org>

	* configure.ac: Bump minimum MPFR version to 2.4.0.
	* configure: Regenerated.

2012-05-01  Richard Henderson  <rth@redhat.com>

	* 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 <ahaas@impactweather.com>

	* cloog.m4 (CLOOG_INIT_FLAGS): Use = instead of == in test.

2012-07-04  Tristan Gingold  <gingold@adacore.com>

	* isl.m4 (ISL_CHECK_VERSION): Set to yes if cross-compiling.
	Fix comments.

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.

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

	* isl.m4 (_ISL_CHECK_CT_PROG): Omit main function header/footer.
	Fix version test.

2012-07-02  Richard Guenther  <rguenther@suse.de>
	Michael Matz  <matz@suse.de>
	Tobias Grosser <tobias@grosser.es>
	Sebastian Pop <sebpop@gmail.com>

	* cloog.m4: Set up to work against ISL only.
	* isl.m4: New file.
This commit is contained in:
H.J. Lu 2012-08-26 14:34:40 +00:00
parent 2703411981
commit a626f4eeb0
9 changed files with 2290 additions and 1492 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
ChangeLog
View File

@ -1,3 +1,125 @@
2012-08-14 Diego Novillo <dnovillo@google.com>
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 <rguenther@suse.de>
* 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 <rguenther@suse.de>
* 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 <rguenther@suse.de>
* 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 <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-02 Richard Guenther <rguenther@suse.de>
Michael Matz <matz@suse.de>
Tobias Grosser <tobias@grosser.es>
Sebastian Pop <sebpop@gmail.com>
* 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 <rguenther@suse.de>
Merge from graphite branch
2011-07-21 Tobias Grosser <tobias@grosser.es>
* 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 <tobias@grosser.es>
* configure: Regenerated.
* configure.ac: Require cloog isl 0.17.0
2011-07-21 Tobias Grosser <tobias@grosser.es>
* configure: Regenerated.
* config/cloog.m4: Do not define CLOOG_ORG
2012-06-29 Steven Bosscher <steven@gcc.gnu.org>
* configure.ac: Skip C if explicitly selected.
* configure: Regenerate.
2012-06-28 Christophe Lyon <christophe.lyon@st.com>
* configure.ac (CFLAGS_FOR_TARGET, CXXFLAGS_FOR_TARGET): Make sure
they contain -O2.
* configure: Regenerate.
2012-06-20 Jason Merrill <jason@redhat.com>
* 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 <hainque@adacore.com>
* 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 <nickc@redhat.com>
Paul Smith <psmith@gnu.org>
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 <jb@gcc.gnu.org>
* configure.ac: Bump minimum MPFR version to 2.4.0.
* configure: Regenerated.
2012-05-01 Richard Henderson <rth@redhat.com>
* Makefile.def (libatomic): New target_module.
* configure.ac (target_libraries): Add libatomic.
(noconfigdirs): Check if libatomic is supported.
* Makefile.in, configure: Rebuild.
2012-05-15 H.J. Lu <hongjiu.lu@intel.com> 2012-05-15 H.J. Lu <hongjiu.lu@intel.com>
Merge upstream change Merge upstream change

28
Makefile.def
View File

@ -61,13 +61,14 @@ host_modules= { module= mpfr; lib_path=.libs; bootstrap=true;
host_modules= { module= mpc; lib_path=.libs; bootstrap=true; host_modules= { module= mpc; lib_path=.libs; bootstrap=true;
extra_configure_flags='--disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@'; extra_configure_flags='--disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@';
no_install= true; }; no_install= true; };
host_modules= { module= ppl; lib_path=src/.libs; bootstrap=true; host_modules= { module= isl; lib_path=.libs; bootstrap=true;
extra_configure_flags='--disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/'; extra_configure_flags='--disable-shared @extra_isl_gmp_configure_flags@';
extra_make_flags='V=1';
no_install= true; }; no_install= true; };
host_modules= { module= cloog; 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-ppl'; extra_configure_flags='--disable-shared --with-gmp=system --with-bits=gmp --with-isl=system';
extra_exports='CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS; '; extra_exports='CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS; ';
extra_make_flags='CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"'; extra_make_flags='CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1';
no_install= true; }; no_install= true; };
host_modules= { module= libelf; lib_path=.libs; bootstrap=true; host_modules= { module= libelf; lib_path=.libs; bootstrap=true;
extra_configure_flags='--disable-shared'; extra_configure_flags='--disable-shared';
@ -139,6 +140,8 @@ target_modules = { module= boehm-gc; };
target_modules = { module= rda; }; target_modules = { module= rda; };
target_modules = { module= libada; }; target_modules = { module= libada; };
target_modules = { module= libgomp; bootstrap= true; lib_path=.libs; }; target_modules = { module= libgomp; bootstrap= true; lib_path=.libs; };
target_modules = { module= libitm; lib_path=.libs; };
target_modules = { module= libatomic; lib_path=.libs; };
// These are (some of) the make targets to be done in each subdirectory. // These are (some of) the make targets to be done in each subdirectory.
// Not all; these are the ones which don't have special options. // Not all; these are the ones which don't have special options.
@ -293,7 +296,6 @@ dependencies = { module=all-gcc; on=all-gmp; };
dependencies = { module=all-gcc; on=all-intl; }; dependencies = { module=all-gcc; on=all-intl; };
dependencies = { module=all-gcc; on=all-mpfr; }; dependencies = { module=all-gcc; on=all-mpfr; };
dependencies = { module=all-gcc; on=all-mpc; }; dependencies = { module=all-gcc; on=all-mpc; };
dependencies = { module=all-gcc; on=all-ppl; };
dependencies = { module=all-gcc; on=all-cloog; }; dependencies = { module=all-gcc; on=all-cloog; };
dependencies = { module=all-gcc; on=all-build-texinfo; }; dependencies = { module=all-gcc; on=all-build-texinfo; };
dependencies = { module=all-gcc; on=all-build-bison; }; dependencies = { module=all-gcc; on=all-build-bison; };
@ -313,6 +315,7 @@ dependencies = { module=html-gcc; on=all-build-libiberty; };
dependencies = { module=install-gcc ; on=install-fixincludes; }; dependencies = { module=install-gcc ; on=install-fixincludes; };
dependencies = { module=install-gcc ; on=install-lto-plugin; }; dependencies = { module=install-gcc ; on=install-lto-plugin; };
dependencies = { module=install-strip-gcc ; on=install-strip-fixincludes; }; dependencies = { module=install-strip-gcc ; on=install-strip-fixincludes; };
dependencies = { module=install-strip-gcc ; on=install-strip-lto-plugin; };
dependencies = { module=configure-libcpp; on=configure-libiberty; hard=true; }; dependencies = { module=configure-libcpp; on=configure-libiberty; hard=true; };
dependencies = { module=configure-libcpp; on=configure-intl; }; dependencies = { module=configure-libcpp; on=configure-intl; };
@ -329,9 +332,9 @@ dependencies = { module=all-utils; on=all-libiberty; };
dependencies = { module=configure-mpfr; on=all-gmp; }; dependencies = { module=configure-mpfr; on=all-gmp; };
dependencies = { module=configure-mpc; on=all-mpfr; }; dependencies = { module=configure-mpc; on=all-mpfr; };
dependencies = { module=configure-ppl; on=all-gmp; }; dependencies = { module=configure-isl; on=all-gmp; };
dependencies = { module=configure-ppl; on=all-mpfr; }; dependencies = { module=configure-cloog; on=all-isl; };
dependencies = { module=configure-cloog; on=all-ppl; }; dependencies = { module=configure-cloog; on=all-gmp; };
// Host modules specific to gdb. // Host modules specific to gdb.
dependencies = { module=configure-gdb; on=all-intl; }; dependencies = { module=configure-gdb; on=all-intl; };
@ -471,6 +474,7 @@ dependencies = { module=all-m4; on=all-build-texinfo; };
// environment (e.g. on libstdc++). By default target modules depend // environment (e.g. on libstdc++). By default target modules depend
// on libgcc and newlib/libgloss. // on libgcc and newlib/libgloss.
lang_env_dependencies = { module=libjava; cxx=true; }; lang_env_dependencies = { module=libjava; cxx=true; };
lang_env_dependencies = { module=libitm; cxx=true; };
lang_env_dependencies = { module=newlib; no_c=true; }; lang_env_dependencies = { module=newlib; no_c=true; };
lang_env_dependencies = { module=libgloss; no_c=true; }; lang_env_dependencies = { module=libgloss; no_c=true; };
lang_env_dependencies = { module=libgcc; no_gcc=true; no_c=true; }; lang_env_dependencies = { module=libgcc; no_gcc=true; no_c=true; };
@ -512,9 +516,11 @@ dependencies = { module=configure-target-newlib; on=all-ld; };
dependencies = { module=configure-target-libgfortran; on=all-target-libquadmath; }; dependencies = { module=configure-target-libgfortran; on=all-target-libquadmath; };
languages = { language=c; gcc-check-target=check-gcc; }; languages = { language=c; gcc-check-target=check-gcc; };
languages = { language=c++; gcc-check-target="check-c++ check-c++0x"; languages = { language=c++; gcc-check-target=check-c++;
lib-check-target=check-target-libstdc++-v3; lib-check-target=check-target-libstdc++-v3;
lib-check-target=check-target-libmudflap-c++; }; lib-check-target=check-target-libmudflap-c++;
lib-check-target=check-target-libitm-c++;
lib-check-target=check-target-libgomp-c++; };
languages = { language=fortran; gcc-check-target=check-fortran; languages = { language=fortran; gcc-check-target=check-fortran;
lib-check-target=check-target-libquadmath; lib-check-target=check-target-libquadmath;
lib-check-target=check-target-libgfortran; }; lib-check-target=check-target-libgfortran; };

2190
Makefile.in
View File

File diff suppressed because it is too large Load Diff

59
Makefile.tpl
View File

@ -222,8 +222,7 @@ HOST_EXPORTS = \
HOST_LIBS="$(STAGE1_LIBS)"; export HOST_LIBS; \ HOST_LIBS="$(STAGE1_LIBS)"; export HOST_LIBS; \
GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \ GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \
GMPINC="$(HOST_GMPINC)"; export GMPINC; \ GMPINC="$(HOST_GMPINC)"; export GMPINC; \
PPLLIBS="$(HOST_PPLLIBS)"; export PPLLIBS; \ ISLINC="$(HOST_ISLINC)"; export ISLINC; \
PPLINC="$(HOST_PPLINC)"; export PPLINC; \
CLOOGLIBS="$(HOST_CLOOGLIBS)"; export CLOOGLIBS; \ CLOOGLIBS="$(HOST_CLOOGLIBS)"; export CLOOGLIBS; \
CLOOGINC="$(HOST_CLOOGINC)"; export CLOOGINC; \ CLOOGINC="$(HOST_CLOOGINC)"; export CLOOGINC; \
LIBELFLIBS="$(HOST_LIBELFLIBS)" ; export LIBELFLIBS; \ LIBELFLIBS="$(HOST_LIBELFLIBS)" ; export LIBELFLIBS; \
@ -313,9 +312,8 @@ NORMAL_TARGET_EXPORTS = \
HOST_GMPLIBS = @gmplibs@ HOST_GMPLIBS = @gmplibs@
HOST_GMPINC = @gmpinc@ HOST_GMPINC = @gmpinc@
# Where to find PPL # Where to find ISL
HOST_PPLLIBS = @ppllibs@ HOST_ISLINC = @islinc@
HOST_PPLINC = @pplinc@
# Where to find CLOOG # Where to find CLOOG
HOST_CLOOGLIBS = @clooglibs@ HOST_CLOOGLIBS = @clooglibs@
@ -425,7 +423,6 @@ TFLAGS =
STAGE_CFLAGS = $(BOOT_CFLAGS) STAGE_CFLAGS = $(BOOT_CFLAGS)
STAGE_TFLAGS = $(TFLAGS) STAGE_TFLAGS = $(TFLAGS)
STAGE_CONFIGURE_FLAGS=@stage2_werror_flag@ STAGE_CONFIGURE_FLAGS=@stage2_werror_flag@
POSTSTAGE1_CONFIGURE_FLAGS = @POSTSTAGE1_CONFIGURE_FLAGS@
[+ FOR bootstrap-stage +] [+ FOR bootstrap-stage +]
# Defaults for stage [+id+]; some are overridden below. # Defaults for stage [+id+]; some are overridden below.
@ -436,10 +433,7 @@ STAGE[+id+]_CXXFLAGS = $(CXXFLAGS)
STAGE[+id+]_CXXFLAGS = $(STAGE[+id+]_CFLAGS) STAGE[+id+]_CXXFLAGS = $(STAGE[+id+]_CFLAGS)
@endif target-libstdc++-v3-bootstrap @endif target-libstdc++-v3-bootstrap
STAGE[+id+]_TFLAGS = $(STAGE_TFLAGS) STAGE[+id+]_TFLAGS = $(STAGE_TFLAGS)
# STAGE1_CONFIGURE_FLAGS overridden below, so we can use STAGE[+id+]_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS)
# POSTSTAGE1_CONFIGURE_FLAGS here.
STAGE[+id+]_CONFIGURE_FLAGS = \
$(STAGE_CONFIGURE_FLAGS) $(POSTSTAGE1_CONFIGURE_FLAGS)
[+ ENDFOR bootstrap-stage +] [+ ENDFOR bootstrap-stage +]
# Only build the C compiler for stage1, because that is the only one that # Only build the C compiler for stage1, because that is the only one that
@ -457,9 +451,6 @@ STAGE1_LANGUAGES = @stage1_languages@
# the last argument when conflicting --enable arguments are passed. # the last argument when conflicting --enable arguments are passed.
# * Likewise, we force-disable coverage flags, since the installed # * Likewise, we force-disable coverage flags, since the installed
# compiler probably has never heard of them. # compiler probably has never heard of them.
# * Don't remove this, because above we added
# POSTSTAGE1_CONFIGURE_FLAGS to STAGE[+id+]_CONFIGURE_FLAGS, which
# we don't want for STAGE1_CONFIGURE_FLAGS.
STAGE1_CONFIGURE_FLAGS = --disable-intermodule $(STAGE1_CHECKING) \ STAGE1_CONFIGURE_FLAGS = --disable-intermodule $(STAGE1_CHECKING) \
--disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"
@ -906,11 +897,12 @@ install.all: install-no-fixedincludes
true ; \ true ; \
fi fi
# install-no-fixedincludes is used because Cygnus can not distribute # install-no-fixedincludes is used to allow the elaboration of binary packages
# the fixed header files. # suitable for distribution, where we cannot include the fixed system header
# files.
.PHONY: install-no-fixedincludes .PHONY: install-no-fixedincludes
install-no-fixedincludes: installdirs install-host-nogcc \ install-no-fixedincludes: installdirs install-host-nogcc \
install-target gcc-no-fixedincludes install-target gcc-install-no-fixedincludes
.PHONY: install-strip .PHONY: install-strip
install-strip: install-strip:
@ -1414,6 +1406,20 @@ check-target-libmudflap-c++:
@endif target-libmudflap @endif target-libmudflap
@if target-libgomp
.PHONY: check-target-libgomp-c++
check-target-libgomp-c++:
$(MAKE) RUNTESTFLAGS="$(RUNTESTFLAGS) c++.exp" check-target-libgomp
@endif target-libgomp
@if target-libitm
.PHONY: check-target-libitm-c++
check-target-libitm-c++:
$(MAKE) RUNTESTFLAGS="$(RUNTESTFLAGS) c++.exp" check-target-libitm
@endif target-libitm
# ---------- # ----------
# GCC module # GCC module
# ---------- # ----------
@ -1443,25 +1449,16 @@ check-gcc-[+language+]:
check-[+language+]: check-gcc-[+language+][+ FOR lib-check-target +] [+ lib-check-target +][+ ENDFOR lib-check-target +] check-[+language+]: check-gcc-[+language+][+ FOR lib-check-target +] [+ lib-check-target +][+ ENDFOR lib-check-target +]
[+ ENDFOR languages +] [+ ENDFOR languages +]
# Install the gcc headers files, but not the fixed include files, # The gcc part of install-no-fixedincludes, which relies on an intimate
# which Cygnus is not allowed to distribute. This rule is very # knowledge of how a number of gcc internal targets (inter)operate. Delegate.
# dependent on the workings of the gcc Makefile.in. .PHONY: gcc-install-no-fixedincludes
.PHONY: gcc-no-fixedincludes gcc-install-no-fixedincludes:
gcc-no-fixedincludes:
@if [ -f ./gcc/Makefile ]; then \ @if [ -f ./gcc/Makefile ]; then \
rm -rf gcc/tmp-include; \
mv gcc/include gcc/tmp-include 2>/dev/null; \
mkdir gcc/include; \
cp $(srcdir)/gcc/gsyslimits.h gcc/include/syslimits.h; \
touch gcc/stmp-fixinc gcc/include/fixed; \
rm -f gcc/stmp-headers gcc/stmp-int-hdrs; \
r=`${PWD_COMMAND}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \ $(HOST_EXPORTS) \
(cd ./gcc && \ (cd ./gcc \
$(MAKE) $(GCC_FLAGS_TO_PASS) install); \ && $(MAKE) $(GCC_FLAGS_TO_PASS) install-no-fixedincludes); \
rm -rf gcc/include; \
mv gcc/tmp-include gcc/include 2>/dev/null; \
else true; fi else true; fi
@endif gcc @endif gcc

34
config/ChangeLog
View File

@ -1,9 +1,43 @@
2012-08-26 Art Haas <ahaas@impactweather.com>
* cloog.m4 (CLOOG_INIT_FLAGS): Use = instead of == in test.
2012-07-04 Tristan Gingold <gingold@adacore.com>
* isl.m4 (ISL_CHECK_VERSION): Set to yes if cross-compiling.
Fix comments.
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.
2012-07-02 Richard Guenther <rguenther@suse.de>
* isl.m4 (_ISL_CHECK_CT_PROG): Omit main function header/footer.
Fix version test.
2012-07-02 Richard Guenther <rguenther@suse.de>
Michael Matz <matz@suse.de>
Tobias Grosser <tobias@grosser.es>
Sebastian Pop <sebpop@gmail.com>
* cloog.m4: Set up to work against ISL only.
* isl.m4: New file.
2012-05-29 Joseph Myers <joseph@codesourcery.com> 2012-05-29 Joseph Myers <joseph@codesourcery.com>
* mt-sde: Fix typos. * mt-sde: Fix typos.
* stdint.m4: Fix typos. * stdint.m4: Fix typos.
* tcl.m4: Fix typos. * tcl.m4: Fix typos.
2012-05-03 Olivier Hainque <hainque@adacore.com>
* mh-ppc-aix (LDFLAGS): Quote $(CC).
2012-04-03 Tristan Gingold <gingold@adacore.com> 2012-04-03 Tristan Gingold <gingold@adacore.com>
* mmap.m4: Use *vms* instead of vms*. * mmap.m4: Use *vms* instead of vms*.

165
config/cloog.m4
View File

@ -37,17 +37,6 @@ AC_DEFUN([CLOOG_INIT_FLAGS],
[--with-cloog-lib=PATH], [--with-cloog-lib=PATH],
[Specify the directory for the installed CLooG library])]) [Specify the directory for the installed CLooG library])])
AC_ARG_ENABLE(cloog-backend,
[AS_HELP_STRING(
[--enable-cloog-backend[[=BACKEND]]],
[set the CLooG BACKEND used to either isl, ppl or ppl-legacy (default)])],
[ if test "x${enableval}" = "xisl"; then
cloog_backend=isl
elif test "x${enableval}" = "xppl"; then
cloog_backend=ppl
else
cloog_backend=ppl-legacy
fi], cloog_backend=ppl-legacy)
AC_ARG_ENABLE(cloog-version-check, AC_ARG_ENABLE(cloog-version-check,
[AS_HELP_STRING( [AS_HELP_STRING(
[--disable-cloog-version-check], [--disable-cloog-version-check],
@ -74,6 +63,16 @@ AC_DEFUN([CLOOG_INIT_FLAGS],
if test "x${with_cloog_lib}" != x; then if test "x${with_cloog_lib}" != x; then
clooglibs="-L$with_cloog_lib" clooglibs="-L$with_cloog_lib"
fi fi
dnl If no --with-cloog flag was specified and there is in-tree ClooG
dnl source, set up flags to use that.
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}"
dnl Flags needed for CLOOG dnl Flags needed for CLOOG
AC_SUBST(clooglibs) AC_SUBST(clooglibs)
@ -100,163 +99,37 @@ AC_DEFUN([CLOOG_REQUESTED],
] ]
) )
# _CLOOG_ORG_PROG_ISL ()
# ------------------
# Helper for detecting CLooG.org's ISL backend.
m4_define([_CLOOG_ORG_PROG_ISL],[AC_LANG_PROGRAM(
[#include "cloog/cloog.h" ],
[cloog_version ()])])
# _CLOOG_ORG_PROG_PPL ()
# ------------------
# Helper for detecting CLooG.org's PPL backend.
m4_define([_CLOOG_ORG_PROG_PPL],[AC_LANG_PROGRAM(
[#include "cloog/cloog.h"
#include "cloog/ppl/cloog.h"],
[cloog_version ()])])
# _CLOOG_PPL_LEGACY_PROG ()
# -------------------------
# Helper for detecting CLooG-Legacy (CLooG-PPL).
m4_define([_CLOOG_PPL_LEGACY_PROG], [AC_LANG_PROGRAM(
[#include "cloog/cloog.h"],
[#ifndef CLOOG_PPL_BACKEND
choke me
#endif ])])
# CLOOG_FIND_FLAGS ()
# ------------------
# Detect the used CLooG-backend and set clooginc/clooglibs/cloog_org.
# Only look for the CLooG backend type specified in --enable-cloog-backend
AC_DEFUN([CLOOG_FIND_FLAGS],
[
AC_REQUIRE([CLOOG_INIT_FLAGS])
_cloog_saved_CFLAGS=$CFLAGS
_cloog_saved_CPPFLAGS=$CPPFLAGS
_cloog_saved_LDFLAGS=$LDFLAGS
_cloog_saved_LIBS=$LIBS
_cloogorginc="-DCLOOG_INT_GMP -DCLOOG_ORG"
dnl clooglibs & clooginc may have been initialized by CLOOG_INIT_FLAGS.
CFLAGS="${CFLAGS} ${clooginc} ${gmpinc}"
CPPFLAGS="${CPPFLAGS} ${_cloogorginc}"
LDFLAGS="${LDFLAGS} ${clooglibs}"
case $cloog_backend in
"ppl-legacy")
CFLAGS="${CFLAGS} ${pplinc}"
LDFLAGS="${LDFLAGS} ${ppllibs}"
AC_CACHE_CHECK([for installed CLooG PPL Legacy], [gcc_cv_cloog_type],
[LIBS="-lcloog ${_cloog_saved_LIBS}"
AC_LINK_IFELSE([_CLOOG_PPL_LEGACY_PROG], [gcc_cv_cloog_type="PPL Legacy"],
[gcc_cv_cloog_type=no])])
;;
"isl")
AC_CACHE_CHECK([for installed CLooG ISL], [gcc_cv_cloog_type],
[LIBS="-lcloog-isl ${_cloog_saved_LIBS}"
AC_LINK_IFELSE([_CLOOG_ORG_PROG_ISL], [gcc_cv_cloog_type="ISL"],
[gcc_cv_cloog_type=no])])
;;
"ppl")
CFLAGS="${CFLAGS} ${pplinc}"
LDFLAGS="${LDFLAGS} ${ppllibs}"
AC_CACHE_CHECK([for installed CLooG PPL], [gcc_cv_cloog_type],
[LIBS="-lcloog-ppl ${_cloog_saved_LIBS}"
AC_LINK_IFELSE([_CLOOG_ORG_PROG_PPL], [gcc_cv_cloog_type="PPL"],
[gcc_cv_cloog_type=no])])
;;
*)
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
]
)
# _CLOOG_CHECK_CT_PROG(MAJOR, MINOR, REVISION) # _CLOOG_CHECK_CT_PROG(MAJOR, MINOR, REVISION)
# -------------------------------------------- # --------------------------------------------
# Helper for verifying CLooG's compile time version. # Helper for verifying CLooG's compile time version.
m4_define([_CLOOG_CHECK_CT_PROG],[AC_LANG_PROGRAM( m4_define([_CLOOG_CHECK_CT_PROG],[AC_LANG_PROGRAM(
[#include "cloog/cloog.h"], [#include "cloog/version.h"],
[#if CLOOG_VERSION_MAJOR != $1 \ [#if CLOOG_VERSION_MAJOR != $1 \
|| CLOOG_VERSION_MINOR != $2 \ || CLOOG_VERSION_MINOR != $2 \
|| CLOOG_VERSION_REVISION < $3 || CLOOG_VERSION_REVISION < $3
choke me choke me
#endif])]) #endif])])
# _CLOOG_CHECK_RT_PROG ()
# -----------------------
# Helper for verifying that CLooG's compile time version
# matches the run time version.
m4_define([_CLOOG_CHECK_RT_PROG],[AC_LANG_PROGRAM(
[#include "cloog/cloog.h"],
[if ((cloog_version_major () != CLOOG_VERSION_MAJOR)
&& (cloog_version_minor () != CLOOG_VERSION_MINOR)
&& (cloog_version_revision () != CLOOG_VERSION_REVISION))
{
return 1;
}])])
# CLOOG_CHECK_VERSION CLOOG_CHECK_VERSION (MAJOR, MINOR, REVISION) # CLOOG_CHECK_VERSION CLOOG_CHECK_VERSION (MAJOR, MINOR, REVISION)
# ---------------------------------------------------------------- # ----------------------------------------------------------------
# Test the found CLooG to be exact of version MAJOR.MINOR and at least # Test the found CLooG to be exact of version MAJOR.MINOR and at least
# REVISION. # REVISION.
# If we're using the old CLooG-PPL (Legacy), the old version check will
# be executed (Ignores the provided version information).
AC_DEFUN([CLOOG_CHECK_VERSION], AC_DEFUN([CLOOG_CHECK_VERSION],
[ [
AC_REQUIRE([CLOOG_FIND_FLAGS]) AC_REQUIRE([CLOOG_INIT_FLAGS])
if test "${ENABLE_CLOOG_CHECK}" = yes ; then if test "${ENABLE_CLOOG_CHECK}" = yes ; then
_cloog_saved_CFLAGS=$CFLAGS _cloog_saved_CFLAGS=$CFLAGS
_cloog_saved_LDFLAGS=$LDFLAGS _cloog_saved_LDFLAGS=$LDFLAGS
CFLAGS="${_cloog_saved_CFLAGS} ${clooginc} ${pplinc} ${gmpinc}" CFLAGS="${_cloog_saved_CFLAGS} ${clooginc} ${islinc} ${gmpinc}"
LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}" LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${isllibs} ${gmplib}"
if test "${cloog_org}" = yes ; then
AC_CACHE_CHECK([for version $1.$2.$3 of CLooG], AC_CACHE_CHECK([for version $1.$2.$3 of CLooG],
[gcc_cv_cloog_ct_0_14_0], [gcc_cv_cloog],
[AC_COMPILE_IFELSE([_CLOOG_CHECK_CT_PROG($1,$2,$3)], [AC_COMPILE_IFELSE([_CLOOG_CHECK_CT_PROG($1,$2,$3)],
[gcc_cv_cloog_ct_0_14_0=yes], [gcc_cv_cloog=yes],
[gcc_cv_cloog_ct_0_14_0=no])]) [gcc_cv_cloog=no])])
elif test "${cloog_org}" = no ; then
AC_CACHE_CHECK([for version 0.15.5 (or later revision) of CLooG],
[gcc_cv_cloog_ct_0_15_5],
[AC_COMPILE_IFELSE([_CLOOG_CHECK_CT_PROG(0,15,5)],
[AC_COMPILE_IFELSE([_CLOOG_CHECK_CT_PROG(0,15,9)],
[gcc_cv_cloog_ct_0_15_5=yes],
[gcc_cv_cloog_ct_0_15_5="buggy but acceptable"])],
[gcc_cv_cloog_ct_0_15_5=no])])
fi
CFLAGS=$_cloog_saved_CFLAGS CFLAGS=$_cloog_saved_CFLAGS
LDFLAGS=$_cloog_saved_LDFLAGS LDFLAGS=$_cloog_saved_LDFLAGS
@ -272,9 +145,7 @@ AC_DEFUN([CLOOG_IF_FAILED],
[ [
CLOOG_REQUESTED([graphite_requested=yes], [graphite_requested=no]) CLOOG_REQUESTED([graphite_requested=yes], [graphite_requested=no])
if test "${gcc_cv_cloog_ct_0_14_0}" = no \ if test "${gcc_cv_cloog}" = no ; then
|| test "${gcc_cv_cloog_rt_0_14_0}" = no \
|| test "${gcc_cv_cloog_ct_0_15_5}" = no; then
clooglibs= clooglibs=
clooginc= clooginc=
fi fi

163
config/isl.m4 Normal file
View File

@ -0,0 +1,163 @@
# This file is part of GCC.
#
# GCC is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free
# Software Foundation; either version 3, or (at your option) any later
# version.
#
# GCC is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with GCC; see the file COPYING3. If not see
# <http://www.gnu.org/licenses/>.
#
# Contributed by Richard Guenther <rguenther@suse.de>
# Based on cloog.m4
# ISL_INIT_FLAGS ()
# -------------------------
# Provide configure switches for ISL support.
# Initialize isllibs/islinc according to the user input.
AC_DEFUN([ISL_INIT_FLAGS],
[
AC_ARG_WITH(isl,
[AS_HELP_STRING(
[--with-isl=PATH],
[Specify prefix directory for the installed ISL package.
Equivalent to --with-isl-include=PATH/include
plus --with-isl-lib=PATH/lib])])
AC_ARG_WITH([isl-include],
[AS_HELP_STRING(
[--with-isl-include=PATH],
[Specify directory for installed ISL include files])])
AC_ARG_WITH([isl-lib],
[AS_HELP_STRING(
[--with-isl-lib=PATH],
[Specify the directory for the installed ISL library])])
AC_ARG_ENABLE(isl-version-check,
[AS_HELP_STRING(
[--disable-isl-version-check],
[disable check for ISL version])],
ENABLE_ISL_CHECK=$enableval,
ENABLE_ISL_CHECK=yes)
# 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
dnl If no --with-isl flag was specified and there is in-tree ISL
dnl source, set up flags to use that and skip any version tests
dnl as we cannot run them before building ISL.
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
isllibs="${isllibs} -lisl"
dnl Flags needed for ISL
AC_SUBST(isllibs)
AC_SUBST(islinc)
]
)
# ISL_REQUESTED (ACTION-IF-REQUESTED, ACTION-IF-NOT)
# ----------------------------------------------------
# Provide actions for failed ISL detection.
AC_DEFUN([ISL_REQUESTED],
[
AC_REQUIRE([ISL_INIT_FLAGS])
if test "x${with_isl}" = xno; then
$2
elif test "x${with_isl}" != x \
|| test "x${with_isl_include}" != x \
|| test "x${with_isl_lib}" != x ; then
$1
else
$2
fi
]
)
# _ISL_CHECK_CT_PROG(MAJOR, MINOR)
# --------------------------------------------
# Helper for verifying ISL compile time version.
m4_define([_ISL_CHECK_CT_PROG],[AC_LANG_PROGRAM(
[#include <isl/version.h>
#include <string.h>],
[if (strncmp (isl_version (), "isl-$1.$2", strlen ("isl-$1.$2")) != 0)
return 1;
])])
# ISL_CHECK_VERSION ISL_CHECK_VERSION (MAJOR, MINOR)
# ----------------------------------------------------------------
# Test the found ISL to be exact of version MAJOR.MINOR and at least
# REVISION.
AC_DEFUN([ISL_CHECK_VERSION],
[
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
AC_CACHE_CHECK([for version $1.$2 of ISL],
[gcc_cv_isl],
[AC_RUN_IFELSE([_ISL_CHECK_CT_PROG($1,$2)],
[gcc_cv_isl=yes],
[gcc_cv_isl=no],
[gcc_cv_isl=yes])])
CFLAGS=$_isl_saved_CFLAGS
LDFLAGS=$_isl_saved_LDFLAGS
LIBS=$_isl_saved_LIBS
fi
]
)
# ISL_IF_FAILED (ACTION-IF-FAILED)
# ----------------------------------
# Executes ACTION-IF-FAILED, if GRAPHITE was requested and
# the checks failed.
AC_DEFUN([ISL_IF_FAILED],
[
ISL_REQUESTED([graphite_requested=yes], [graphite_requested=no])
if test "${gcc_cv_isl}" = no ; then
isllibs=
islinc=
fi
if test "${graphite_requested}" = yes \
&& test "x${isllibs}" = x \
&& test "x${islinc}" = x ; then
$1
fi
]
)

702
configure vendored
View File

@ -556,7 +556,6 @@ enable_option_checking=no
ac_subst_vars='LTLIBOBJS ac_subst_vars='LTLIBOBJS
LIBOBJS LIBOBJS
compare_exclusions compare_exclusions
POSTSTAGE1_CONFIGURE_FLAGS
stage2_werror_flag stage2_werror_flag
stage1_checking stage1_checking
stage1_cflags stage1_cflags
@ -646,12 +645,13 @@ stage1_languages
extra_host_libiberty_configure_flags extra_host_libiberty_configure_flags
clooginc clooginc
clooglibs clooglibs
pplinc islinc
ppllibs isllibs
poststage1_ldflags poststage1_ldflags
poststage1_libs poststage1_libs
stage1_libs stage1_libs
stage1_ldflags stage1_ldflags
extra_isl_gmp_configure_flags
extra_mpc_mpfr_configure_flags extra_mpc_mpfr_configure_flags
extra_mpc_gmp_configure_flags extra_mpc_gmp_configure_flags
extra_mpfr_configure_flags extra_mpfr_configure_flags
@ -752,8 +752,6 @@ enable_libada
enable_libssp enable_libssp
enable_static_libjava enable_static_libjava
enable_bootstrap enable_bootstrap
enable_build_with_cxx
enable_build_poststage1_with_cxx
with_mpc with_mpc
with_mpc_include with_mpc_include
with_mpc_lib with_mpc_lib
@ -770,14 +768,13 @@ with_stage1_ldflags
with_stage1_libs with_stage1_libs
with_boot_libs with_boot_libs
with_boot_ldflags with_boot_ldflags
with_ppl with_isl
with_ppl_include with_isl_include
with_ppl_lib with_isl_lib
enable_ppl_version_check enable_isl_version_check
with_cloog with_cloog
with_cloog_include with_cloog_include
with_cloog_lib with_cloog_lib
enable_cloog_backend
enable_cloog_version_check enable_cloog_version_check
enable_lto enable_lto
enable_stage1_languages enable_stage1_languages
@ -1471,14 +1468,8 @@ Optional Features:
--enable-static-libjava[=ARG] --enable-static-libjava[=ARG]
build static libjava [default=no] build static libjava [default=no]
--enable-bootstrap enable bootstrapping [yes if native build] --enable-bootstrap enable bootstrapping [yes if native build]
--enable-build-with-cxx build with C++ compiler instead of C compiler --disable-isl-version-check
--enable-build-poststage1-with-cxx disable check for ISL version
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-cloog-version-check --disable-cloog-version-check
disable check for CLooG version disable check for CLooG version
--enable-lto enable link time optimization support --enable-lto enable link time optimization support
@ -1530,12 +1521,12 @@ Optional Packages:
--with-boot-libs=LIBS libraries for stage2 and later --with-boot-libs=LIBS libraries for stage2 and later
--with-boot-ldflags=FLAGS --with-boot-ldflags=FLAGS
linker flags for stage2 and later 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 package. Equivalent to
--with-ppl-include=PATH/include plus --with-isl-include=PATH/include plus
--with-ppl-lib=PATH/lib --with-isl-lib=PATH/lib
--with-ppl-include=PATH specify directory for installed PPL include files --with-isl-include=PATH Specify directory for installed ISL include files
--with-ppl-lib=PATH specify directory for the installed PPL library --with-isl-lib=PATH Specify the directory for the installed ISL library
--with-cloog=PATH Specify prefix directory for the installed CLooG-PPL --with-cloog=PATH Specify prefix directory for the installed CLooG-PPL
package. Equivalent to package. Equivalent to
--with-cloog-include=PATH/include plus --with-cloog-include=PATH/include plus
@ -1820,6 +1811,48 @@ fi
return $ac_retval return $ac_retval
} # ac_fn_c_try_link } # 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 cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. 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 # 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 # these tools are built for the host environment
# Note, the powerpc-eabi build depends on sim occurring before gdb in order to # 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-libgloss \
target-newlib \ target-newlib \
target-libgomp \ target-libgomp \
target-libatomic \
target-libitm \ target-libitm \
target-libstdc++-v3 \ target-libstdc++-v3 \
target-libmudflap \ target-libmudflap \
@ -2869,7 +2903,7 @@ case "${ENABLE_GOLD}" in
*-*-elf* | *-*-sysv4* | *-*-unixware* | *-*-eabi* | hppa*64*-*-hpux* \ *-*-elf* | *-*-sysv4* | *-*-unixware* | *-*-eabi* | hppa*64*-*-hpux* \
| *-*-linux* | frv-*-uclinux* | *-*-irix5* | *-*-irix6* \ | *-*-linux* | frv-*-uclinux* | *-*-irix5* | *-*-irix6* \
| *-*-netbsd* | *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* \ | *-*-netbsd* | *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* \
| *-*-solaris2* | *-*-nto* | *-*-nacl*) | *-*-solaris2* | *-*-nto*)
case "${target}" in case "${target}" in
*-*-linux*aout* | *-*-linux*oldld*) *-*-linux*aout* | *-*-linux*oldld*)
;; ;;
@ -3064,6 +3098,25 @@ if test x$enable_libgomp = x ; then
esac esac
fi 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. # Disable libitm on unsupported systems.
if test -d ${srcdir}/libitm; then if test -d ${srcdir}/libitm; then
if test x$enable_libitm = x; then if test x$enable_libitm = x; then
@ -3446,9 +3499,6 @@ case "${target}" in
tic54x-*-*) tic54x-*-*)
noconfigdirs="$noconfigdirs target-libgloss gdb" noconfigdirs="$noconfigdirs target-libgloss gdb"
;; ;;
cr16-*-*)
noconfigdirs="$noconfigdirs gdb"
;;
d10v-*-*) d10v-*-*)
noconfigdirs="$noconfigdirs target-libgloss" noconfigdirs="$noconfigdirs target-libgloss"
;; ;;
@ -3498,7 +3548,8 @@ case "${target}" in
noconfigdirs="$noconfigdirs libgui itcl ld" noconfigdirs="$noconfigdirs libgui itcl ld"
;; ;;
ia64*-*-*vms*) ia64*-*-*vms*)
noconfigdirs="$noconfigdirs libgui itcl" # No ld support yet.
noconfigdirs="$noconfigdirs libgui itcl ld"
;; ;;
i[3456789]86-w64-mingw*) i[3456789]86-w64-mingw*)
;; ;;
@ -3662,9 +3713,6 @@ fi
*-mingw*) *-mingw*)
host_makefile_frag="config/mh-mingw" host_makefile_frag="config/mh-mingw"
;; ;;
*-interix*)
host_makefile_frag="config/mh-interix"
;;
hppa*-hp-hpux10*) hppa*-hp-hpux10*)
host_makefile_frag="config/mh-pa-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 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 # Used for setting $lt_cv_objdir
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
$as_echo_n "checking for objdir... " >&6; } $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" 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_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_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 # 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 # 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 # but it would be included on the link line in the version check below
@ -5327,7 +5358,7 @@ int
main () main ()
{ {
#if MPFR_VERSION < MPFR_VERSION_NUM(2,3,1) #if MPFR_VERSION < MPFR_VERSION_NUM(2,4,0)
choke me choke me
#endif #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 library versions listed in the error message below should match
# the HARD-minimums enforced above. # the HARD-minimums enforced above.
if test x$have_gmp != xyes; then 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 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 locations. Source code for these libraries can be found at
their respective hosting sites as well as 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. # Allow host libstdc++ to be specified for static linking with PPL.
# Check whether --with-host-libstdcxx was given. # Check whether --with-host-libstdcxx was given.
@ -5570,160 +5602,155 @@ fi
# Check for PPL # Check for ISL
ppllibs=
pplinc=
pwllib=
# Check whether --with-ppl was given. # Check whether --with-isl was given.
if test "${with_ppl+set}" = set; then : if test "${with_isl+set}" = set; then :
withval=$with_ppl; withval=$with_isl;
fi fi
# Check whether --with-ppl-include was given. # Check whether --with-isl-include was given.
if test "${with_ppl_include+set}" = set; then : if test "${with_isl_include+set}" = set; then :
withval=$with_ppl_include; withval=$with_isl_include;
fi fi
# Check whether --with-ppl-lib was given. # Check whether --with-isl-lib was given.
if test "${with_ppl_lib+set}" = set; then : if test "${with_isl_lib+set}" = set; then :
withval=$with_ppl_lib; withval=$with_isl_lib;
fi fi
# Check whether --enable-ppl-version-check was given. # Check whether --enable-isl-version-check was given.
if test "${enable_ppl_version_check+set}" = set; then : if test "${enable_isl_version_check+set}" = set; then :
enableval=$enable_ppl_version_check; enableval=$enable_isl_version_check; ENABLE_ISL_CHECK=$enableval
else
ENABLE_ISL_CHECK=yes
fi fi
case $with_ppl in # Initialize isllibs and islinc.
yes | no | "") case $with_isl in
no)
isllibs=
islinc=
;;
"" | yes)
;; ;;
*) *)
ppllibs="-L$with_ppl/lib" isllibs="-L$with_isl/lib"
pplinc="-I$with_ppl/include $pplinc" islinc="-I$with_isl/include"
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 esac
if test "x${with_isl_include}" != x ; then
if test x"$with_ppl_include" != x; then islinc="-I$with_isl_include"
pplinc="-I$with_ppl_include $pplinc" fi
with_ppl=yes 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 fi
if test "x$with_ppl_lib" != x; then isllibs="${isllibs} -lisl"
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" if test "x$with_isl" != "xno"; then
{ $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 "${ENABLE_ISL_CHECK}" = yes ; then
if test "${ac_cv_lib_pwl_PWL_handle_timeout+set}" = set; 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 $as_echo_n "(cached) " >&6
else else
ac_check_lib_save_LIBS=$LIBS if test "$cross_compiling" = yes; then :
LIBS="-lpwl $LIBS" gcc_cv_isl=yes
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 ();
int
main ()
{
return PWL_handle_timeout ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_pwl_PWL_handle_timeout=yes
else else
ac_cv_lib_pwl_PWL_handle_timeout=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
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
LIBS="$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 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
#include "ppl_c.h" #include <isl/version.h>
#include <string.h>
int int
main () main ()
{ {
if (strncmp (isl_version (), "isl-0.10", strlen ("isl-0.10")) != 0)
#if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 11 return 1;
choke me
#endif
; ;
return 0; return 0;
} }
_ACEOF _ACEOF
if ac_fn_c_try_compile "$LINENO"; then : if ac_fn_c_try_run "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 gcc_cv_isl=yes
$as_echo "yes" >&6; }
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 gcc_cv_isl=no
$as_echo "no" >&6; }; ppllibs= ; pplinc= ; with_ppl=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS="$saved_CFLAGS"
fi fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi fi
# Flags needed for PPL fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_isl" >&5
$as_echo "$gcc_cv_isl" >&6; }
CFLAGS=$_isl_saved_CFLAGS
LDFLAGS=$_isl_saved_LDFLAGS
LIBS=$_isl_saved_LIBS
fi
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
if test "${gcc_cv_isl}" = no ; then
isllibs=
islinc=
fi
if test "${graphite_requested}" = yes \
&& test "x${isllibs}" = x \
&& test "x${islinc}" = x ; then
as_fn_error "Unable to find a usable ISL. See config.log for details." "$LINENO" 5
fi
fi
# Check for CLOOG # Check for CLOOG
# Check whether --with-cloog was given. # Check whether --with-cloog was given.
if test "${with_cloog+set}" = set; then : if test "${with_cloog+set}" = set; then :
withval=$with_cloog; withval=$with_cloog;
@ -5742,19 +5769,6 @@ if test "${with_cloog_lib+set}" = set; then :
fi 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. # Check whether --enable-cloog-version-check was given.
if test "${enable_cloog_version_check+set}" = set; then : if test "${enable_cloog_version_check+set}" = set; then :
enableval=$enable_cloog_version_check; ENABLE_CLOOG_CHECK=$enableval enableval=$enable_cloog_version_check; ENABLE_CLOOG_CHECK=$enableval
@ -5782,179 +5796,23 @@ fi
if test "x${with_cloog_lib}" != x; then if test "x${with_cloog_lib}" != x; then
clooglibs="-L$with_cloog_lib" clooglibs="-L$with_cloog_lib"
fi fi
if test "x${clooginc}" = x && test "x${clooglibs}" = x \
&& test -d ${srcdir}/cloog; then
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
fi
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"' ' clooglibs='-L$$r/$(HOST_SUBDIR)/cloog/'"$lt_cv_objdir"' '
clooginc='-I$$r/$(HOST_SUBDIR)/cloog/include -I$$s/cloog/include ' clooginc='-I$$r/$(HOST_SUBDIR)/cloog/include -I$$s/cloog/include -I'${srcdir}'/cloog/include '
fi fi
if test "x$with_cloog" != "xno"; then
clooginc="-DCLOOG_INT_GMP ${clooginc}"
clooglibs="${clooglibs} -lcloog-isl ${isllibs}"
_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}" if test "x$isllibs" = x && test "x$islinc" = x; then
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= clooglibs=
clooginc= clooginc=
cloog_org= elif test "x$with_cloog" != "xno"; then
;;
esac
LIBS=$_cloog_saved_LIBS
CFLAGS=$_cloog_saved_CFLAGS
CPPFLAGS=$_cloog_saved_CPPFLAGS
LDFLAGS=$_cloog_saved_LDFLAGS
@ -5962,24 +5820,23 @@ $as_echo "$gcc_cv_cloog_type" >&6; }
_cloog_saved_CFLAGS=$CFLAGS _cloog_saved_CFLAGS=$CFLAGS
_cloog_saved_LDFLAGS=$LDFLAGS _cloog_saved_LDFLAGS=$LDFLAGS
CFLAGS="${_cloog_saved_CFLAGS} ${clooginc} ${pplinc} ${gmpinc}" CFLAGS="${_cloog_saved_CFLAGS} ${clooginc} ${islinc} ${gmpinc}"
LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}" LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${isllibs} ${gmplib}"
if test "${cloog_org}" = yes ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17.0 of CLooG" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5 $as_echo_n "checking for version 0.17.0 of CLooG... " >&6; }
$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; } if test "${gcc_cv_cloog+set}" = set; then :
if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
#include "cloog/cloog.h" #include "cloog/version.h"
int int
main () main ()
{ {
#if CLOOG_VERSION_MAJOR != 0 \ #if CLOOG_VERSION_MAJOR != 0 \
|| CLOOG_VERSION_MINOR != 16 \ || CLOOG_VERSION_MINOR != 17 \
|| CLOOG_VERSION_REVISION < 1 || CLOOG_VERSION_REVISION < 0
choke me choke me
#endif #endif
; ;
@ -5987,65 +5844,14 @@ main ()
} }
_ACEOF _ACEOF
if ac_fn_c_try_compile "$LINENO"; then : if ac_fn_c_try_compile "$LINENO"; then :
gcc_cv_cloog_ct_0_14_0=yes gcc_cv_cloog=yes
else else
gcc_cv_cloog_ct_0_14_0=no gcc_cv_cloog=no
fi fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog_ct_0_14_0" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog" >&5
$as_echo "$gcc_cv_cloog_ct_0_14_0" >&6; } $as_echo "$gcc_cv_cloog" >&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
CFLAGS=$_cloog_saved_CFLAGS CFLAGS=$_cloog_saved_CFLAGS
LDFLAGS=$_cloog_saved_LDFLAGS 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 \ if test "${gcc_cv_cloog}" = no ; then
|| test "${gcc_cv_cloog_rt_0_14_0}" = no \
|| test "${gcc_cv_cloog_ct_0_15_5}" = no; then
clooglibs= clooglibs=
clooginc= clooginc=
fi fi
@ -6086,6 +5890,12 @@ $as_echo "$gcc_cv_cloog_ct_0_15_5" >&6; }
fi 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 for LTO support.
# Check whether --enable-lto was given. # Check whether --enable-lto was given.
if test "${enable_lto+set}" = set; then : 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, stage1_languages=,c,
# Target libraries that we bootstrap. # Target libraries that we bootstrap.
@ -6184,15 +5994,14 @@ if test -d ${srcdir}/gcc; then
;; ;;
esac esac
# If bootstrapping, then using --enable-build-with-cxx or # If bootstrapping, C++ must be enabled.
# --enable-build-poststage1-with-cxx requires enabling C++. case ",$enable_languages,:$enable_bootstrap" in
case ",$enable_languages,:,$ENABLE_BUILD_WITH_CXX,$ENABLE_BUILD_POSTSTAGE1_WITH_CXX,:$enable_bootstrap" in *,c++,*:*) ;;
*,c++,*:*:*) ;; *:yes)
*:*,yes,*:yes)
if test -f ${srcdir}/gcc/cp/config-lang.in; then if test -f ${srcdir}/gcc/cp/config-lang.in; then
enable_languages="${enable_languages},c++" enable_languages="${enable_languages},c++"
else 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 fi
;; ;;
esac esac
@ -6287,16 +6096,16 @@ if test -d ${srcdir}/gcc; then
fi fi
if test "$language" = "c++"; then if test "$language" = "c++"; then
if test "$ENABLE_BUILD_WITH_CXX" = "yes" \
|| test "$ENABLE_BUILD_POSTSTAGE1_WITH_CXX" = "yes"; then
boot_language=yes boot_language=yes
fi fi
fi
case ,${enable_languages}, in case ,${enable_languages}, in
*,${language},*) *,${language},*)
# Language was explicitly selected; include it. # Language was explicitly selected; include it
# unless it is C, which is enabled by default.
if test "$language" != "c"; then
add_this_lang=yes add_this_lang=yes
fi
;; ;;
*,all,*) *,all,*)
# 'all' was selected, select it if it is a default language # 'all' was selected, select it if it is a default language
@ -6472,6 +6281,14 @@ case ,${enable_languages},:${enable_objc_gc} in
;; ;;
esac 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, # Remove the entries in $skipdirs and $noconfigdirs from $configdirs,
# $build_configdirs and $target_configdirs. # $build_configdirs and $target_configdirs.
# If we have the source for $noconfigdirs entries, add them to $notsupp. # 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_arflags_for_target=" -X32_64"
extra_nmflags_for_target=" -B -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 esac
alphaieee_frag=/dev/null alphaieee_frag=/dev/null
@ -7211,7 +7024,7 @@ do
case $lib in case $lib in
mpc | mpfr | gmp | ppl | cloog) mpc | mpfr | gmp | cloog)
# If we're processing --with-$lib, --with-$lib-include or # If we're processing --with-$lib, --with-$lib-include or
# --with-$lib-lib, for one of the libs above, and target is # --with-$lib-lib, for one of the libs above, and target is
# different from host, don't pass the current argument to any # different from host, don't pass the current argument to any
@ -14374,43 +14187,6 @@ case $build in
esac ;; esac ;;
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. # Enable --enable-checking in stage1 of the compiler.
@ -14445,15 +14221,6 @@ case ${enable_werror} in
esac 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. # Specify what files to not compare during bootstrap.
compare_exclusions="gcc/cc*-checksum\$(objext) | gcc/ada/*tools/*" compare_exclusions="gcc/cc*-checksum\$(objext) | gcc/ada/*tools/*"
@ -14461,9 +14228,6 @@ case "$target" in
hppa*64*-*-hpux*) ;; hppa*64*-*-hpux*) ;;
hppa*-*-hpux*) compare_exclusions="gcc/cc*-checksum\$(objext) | */libgcc/lib2funcs* | gcc/ada/*tools/*" ;; hppa*-*-hpux*) compare_exclusions="gcc/cc*-checksum\$(objext) | */libgcc/lib2funcs* | gcc/ada/*tools/*" ;;
esac esac
case " $configdirs " in
*" ppl "*) compare_exclusions="$compare_exclusions | ppl/src/ppl-config.o" ;;
esac
ac_config_files="$ac_config_files Makefile" ac_config_files="$ac_config_files Makefile"

235
configure.ac
View File

@ -28,6 +28,7 @@ m4_include([ltoptions.m4])
m4_include([ltsugar.m4]) m4_include([ltsugar.m4])
m4_include([ltversion.m4]) m4_include([ltversion.m4])
m4_include([lt~obsolete.m4]) m4_include([lt~obsolete.m4])
m4_include([config/isl.m4])
m4_include([config/cloog.m4]) m4_include([config/cloog.m4])
AC_INIT(move-if-change) AC_INIT(move-if-change)
@ -132,7 +133,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 # 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 # these tools are built for the host environment
# Note, the powerpc-eabi build depends on sim occurring before gdb in order to # Note, the powerpc-eabi build depends on sim occurring before gdb in order to
@ -154,6 +155,7 @@ target_libraries="target-libgcc \
target-libgloss \ target-libgloss \
target-newlib \ target-newlib \
target-libgomp \ target-libgomp \
target-libatomic \
target-libitm \ target-libitm \
target-libstdc++-v3 \ target-libstdc++-v3 \
target-libmudflap \ target-libmudflap \
@ -313,7 +315,7 @@ case "${ENABLE_GOLD}" in
*-*-elf* | *-*-sysv4* | *-*-unixware* | *-*-eabi* | hppa*64*-*-hpux* \ *-*-elf* | *-*-sysv4* | *-*-unixware* | *-*-eabi* | hppa*64*-*-hpux* \
| *-*-linux* | frv-*-uclinux* | *-*-irix5* | *-*-irix6* \ | *-*-linux* | frv-*-uclinux* | *-*-irix5* | *-*-irix6* \
| *-*-netbsd* | *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* \ | *-*-netbsd* | *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* \
| *-*-solaris2* | *-*-nto* | *-*-nacl*) | *-*-solaris2* | *-*-nto*)
case "${target}" in case "${target}" in
*-*-linux*aout* | *-*-linux*oldld*) *-*-linux*aout* | *-*-linux*oldld*)
;; ;;
@ -493,6 +495,22 @@ if test x$enable_libgomp = x ; then
esac esac
fi fi
# Disable libatomic on unsupported systems.
if test -d ${srcdir}/libatomic; then
if test x$enable_libatomic = x; then
AC_MSG_CHECKING([for libatomic support])
if (srcdir=${srcdir}/libatomic; \
. ${srcdir}/configure.tgt; \
test -n "$UNSUPPORTED")
then
AC_MSG_RESULT([no])
noconfigdirs="$noconfigdirs target-libatomic"
else
AC_MSG_RESULT([yes])
fi
fi
fi
# Disable libitm on unsupported systems. # Disable libitm on unsupported systems.
if test -d ${srcdir}/libitm; then if test -d ${srcdir}/libitm; then
if test x$enable_libitm = x; then if test x$enable_libitm = x; then
@ -872,9 +890,6 @@ case "${target}" in
tic54x-*-*) tic54x-*-*)
noconfigdirs="$noconfigdirs target-libgloss gdb" noconfigdirs="$noconfigdirs target-libgloss gdb"
;; ;;
cr16-*-*)
noconfigdirs="$noconfigdirs gdb"
;;
d10v-*-*) d10v-*-*)
noconfigdirs="$noconfigdirs target-libgloss" noconfigdirs="$noconfigdirs target-libgloss"
;; ;;
@ -924,7 +939,8 @@ case "${target}" in
noconfigdirs="$noconfigdirs libgui itcl ld" noconfigdirs="$noconfigdirs libgui itcl ld"
;; ;;
ia64*-*-*vms*) ia64*-*-*vms*)
noconfigdirs="$noconfigdirs libgui itcl" # No ld support yet.
noconfigdirs="$noconfigdirs libgui itcl ld"
;; ;;
i[[3456789]]86-w64-mingw*) i[[3456789]]86-w64-mingw*)
;; ;;
@ -1069,9 +1085,6 @@ case "${host}" in
*-mingw*) *-mingw*)
host_makefile_frag="config/mh-mingw" host_makefile_frag="config/mh-mingw"
;; ;;
*-interix*)
host_makefile_frag="config/mh-interix"
;;
hppa*-hp-hpux10*) hppa*-hp-hpux10*)
host_makefile_frag="config/mh-pa-hpux10" host_makefile_frag="config/mh-pa-hpux10"
;; ;;
@ -1191,20 +1204,6 @@ case "$have_compiler:$host:$target:$enable_bootstrap" in
;; ;;
esac esac
# See if we are building gcc with C++.
AC_ARG_ENABLE(build-with-cxx,
[AS_HELP_STRING([--enable-build-with-cxx],
[build with C++ compiler instead of C compiler])],
ENABLE_BUILD_WITH_CXX=$enableval,
ENABLE_BUILD_WITH_CXX=no)
# Build stage1 with C and build stages 2 and 3 with C++.
AC_ARG_ENABLE(build-poststage1-with-cxx,
[AS_HELP_STRING([--enable-build-poststage1-with-cxx],
[build stages 2 and 3 with C++, not C])],
ENABLE_BUILD_POSTSTAGE1_WITH_CXX=$enableval,
ENABLE_BUILD_POSTSTAGE1_WITH_CXX=yes)
# Used for setting $lt_cv_objdir # Used for setting $lt_cv_objdir
_LT_CHECK_OBJDIR _LT_CHECK_OBJDIR
@ -1328,6 +1327,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" 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_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_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 # 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 # 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 # but it would be included on the link line in the version check below
@ -1362,7 +1362,7 @@ if test -d ${srcdir}/gcc && test "x$have_gmp" = xno; then
AC_MSG_CHECKING([for the correct version of mpfr.h]) AC_MSG_CHECKING([for the correct version of mpfr.h])
AC_TRY_COMPILE([#include <gmp.h> AC_TRY_COMPILE([#include <gmp.h>
#include <mpfr.h>],[ #include <mpfr.h>],[
#if MPFR_VERSION < MPFR_VERSION_NUM(2,3,1) #if MPFR_VERSION < MPFR_VERSION_NUM(2,4,0)
choke me choke me
#endif #endif
], [AC_TRY_COMPILE([#include <gmp.h> ], [AC_TRY_COMPILE([#include <gmp.h>
@ -1422,7 +1422,7 @@ if test -d ${srcdir}/gcc && test "x$have_gmp" = xno; then
# The library versions listed in the error message below should match # The library versions listed in the error message below should match
# the HARD-minimums enforced above. # the HARD-minimums enforced above.
if test x$have_gmp != xyes; then if test x$have_gmp != xyes; then
AC_MSG_ERROR([Building GCC requires GMP 4.2+, MPFR 2.3.1+ and MPC 0.8.0+. AC_MSG_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 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 locations. Source code for these libraries can be found at
their respective hosting sites as well as at their respective hosting sites as well as at
@ -1440,6 +1440,7 @@ AC_SUBST(gmpinc)
AC_SUBST(extra_mpfr_configure_flags) AC_SUBST(extra_mpfr_configure_flags)
AC_SUBST(extra_mpc_gmp_configure_flags) AC_SUBST(extra_mpc_gmp_configure_flags)
AC_SUBST(extra_mpc_mpfr_configure_flags) AC_SUBST(extra_mpc_mpfr_configure_flags)
AC_SUBST(extra_isl_gmp_configure_flags)
# Allow host libstdc++ to be specified for static linking with PPL. # Allow host libstdc++ to be specified for static linking with PPL.
AC_ARG_WITH(host-libstdcxx, AC_ARG_WITH(host-libstdcxx,
@ -1505,119 +1506,44 @@ AC_ARG_WITH(boot-ldflags,
fi]) fi])
AC_SUBST(poststage1_ldflags) AC_SUBST(poststage1_ldflags)
# Check for PPL # Check for ISL
ppllibs= dnl Provide configure switches and initialize islinc & isllibs
pplinc= dnl with user input.
pwllib= ISL_INIT_FLAGS
if test "x$with_isl" != "xno"; then
dnl The minimal version of ISL required for Graphite.
ISL_CHECK_VERSION(0,10)
AC_ARG_WITH(ppl, dnl Only execute fail-action, if ISL has been requested.
[AS_HELP_STRING([--with-ppl=PATH], ISL_IF_FAILED([
[specify prefix directory for the installed PPL package. AC_MSG_ERROR([Unable to find a usable ISL. See config.log for details.])])
Equivalent to --with-ppl-include=PATH/include
plus --with-ppl-lib=PATH/lib])])
AC_ARG_WITH(ppl-include,
[AS_HELP_STRING([--with-ppl-include=PATH],
[specify directory for installed PPL include files])])
AC_ARG_WITH(ppl-lib,
[AS_HELP_STRING([--with-ppl-lib=PATH],
[specify directory for the installed PPL library])])
AC_ARG_ENABLE(ppl-version-check,
[AS_HELP_STRING([--disable-ppl-version-check],
[disable check for PPL version])])
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
AC_MSG_ERROR([cannot find directories "$with_ppl/lib" or "$with_ppl/include"])
fi fi
;;
esac
if test x"$with_ppl_include" != x; then
pplinc="-I$with_ppl_include $pplinc"
with_ppl=yes
fi
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"
AC_CHECK_LIB(pwl, PWL_handle_timeout, [pwllib="-lpwl"])
LIBS="$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"
AC_MSG_CHECKING([for version 0.11 (revision 0 or later) of PPL])
AC_TRY_COMPILE([#include "ppl_c.h"],[
#if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 11
choke me
#endif
], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); ppllibs= ; pplinc= ; with_ppl=no ])
CFLAGS="$saved_CFLAGS"
fi
fi
# Flags needed for PPL
AC_SUBST(ppllibs)
AC_SUBST(pplinc)
# Check for CLOOG # Check for CLOOG
dnl Provide configure switches and initialize clooginc & clooglibs dnl Provide configure switches and initialize clooginc & clooglibs
dnl with user input. dnl with user input.
CLOOG_INIT_FLAGS CLOOG_INIT_FLAGS
if test "x$with_ppl" = "xno"; then if test "x$isllibs" = x && test "x$islinc" = x; then
dnl Only execute fail-action, if CLooG has been requested. clooglibs=
CLOOG_REQUESTED([graphite_requested=yes], [graphite_requested=no]) clooginc=
if test "${graphite_requested}" = yes; then elif test "x$with_cloog" != "xno"; then
AC_MSG_ERROR([Unable to find a usable PPL. See config.log for details.])
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
dnl The minimal version of CLooG required for Graphite. dnl The minimal version of CLooG required for Graphite.
dnl dnl
dnl If we use CLooG-Legacy, the provided version information is dnl If we use CLooG-Legacy, the provided version information is
dnl ignored. dnl ignored.
CLOOG_CHECK_VERSION(0,16,1) CLOOG_CHECK_VERSION(0,17,0)
dnl Only execute fail-action, if CLooG has been requested. dnl Only execute fail-action, if CLooG has been requested.
CLOOG_IF_FAILED([ CLOOG_IF_FAILED([
AC_MSG_ERROR([Unable to find a usable CLooG. See config.log for details.])]) AC_MSG_ERROR([Unable to find a usable CLooG. See config.log for details.])])
fi 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 for LTO support.
AC_ARG_ENABLE(lto, AC_ARG_ENABLE(lto,
[AS_HELP_STRING([--enable-lto], [enable link time optimization support])], [AS_HELP_STRING([--enable-lto], [enable link time optimization support])],
@ -1655,7 +1581,7 @@ ACX_ELF_TARGET_IFELSE([# ELF platforms build the lto-plugin always.
]) ])
# By default, C is the only stage 1 language. # By default, C and C++ are the only stage 1 languages.
stage1_languages=,c, stage1_languages=,c,
# Target libraries that we bootstrap. # Target libraries that we bootstrap.
@ -1693,15 +1619,14 @@ if test -d ${srcdir}/gcc; then
;; ;;
esac esac
# If bootstrapping, then using --enable-build-with-cxx or # If bootstrapping, C++ must be enabled.
# --enable-build-poststage1-with-cxx requires enabling C++. case ",$enable_languages,:$enable_bootstrap" in
case ",$enable_languages,:,$ENABLE_BUILD_WITH_CXX,$ENABLE_BUILD_POSTSTAGE1_WITH_CXX,:$enable_bootstrap" in *,c++,*:*) ;;
*,c++,*:*:*) ;; *:yes)
*:*,yes,*:yes)
if test -f ${srcdir}/gcc/cp/config-lang.in; then if test -f ${srcdir}/gcc/cp/config-lang.in; then
enable_languages="${enable_languages},c++" enable_languages="${enable_languages},c++"
else else
AC_MSG_ERROR([bootstrapping with --enable-build-with-cxx or --enable-build-poststage1-with-cxx requires c++ sources]) AC_MSG_ERROR([bootstrapping requires c++ sources])
fi fi
;; ;;
esac esac
@ -1796,16 +1721,16 @@ if test -d ${srcdir}/gcc; then
fi fi
if test "$language" = "c++"; then if test "$language" = "c++"; then
if test "$ENABLE_BUILD_WITH_CXX" = "yes" \
|| test "$ENABLE_BUILD_POSTSTAGE1_WITH_CXX" = "yes"; then
boot_language=yes boot_language=yes
fi fi
fi
case ,${enable_languages}, in case ,${enable_languages}, in
*,${language},*) *,${language},*)
# Language was explicitly selected; include it. # Language was explicitly selected; include it
# unless it is C, which is enabled by default.
if test "$language" != "c"; then
add_this_lang=yes add_this_lang=yes
fi
;; ;;
*,all,*) *,all,*)
# 'all' was selected, select it if it is a default language # 'all' was selected, select it if it is a default language
@ -1981,6 +1906,14 @@ case ,${enable_languages},:${enable_objc_gc} in
;; ;;
esac 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, # Remove the entries in $skipdirs and $noconfigdirs from $configdirs,
# $build_configdirs and $target_configdirs. # $build_configdirs and $target_configdirs.
# If we have the source for $noconfigdirs entries, add them to $notsupp. # If we have the source for $noconfigdirs entries, add them to $notsupp.
@ -2296,10 +2229,6 @@ case "${target}" in
extra_arflags_for_target=" -X32_64" extra_arflags_for_target=" -X32_64"
extra_nmflags_for_target=" -B -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 esac
alphaieee_frag=/dev/null alphaieee_frag=/dev/null
@ -2665,7 +2594,7 @@ changequote(,)
changequote([,]) changequote([,])
case $lib in case $lib in
mpc | mpfr | gmp | ppl | cloog) mpc | mpfr | gmp | cloog)
# If we're processing --with-$lib, --with-$lib-include or # If we're processing --with-$lib, --with-$lib-include or
# --with-$lib-lib, for one of the libs above, and target is # --with-$lib-lib, for one of the libs above, and target is
# different from host, don't pass the current argument to any # different from host, don't pass the current argument to any
@ -3182,26 +3111,6 @@ case $build in
esac ;; esac ;;
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"
AC_MSG_CHECKING([whether -fkeep-inline-functions is supported])
AC_TRY_COMPILE([
#if (__GNUC__ < 3) \
|| (__GNUC__ == 3 && (__GNUC_MINOR__ < 3 \
|| (__GNUC_MINOR__ == 3 && __GNUC_PATCHLEVEL__ < 1)))
#error http://gcc.gnu.org/PR29382
#endif
],,
[AC_MSG_RESULT([yes]); stage1_cflags="$stage1_cflags -fkeep-inline-functions"],
[AC_MSG_RESULT([no])])
CFLAGS="$saved_CFLAGS"
fi
AC_SUBST(stage1_cflags) AC_SUBST(stage1_cflags)
# Enable --enable-checking in stage1 of the compiler. # Enable --enable-checking in stage1 of the compiler.
@ -3231,15 +3140,6 @@ case ${enable_werror} in
esac esac
AC_SUBST(stage2_werror_flag) AC_SUBST(stage2_werror_flag)
# 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
AC_SUBST(POSTSTAGE1_CONFIGURE_FLAGS)
# Specify what files to not compare during bootstrap. # Specify what files to not compare during bootstrap.
compare_exclusions="gcc/cc*-checksum\$(objext) | gcc/ada/*tools/*" compare_exclusions="gcc/cc*-checksum\$(objext) | gcc/ada/*tools/*"
@ -3247,9 +3147,6 @@ case "$target" in
hppa*64*-*-hpux*) ;; hppa*64*-*-hpux*) ;;
hppa*-*-hpux*) compare_exclusions="gcc/cc*-checksum\$(objext) | */libgcc/lib2funcs* | gcc/ada/*tools/*" ;; hppa*-*-hpux*) compare_exclusions="gcc/cc*-checksum\$(objext) | */libgcc/lib2funcs* | gcc/ada/*tools/*" ;;
esac esac
case " $configdirs " in
*" ppl "*) compare_exclusions="$compare_exclusions | ppl/src/ppl-config.o" ;;
esac
AC_SUBST(compare_exclusions) AC_SUBST(compare_exclusions)
AC_CONFIG_FILES([Makefile], AC_CONFIG_FILES([Makefile],