Sync toplevel with GCC, merge.
/: 2009-07-31 Christian Bruel <christian.bruel@st.com> * configure.ac (sh*-*-elf): Don't add target-libgloss to noconfigdirs. * configure: Regenerate. 2009-07-06 Ian Lance Taylor <iant@google.com> * configure.ac: Add missing comma in AC_ARG_WITH(boot-libs). * configure: Rebuild. 2009-06-26 Steve Ellcey <sje@cup.hp.com> PR bootstrap/40338 * configure.ac (comparestring): Create new variable. * Makefile.tpl (comparestring): Use to skip some comparisions. * configure: Regenerate. * Makefile.in: Regenerate. 2009-06-23 Ian Lance Taylor <iant@google.com> * configure.ac: Add --enable-build-with-cxx. When set, add c++ to boot_languages. Only bootstrap target libraries listed in target_libs for some boot language. Add --with-stage1-ldflags, --with-stage1-libs, --with-boot-ldflags, --with-boot-libs. Remove with_host_libstdcxx from ppllibs. Only add -fkeep-inline-functions if not building with C++. * Makefile.def: For target_module libstdc++-v3, set bootstrap=true. * Makefile.tpl (STAGE1_LDFLAGS, STAGE1_LIBS): New variables. (POSTSTAGE1_LDFLAGS, POSTSTAGE1_LIBS): New variables. (HOST_EXPORTS): Add STAGE1_LDFLAGS to LDFLAGS. Export HOST_LIBS. (POSTSTAGE1_HOST_EXPORTS): Set CXX and CXX_FOR_BUILD. Add POSTSTAGE1_LDFLAGS to LDFLAGS. Export HOST_LIBS. (POSTSTAGE1_FLAGS_TO_PASS): Likewise. * configure, Makefile.in: Rebuild. 2009-06-08 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> * configure.ac: Detect MPC in default directory. * configure: Regenerate. 2009-06-02 Richard Sandiford <r.sandiford@uk.ibm.com> * configure.ac (powerpc-*-aix*, rs6000-*-aix*): Add target-newlib to noconfdirs. * configure: Regenerate. 2009-05-29 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> * Makefile.def: Add MPC support and dependencies. * configure.ac: Likewise. Reorganize GMP/MPFR checks. * Makefile.in, configure: Regenerate. 2009-05-24 Nicolas Roche <roche@adacore.com> * Makefile.tpl (compare-target): Skip ./ada/*tools directories. * Makefile.in: Regenerate. 2009-05-21 Dave Korn <dave.korn.cygwin@gmail.com> * configure.ac (cygwin noconfigdirs): Remove libgcj. * configure: Regenerate. 2009-05-07 Dave Korn <dave.korn.cygwin@gmail.com> * configure.ac ($with_ppl): Default to no if not supplied. ($with_cloog): Likewise. configure: Regenerate. 2009-04-24 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> PR bootstrap/39739 * configure.ac (extra_mpfr_configure_flags): Set and AC_SUBST. * Makefile.def (module=mpfr): Use extra_mpfr_configure_flags. * configure, Makefile.in: Regenerate. 2009-04-14 Jakub Jelinek <jakub@redhat.com> * configure.ac: Change copyright header to refer to version 3 of the GNU General Public License and to point readers at the COPYING3 file and the FSF's license web page. * Makefile.def: Likewise. * Makefile.tpl: Likewise. * Makefile.in: Regenerate. 2009-04-09 Jack Howarth <howarth@bromo.med.uc.edu> * configure.ac: Restore match for darwin9 or later. Use double brackets since regeneration eats one pair. * configure: Regenerate.
This commit is contained in:
Ralf Wildenhues
445
configure
vendored
445
configure
vendored
@ -272,7 +272,7 @@ PACKAGE_STRING=
|
||||
PACKAGE_BUGREPORT=
|
||||
|
||||
ac_unique_file="move-if-change"
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS TOPLEVEL_CONFIGURE_ARGUMENTS build build_cpu build_vendor build_os build_noncanonical host_noncanonical target_noncanonical host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN LN_S build_libsubdir build_subdir host_subdir target_subdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GNATBIND ac_ct_GNATBIND GNATMAKE ac_ct_GNATMAKE do_compare gmplibs gmpinc ppllibs pplinc clooglibs clooginc stage1_languages SYSROOT_CFLAGS_FOR_TARGET DEBUG_PREFIX_CFLAGS_FOR_TARGET CFLAGS_FOR_TARGET CXXFLAGS_FOR_TARGET RPATH_ENVVAR GCC_SHLIB_SUBDIR tooldir build_tooldir CONFIGURE_GDB_TK GDB_TK INSTALL_GDB_TK build_configargs build_configdirs host_configargs configdirs target_configargs AR_FOR_BUILD AS_FOR_BUILD CC_FOR_BUILD CFLAGS_FOR_BUILD CXXFLAGS_FOR_BUILD CXX_FOR_BUILD DLLTOOL_FOR_BUILD GCJ_FOR_BUILD GFORTRAN_FOR_BUILD LDFLAGS_FOR_BUILD LD_FOR_BUILD NM_FOR_BUILD RANLIB_FOR_BUILD WINDMC_FOR_BUILD WINDRES_FOR_BUILD config_shell YACC BISON M4 LEX FLEX MAKEINFO EXPECT RUNTEST AR AS DLLTOOL LD LIPO NM RANLIB STRIP WINDRES WINDMC OBJCOPY OBJDUMP CC_FOR_TARGET CXX_FOR_TARGET GCC_FOR_TARGET GCJ_FOR_TARGET GFORTRAN_FOR_TARGET AR_FOR_TARGET AS_FOR_TARGET DLLTOOL_FOR_TARGET LD_FOR_TARGET LIPO_FOR_TARGET NM_FOR_TARGET OBJDUMP_FOR_TARGET RANLIB_FOR_TARGET STRIP_FOR_TARGET WINDRES_FOR_TARGET WINDMC_FOR_TARGET RAW_CXX_FOR_TARGET FLAGS_FOR_TARGET COMPILER_AS_FOR_TARGET COMPILER_LD_FOR_TARGET COMPILER_NM_FOR_TARGET MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT stage1_cflags stage1_checking stage2_werror_flag datarootdir docdir pdfdir htmldir LIBOBJS LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS TOPLEVEL_CONFIGURE_ARGUMENTS build build_cpu build_vendor build_os build_noncanonical host_noncanonical target_noncanonical host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN LN_S build_libsubdir build_subdir host_subdir target_subdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GNATBIND ac_ct_GNATBIND GNATMAKE ac_ct_GNATMAKE do_compare gmplibs gmpinc extra_mpfr_configure_flags extra_mpc_gmp_configure_flags extra_mpc_mpfr_configure_flags stage1_ldflags stage1_libs poststage1_ldflags poststage1_libs ppllibs pplinc clooglibs clooginc stage1_languages SYSROOT_CFLAGS_FOR_TARGET DEBUG_PREFIX_CFLAGS_FOR_TARGET CFLAGS_FOR_TARGET CXXFLAGS_FOR_TARGET RPATH_ENVVAR GCC_SHLIB_SUBDIR tooldir build_tooldir CONFIGURE_GDB_TK GDB_TK INSTALL_GDB_TK build_configargs build_configdirs host_configargs configdirs target_configargs AR_FOR_BUILD AS_FOR_BUILD CC_FOR_BUILD CFLAGS_FOR_BUILD CXXFLAGS_FOR_BUILD CXX_FOR_BUILD DLLTOOL_FOR_BUILD GCJ_FOR_BUILD GFORTRAN_FOR_BUILD LDFLAGS_FOR_BUILD LD_FOR_BUILD NM_FOR_BUILD RANLIB_FOR_BUILD WINDMC_FOR_BUILD WINDRES_FOR_BUILD config_shell YACC BISON M4 LEX FLEX MAKEINFO EXPECT RUNTEST AR AS DLLTOOL LD LIPO NM RANLIB STRIP WINDRES WINDMC OBJCOPY OBJDUMP CC_FOR_TARGET CXX_FOR_TARGET GCC_FOR_TARGET GCJ_FOR_TARGET GFORTRAN_FOR_TARGET AR_FOR_TARGET AS_FOR_TARGET DLLTOOL_FOR_TARGET LD_FOR_TARGET LIPO_FOR_TARGET NM_FOR_TARGET OBJDUMP_FOR_TARGET RANLIB_FOR_TARGET STRIP_FOR_TARGET WINDRES_FOR_TARGET WINDMC_FOR_TARGET RAW_CXX_FOR_TARGET FLAGS_FOR_TARGET COMPILER_AS_FOR_TARGET COMPILER_LD_FOR_TARGET COMPILER_NM_FOR_TARGET MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT stage1_cflags stage1_checking stage2_werror_flag datarootdir docdir pdfdir htmldir compare_exclusions LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files='serialization_dependencies host_makefile_frag target_makefile_frag alphaieee_frag ospace_frag'
|
||||
ac_pwd=`pwd`
|
||||
|
||||
@ -935,6 +935,7 @@ Optional Features:
|
||||
--enable-gold use gold instead of ld
|
||||
--enable-libada build libada directory
|
||||
--enable-libssp build libssp directory
|
||||
--enable-build-with-cxx build with C++ compiler instead of C compiler
|
||||
--disable-ppl-version-check disable check for PPL version
|
||||
--disable-cloog-version-check disable check for CLooG version
|
||||
--enable-stage1-languages[=all] choose additional languages to build during
|
||||
@ -956,6 +957,12 @@ Optional Packages:
|
||||
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
|
||||
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
|
||||
--with-build-libsubdir=DIR Directory where to find libraries for build system
|
||||
--with-mpc=PATH specify prefix directory for installed MPC package.
|
||||
Equivalent to --with-mpc-include=PATH/include
|
||||
plus --with-mpc-lib=PATH/lib
|
||||
--with-mpc-include=PATH
|
||||
specify directory for installed MPC include files
|
||||
--with-mpc-lib=PATH specify directory for the installed MPC library
|
||||
--with-mpfr-dir=PATH this option has been REMOVED
|
||||
--with-mpfr=PATH specify prefix directory for installed MPFR package.
|
||||
Equivalent to --with-mpfr-include=PATH/include
|
||||
@ -971,6 +978,10 @@ Optional Packages:
|
||||
--with-gmp-lib=PATH specify directory for the installed GMP library
|
||||
--with-host-libstdcxx=L Use linker arguments L to link with libstdc++
|
||||
when linking with PPL
|
||||
--with-stage1-ldflags=FLAGS Linker flags for stage1
|
||||
-with-stage1-libs=LIBS Libraries for stage1
|
||||
--with-boot-ldflags=FLAGS Linker flags for stage2 and later
|
||||
--with-boot-libs=LIBS Libraries for stage2 and later
|
||||
--with-ppl=PATH Specify prefix directory for the installed PPL package
|
||||
Equivalent to --with-ppl-include=PATH/include
|
||||
plus --with-ppl-lib=PATH/lib
|
||||
@ -1887,7 +1898,7 @@ build_tools="build-texinfo build-byacc build-flex build-bison build-m4 build-fix
|
||||
|
||||
# these libraries are used by various programs built for the host environment
|
||||
#
|
||||
host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber gmp mpfr ppl cloog libiconv"
|
||||
host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber gmp mpfr mpc ppl cloog libiconv"
|
||||
|
||||
# these tools are built for the host environment
|
||||
# Note, the powerpc-eabi build depends on sim occurring before gdb in order to
|
||||
@ -2219,7 +2230,7 @@ case "${target}" in
|
||||
noconfigdirs="$noconfigdirs ld gprof"
|
||||
noconfigdirs="$noconfigdirs sim target-rda"
|
||||
;;
|
||||
x86_64-*-darwin9*)
|
||||
x86_64-*-darwin[912]*)
|
||||
noconfigdirs="$noconfigdirs ld gas gprof"
|
||||
noconfigdirs="$noconfigdirs sim target-rda"
|
||||
;;
|
||||
@ -2500,7 +2511,7 @@ case "${target}" in
|
||||
;;
|
||||
*-*-cygwin*)
|
||||
target_configdirs="$target_configdirs target-libtermcap target-winsup"
|
||||
noconfigdirs="$noconfigdirs target-gperf target-libgloss ${libgcj}"
|
||||
noconfigdirs="$noconfigdirs target-gperf target-libgloss"
|
||||
# always build newlib if winsup directory is present.
|
||||
if test -d "$srcdir/winsup/cygwin"; then
|
||||
skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'`
|
||||
@ -2570,7 +2581,7 @@ case "${target}" in
|
||||
;;
|
||||
powerpc-*-aix*)
|
||||
# copied from rs6000-*-* entry
|
||||
noconfigdirs="$noconfigdirs gprof target-libgloss target-libssp ${libgcj}"
|
||||
noconfigdirs="$noconfigdirs gprof target-libgloss target-libssp target-newlib ${libgcj}"
|
||||
;;
|
||||
powerpc*-*-winnt* | powerpc*-*-pe* | ppc*-*-pe)
|
||||
target_configdirs="$target_configdirs target-winsup"
|
||||
@ -2597,7 +2608,7 @@ case "${target}" in
|
||||
noconfigdirs="$noconfigdirs target-newlib gprof ${libgcj}"
|
||||
;;
|
||||
rs6000-*-aix*)
|
||||
noconfigdirs="$noconfigdirs gprof target-libgloss target-libssp ${libgcj}"
|
||||
noconfigdirs="$noconfigdirs gprof target-libgloss target-libssp target-newlib ${libgcj}"
|
||||
;;
|
||||
rs6000-*-*)
|
||||
noconfigdirs="$noconfigdirs gprof ${libgcj}"
|
||||
@ -2646,7 +2657,12 @@ case "${target}" in
|
||||
i[3456789]86-*-msdosdjgpp*) ;; # don't add gprof back in
|
||||
*) skipdirs=`echo " ${skipdirs} " | sed -e 's/ gprof / /'` ;;
|
||||
esac
|
||||
noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
|
||||
case "${target}" in
|
||||
sh*-*-elf)
|
||||
noconfigdirs="$noconfigdirs ${libgcj}" ;;
|
||||
*)
|
||||
noconfigdirs="$noconfigdirs target-libgloss ${libgcj}" ;;
|
||||
esac
|
||||
;;
|
||||
sparclet-*-aout* | sparc86x-*-*)
|
||||
libgloss_dir=sparc
|
||||
@ -4505,10 +4521,63 @@ do_compare="$gcc_cv_prog_cmp_skip"
|
||||
|
||||
|
||||
|
||||
# Check for GMP and MPFR
|
||||
# See if we are building gcc with C++.
|
||||
# Check whether --enable-build-with-cxx or --disable-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;
|
||||
|
||||
# Check for GMP, MPFR and MPC
|
||||
gmplibs="-lmpfr -lgmp"
|
||||
gmpinc=
|
||||
have_gmp=no
|
||||
mpclibs=-lmpc
|
||||
mpcinc=
|
||||
have_mpc=no
|
||||
|
||||
# Specify a location for mpc
|
||||
# check for this first so it ends up on the link line before mpfr.
|
||||
|
||||
# Check whether --with-mpc or --without-mpc was given.
|
||||
if test "${with_mpc+set}" = set; then
|
||||
withval="$with_mpc"
|
||||
|
||||
fi;
|
||||
|
||||
# Check whether --with-mpc_include or --without-mpc_include was given.
|
||||
if test "${with_mpc_include+set}" = set; then
|
||||
withval="$with_mpc_include"
|
||||
|
||||
fi;
|
||||
|
||||
# Check whether --with-mpc_lib or --without-mpc_lib was given.
|
||||
if test "${with_mpc_lib+set}" = set; then
|
||||
withval="$with_mpc_lib"
|
||||
|
||||
fi;
|
||||
|
||||
if test "x$with_mpc" != x; then
|
||||
mpclibs="-L$with_mpc/lib -lmpc"
|
||||
mpcinc="-I$with_mpc/include $mpcinc"
|
||||
fi
|
||||
if test "x$with_mpc_include" != x; then
|
||||
mpcinc="-I$with_mpc_include $mpcinc"
|
||||
fi
|
||||
if test "x$with_mpc_lib" != x; then
|
||||
mpclibs="-L$with_mpc_lib -lmpc"
|
||||
fi
|
||||
if test "x$with_mpc$with_mpc_include$with_mpc_lib" = x && test -d ${srcdir}/mpc; then
|
||||
mpclibs='-L$$r/$(HOST_SUBDIR)/mpc/src/.libs -L$$r/$(HOST_SUBDIR)/mpc/src/_libs -lmpc'
|
||||
mpcinc='-I$$s/mpc/src '"$mpcinc"
|
||||
# Do not test the mpc version. Assume that it is sufficient, since
|
||||
# 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
|
||||
# hence making the test fail.
|
||||
have_mpc=yes
|
||||
fi
|
||||
|
||||
# Specify a location for mpfr
|
||||
# check for this first so it ends up on the link line before gmp.
|
||||
@ -4555,6 +4624,7 @@ fi
|
||||
if test "x$with_mpfr$with_mpfr_include$with_mpfr_lib" = x && test -d ${srcdir}/mpfr; then
|
||||
gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/.libs -L$$r/$(HOST_SUBDIR)/mpfr/_libs '"$gmplibs"
|
||||
gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr -I$$s/mpfr '"$gmpinc"
|
||||
extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr'
|
||||
# Do not test the mpfr version. Assume that it is sufficient, since
|
||||
# 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
|
||||
@ -4607,6 +4677,8 @@ fi
|
||||
if test "x$with_gmp$with_gmp_include$with_gmp_lib" = x && test -d ${srcdir}/gmp; then
|
||||
gmplibs='-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/gmp/_libs '"$gmplibs"
|
||||
gmpinc='-I$$r/$(HOST_SUBDIR)/gmp -I$$s/gmp '"$gmpinc"
|
||||
extra_mpfr_configure_flags='--with-gmp-build=$$r/$(HOST_SUBDIR)/gmp'
|
||||
extra_mpc_gmp_configure_flags='--with-gmp-include=$$r/$(HOST_SUBDIR)/gmp'
|
||||
# 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
|
||||
# but it would be included on the link line in the version check below
|
||||
@ -4674,9 +4746,8 @@ echo "${ECHO_T}no" >&6; have_gmp=no
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
|
||||
# If we have GMP, check the MPFR version.
|
||||
if test x"$have_gmp" = xyes; then
|
||||
saved_LIBS="$LIBS"
|
||||
LIBS="$LIBS $gmplibs"
|
||||
echo "$as_me:$LINENO: checking for correct version of mpfr.h" >&5
|
||||
echo $ECHO_N "checking for correct version of mpfr.h... $ECHO_C" >&6
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
@ -4694,6 +4765,171 @@ main ()
|
||||
#if MPFR_VERSION < MPFR_VERSION_NUM(2,3,1)
|
||||
choke me
|
||||
#endif
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; } &&
|
||||
{ ac_try='test -s conftest.$ac_objext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#include <gmp.h>
|
||||
#include <mpfr.h>
|
||||
int
|
||||
main ()
|
||||
{
|
||||
|
||||
#if MPFR_VERSION < MPFR_VERSION_NUM(2,3,2)
|
||||
choke me
|
||||
#endif
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; } &&
|
||||
{ ac_try='test -s conftest.$ac_objext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
echo "$as_me:$LINENO: result: buggy but acceptable" >&5
|
||||
echo "${ECHO_T}buggy but acceptable" >&6
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6; have_gmp=no
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
|
||||
# Check for the MPC header version.
|
||||
if test x"$have_mpc" != xyes ; then
|
||||
CFLAGS="$CFLAGS $mpcinc"
|
||||
echo "$as_me:$LINENO: checking for the correct version of mpc.h" >&5
|
||||
echo $ECHO_N "checking for the correct version of mpc.h... $ECHO_C" >&6
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#include <mpc.h>
|
||||
int
|
||||
main ()
|
||||
{
|
||||
|
||||
#if MPC_VERSION < MPC_VERSION_NUM (0,6,0)
|
||||
choke me
|
||||
#endif
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; } &&
|
||||
{ ac_try='test -s conftest.$ac_objext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6; have_mpc=maybe
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6; have_mpc=no; mpclibs= ; mpcinc=
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
|
||||
# Now check the MPFR library.
|
||||
if test x"$have_gmp" = xyes; then
|
||||
saved_LIBS="$LIBS"
|
||||
LIBS="$LIBS $gmplibs"
|
||||
echo "$as_me:$LINENO: checking for the correct version of the gmp/mpfr libraries" >&5
|
||||
echo $ECHO_N "checking for the correct version of the gmp/mpfr libraries... $ECHO_C" >&6
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#include <gmp.h>
|
||||
#include <mpfr.h>
|
||||
int
|
||||
main ()
|
||||
{
|
||||
|
||||
mpfr_t n;
|
||||
mpfr_t x;
|
||||
int t;
|
||||
@ -4729,22 +4965,52 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6; have_gmp=no
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS="$saved_LIBS"
|
||||
fi
|
||||
|
||||
if test x"$have_mpc" = xmaybe; then
|
||||
saved_LIBS="$LIBS"
|
||||
LIBS="$LIBS $mpclibs $gmplibs"
|
||||
echo "$as_me:$LINENO: checking for the correct version of the mpc library" >&5
|
||||
echo $ECHO_N "checking for the correct version of the mpc library... $ECHO_C" >&6
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#include <gmp.h>
|
||||
#include <mpfr.h>
|
||||
#include <mpc.h>
|
||||
int
|
||||
main ()
|
||||
{
|
||||
|
||||
#if MPFR_VERSION < MPFR_VERSION_NUM(2,3,2)
|
||||
choke me
|
||||
#endif
|
||||
mpfr_t n; mpfr_init(n);
|
||||
mpc_t n;
|
||||
mpc_init2 (n, 53);
|
||||
mpc_set_ui_ui (n, 1, 1, MPC_RNDNN);
|
||||
mpc_sin (n, n, MPC_RNDNN);
|
||||
mpc_cos (n, n, MPC_RNDNN);
|
||||
mpc_tan (n, n, MPC_RNDNN);
|
||||
mpc_sinh (n, n, MPC_RNDNN);
|
||||
mpc_cosh (n, n, MPC_RNDNN);
|
||||
mpc_tanh (n, n, MPC_RNDNN);
|
||||
mpc_exp (n, n, MPC_RNDNN);
|
||||
mpc_log (n, n, MPC_RNDNN);
|
||||
mpc_sqrt (n, n, MPC_RNDNN);
|
||||
mpc_proj (n, n, MPC_RNDNN);
|
||||
mpc_neg (n, n, MPC_RNDNN);
|
||||
mpc_sqr (n, n, MPC_RNDNN);
|
||||
mpc_clear (n);
|
||||
|
||||
;
|
||||
return 0;
|
||||
@ -4773,27 +5039,19 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
echo "$as_me:$LINENO: result: buggy but acceptable" >&5
|
||||
echo "${ECHO_T}buggy but acceptable" >&6
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
echo "${ECHO_T}yes" >&6; have_mpc=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6; have_gmp=no
|
||||
echo "${ECHO_T}no" >&6; have_mpc=no; mpclibs= ; mpcinc=
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS="$saved_LIBS"
|
||||
LIBS="$saved_LIBS"
|
||||
fi
|
||||
|
||||
CFLAGS="$saved_CFLAGS"
|
||||
|
||||
if test x$have_gmp != xyes; then
|
||||
@ -4817,7 +5075,18 @@ They may be located in separate packages." >&2;}
|
||||
fi
|
||||
fi
|
||||
|
||||
# Flags needed for both GMP and/or MPFR
|
||||
if test x$have_mpc != xyes ; then
|
||||
mpcinc=
|
||||
mpclibs=
|
||||
fi
|
||||
|
||||
gmpinc="$mpcinc $gmpinc"
|
||||
gmplibs="$mpclibs $gmplibs"
|
||||
|
||||
# Flags needed for both GMP, MPFR and/or MPC.
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -4837,10 +5106,75 @@ echo "$as_me: error: -with-host-libstdcxx needs an argument" >&2;}
|
||||
;;
|
||||
esac
|
||||
|
||||
# Linker flags to use for stage1 or when not boostrapping.
|
||||
|
||||
# Check whether --with-stage1-ldflags or --without-stage1-ldflags was given.
|
||||
if test "${with_stage1_ldflags+set}" = set; then
|
||||
withval="$with_stage1_ldflags"
|
||||
if test "$withval" = "no" -o "$withval" = "yes"; then
|
||||
stage1_ldflags=
|
||||
else
|
||||
stage1_ldflags=$withval
|
||||
fi
|
||||
else
|
||||
stage1_ldflags=
|
||||
fi;
|
||||
|
||||
|
||||
# Libraries to use for stage1 or when not bootstrapping.
|
||||
|
||||
# Check whether --with-stage1-libs or --without-stage1-libs was given.
|
||||
if test "${with_stage1_libs+set}" = set; then
|
||||
withval="$with_stage1_libs"
|
||||
if test "$withval" = "no" -o "$withval" = "yes"; then
|
||||
stage1_libs=
|
||||
else
|
||||
stage1_libs=$withval
|
||||
fi
|
||||
else
|
||||
stage1_libs=$with_host_libstdcxx
|
||||
fi;
|
||||
|
||||
|
||||
# Linker flags to use for stage2 and later builds.
|
||||
|
||||
# Check whether --with-boot-ldflags or --without-boot-ldflags was given.
|
||||
if test "${with_boot_ldflags+set}" = set; then
|
||||
withval="$with_boot_ldflags"
|
||||
if test "$withval" = "no" -o "$withval" = "yes"; then
|
||||
poststage1_ldflags=
|
||||
else
|
||||
poststage1_ldflags=$withval
|
||||
fi
|
||||
else
|
||||
if test "$ENABLE_BUILD_WITH_CXX" = "yes"; then
|
||||
poststage1_ldflags=-static-libstdc++
|
||||
else
|
||||
poststage1_ldflags=
|
||||
fi
|
||||
fi;
|
||||
|
||||
|
||||
# Libraries to use for stage2 and later builds. This defaults to the
|
||||
# argument passed to --with-host-libstdcxx.
|
||||
|
||||
# Check whether --with-boot-libs or --without-boot-libs was given.
|
||||
if test "${with_boot_libs+set}" = set; then
|
||||
withval="$with_boot_libs"
|
||||
if test "$withval" = "no" -o "$withval" = "yes"; then
|
||||
poststage1_libs=
|
||||
else
|
||||
poststage1_libs=$withval
|
||||
fi
|
||||
else
|
||||
poststage1_libs=$with_host_libstdcxx
|
||||
fi;
|
||||
|
||||
|
||||
# Check for PPL
|
||||
ppl_major_version=0
|
||||
ppl_minor_version=10
|
||||
ppllibs=" -lppl_c -lppl -lgmpxx $with_host_libstdcxx "
|
||||
ppllibs=" -lppl_c -lppl -lgmpxx"
|
||||
pplinc=
|
||||
|
||||
|
||||
@ -4848,6 +5182,8 @@ pplinc=
|
||||
if test "${with_ppl+set}" = set; then
|
||||
withval="$with_ppl"
|
||||
|
||||
else
|
||||
with_ppl=no
|
||||
fi;
|
||||
|
||||
# Check whether --with-ppl_include or --without-ppl_include was given.
|
||||
@ -4867,7 +5203,7 @@ case $with_ppl in
|
||||
ppllibs=
|
||||
;;
|
||||
*)
|
||||
ppllibs="-L$with_ppl/lib -lppl_c -lppl -lgmpxx $with_host_libstdcxx"
|
||||
ppllibs="-L$with_ppl/lib -lppl_c -lppl -lgmpxx"
|
||||
pplinc="-I$with_ppl/include $pplinc"
|
||||
LIBS="$ppllibs $LIBS"
|
||||
;;
|
||||
@ -4876,11 +5212,11 @@ if test "x$with_ppl_include" != x; then
|
||||
pplinc="-I$with_ppl_include $pplinc"
|
||||
fi
|
||||
if test "x$with_ppl_lib" != x; then
|
||||
ppllibs="-L$with_ppl_lib -lppl_c -lppl -lgmpxx $with_host_libstdcxx"
|
||||
ppllibs="-L$with_ppl_lib -lppl_c -lppl -lgmpxx"
|
||||
LIBS="$ppllibs $LIBS"
|
||||
fi
|
||||
if test "x$with_ppl$with_ppl_include$with_ppl_lib" = x && test -d ${srcdir}/ppl; then
|
||||
ppllibs='-L$$r/$(HOST_SUBDIR)/ppl/.libs -L$$r/$(HOST_SUBDIR)/ppl/_libs -lppl_c -lppl -lgmpxx '"$with_host_libstdcxx "
|
||||
ppllibs='-L$$r/$(HOST_SUBDIR)/ppl/.libs -L$$r/$(HOST_SUBDIR)/ppl/_libs -lppl_c -lppl -lgmpxx '
|
||||
pplinc='-I$$r/$(HOST_SUBDIR)/ppl/include -I$$s/ppl/include '
|
||||
LIBS="$ppllibs $LIBS"
|
||||
fi
|
||||
@ -4966,6 +5302,8 @@ clooginc=" -DCLOOG_PPL_BACKEND "
|
||||
if test "${with_cloog+set}" = set; then
|
||||
withval="$with_cloog"
|
||||
|
||||
else
|
||||
with_cloog=no
|
||||
fi;
|
||||
|
||||
# Check whether --with-cloog_include or --without-cloog_include was given.
|
||||
@ -5079,6 +5417,9 @@ fi
|
||||
# By default, C is the only stage 1 language.
|
||||
stage1_languages=,c,
|
||||
|
||||
# Target libraries that we bootstrap.
|
||||
bootstrap_target_libs=,target-libgcc,
|
||||
|
||||
# Figure out what language subdirectories are present.
|
||||
# Look if the user specified --enable-languages="..."; if not, use
|
||||
# the environment variable $LANGUAGES if defined. $LANGUAGES might
|
||||
@ -5164,6 +5505,10 @@ if test -d ${srcdir}/gcc; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if test "$language" = "c++" -a "$ENABLE_BUILD_WITH_CXX" = "yes"; then
|
||||
boot_language=yes
|
||||
fi
|
||||
|
||||
case ,${enable_languages}, in
|
||||
*,${language},*)
|
||||
# Language was explicitly selected; include it.
|
||||
@ -5234,6 +5579,8 @@ echo "$as_me: error: GNAT is required to build $language" >&2;}
|
||||
yes)
|
||||
# Add to (comma-separated) list of stage 1 languages.
|
||||
stage1_languages="${stage1_languages}${language},"
|
||||
# We need to bootstrap any supporting libraries.
|
||||
bootstrap_target_libs="${bootstrap_target_libs}${target_libs},"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
@ -6033,11 +6380,18 @@ for module in ${target_configdirs} ; do
|
||||
echo 1>&2 "*** removing ${target_subdir}/${module}/Makefile to force reconfigure"
|
||||
rm -f ${target_subdir}/${module}/Makefile
|
||||
fi
|
||||
|
||||
# We only bootstrap target libraries listed in bootstrap_target_libs.
|
||||
case $bootstrap_target_libs in
|
||||
*,target-$module,*) target_bootstrap_suffix=$bootstrap_suffix ;;
|
||||
*) target_bootstrap_suffix=no-bootstrap ;;
|
||||
esac
|
||||
|
||||
extrasub="$extrasub
|
||||
/^@if target-$module\$/d
|
||||
/^@endif target-$module\$/d
|
||||
/^@if target-$module-$bootstrap_suffix\$/d
|
||||
/^@endif target-$module-$bootstrap_suffix\$/d"
|
||||
/^@if target-$module-$target_bootstrap_suffix\$/d
|
||||
/^@endif target-$module-$target_bootstrap_suffix\$/d"
|
||||
done
|
||||
|
||||
extrasub="$extrasub
|
||||
@ -12444,7 +12798,7 @@ case $build in
|
||||
esac
|
||||
|
||||
# This is aimed to mimic bootstrap with a non-GCC compiler to catch problems.
|
||||
if test "$GCC" = yes; then
|
||||
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.
|
||||
@ -12584,6 +12938,15 @@ fi;
|
||||
|
||||
|
||||
|
||||
# Specify what files to not compare during bootstrap.
|
||||
|
||||
compare_exclusions="gcc/cc*-checksum\$(objext) | gcc/ada/*tools/*"
|
||||
case "$target" in
|
||||
hppa*64*-*-hpux*) ;;
|
||||
hppa*-*-hpux*) compare_exclusions="gcc/cc*-checksum\$(objext) | */libgcc/lib2funcs* | gcc/ada/*tools/*" ;;
|
||||
esac
|
||||
|
||||
|
||||
ac_config_files="$ac_config_files Makefile"
|
||||
cat >confcache <<\_ACEOF
|
||||
# This file is a shell script that caches the results of configure
|
||||
@ -13262,6 +13625,13 @@ s,@ac_ct_GNATMAKE@,$ac_ct_GNATMAKE,;t t
|
||||
s,@do_compare@,$do_compare,;t t
|
||||
s,@gmplibs@,$gmplibs,;t t
|
||||
s,@gmpinc@,$gmpinc,;t t
|
||||
s,@extra_mpfr_configure_flags@,$extra_mpfr_configure_flags,;t t
|
||||
s,@extra_mpc_gmp_configure_flags@,$extra_mpc_gmp_configure_flags,;t t
|
||||
s,@extra_mpc_mpfr_configure_flags@,$extra_mpc_mpfr_configure_flags,;t t
|
||||
s,@stage1_ldflags@,$stage1_ldflags,;t t
|
||||
s,@stage1_libs@,$stage1_libs,;t t
|
||||
s,@poststage1_ldflags@,$poststage1_ldflags,;t t
|
||||
s,@poststage1_libs@,$poststage1_libs,;t t
|
||||
s,@ppllibs@,$ppllibs,;t t
|
||||
s,@pplinc@,$pplinc,;t t
|
||||
s,@clooglibs@,$clooglibs,;t t
|
||||
@ -13350,6 +13720,7 @@ s,@datarootdir@,$datarootdir,;t t
|
||||
s,@docdir@,$docdir,;t t
|
||||
s,@pdfdir@,$pdfdir,;t t
|
||||
s,@htmldir@,$htmldir,;t t
|
||||
s,@compare_exclusions@,$compare_exclusions,;t t
|
||||
s,@LIBOBJS@,$LIBOBJS,;t t
|
||||
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
|
||||
/@serialization_dependencies@/r $serialization_dependencies
|
||||
|
||||
Reference in New Issue
Block a user