X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=libstdc%2B%2B-v3%2Fconfigure.ac;h=7d7f7a95478d5057fc89049197ac6761a27f432c;hp=ef5555f7df9577faee7bc142537d633f29e0f3bc;hb=897f9d25c9514d0a9eb4f9af7cce1a59b0645f13;hpb=d2e1c9b0845ccb5d0e48d7395aab0678b78c2edf diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac index ef5555f7df9..7d7f7a95478 100644 --- a/libstdc++-v3/configure.ac +++ b/libstdc++-v3/configure.ac @@ -1,7 +1,6 @@ -# Process this file with autoconf to produce a configure script, like so: -# aclocal && autoconf && autoheader && automake +# Process this file with autoreconf to produce a configure script. -AC_PREREQ(2.59) +AC_PREREQ(2.64) AC_INIT(package-unused, version-unused,, libstdc++) AC_CONFIG_SRCDIR(src/ios.cc) AC_CONFIG_HEADER(config.h) @@ -13,7 +12,7 @@ AC_CONFIG_HEADER(config.h) ### am handles this now? ORIGINAL_LD_FOR_MULTILIBS=$LD # For libtool versioning info, format is CURRENT:REVISION:AGE -libtool_VERSION=6:2:0 +libtool_VERSION=6:14:0 AC_SUBST(libtool_VERSION) # Find the rest of the source tree framework. @@ -42,7 +41,24 @@ target_alias=${target_alias-$host_alias} if test "$build" != "$host"; then # We are being configured with some form of cross compiler. GLIBCXX_IS_NATIVE=false - GCC_NO_EXECUTABLES + case "$host","$target" in + # Darwin crosses can use the host system's libraries and headers, + # because of the fat library support. Of course, it must be the + # same version of Darwin on both sides. Allow the user to + # just say --target=foo-darwin without a version number to mean + # "the version on this system". + *-*-darwin*,*-*-darwin*) + hostos=`echo $host | sed 's/.*-darwin/darwin/'` + targetos=`echo $target | sed 's/.*-darwin/darwin/'` + if test $hostos = $targetos -o $targetos = darwin ; then + GLIBCXX_IS_NATIVE=true + fi + ;; + + *) + GCC_NO_EXECUTABLES + ;; + esac else GLIBCXX_IS_NATIVE=true fi @@ -56,102 +72,127 @@ fi # foreign: we don't follow the normal rules for GNU packages (no COPYING # file in the top srcdir, etc, etc), so stop complaining. # no-dependencies: turns off auto dependency generation (just for now) +# no-dist: we don't want 'dist' and related rules. # -Wall: turns on all automake warnings... # -Wno-portability: ...except this one, since GNU make is now required. -AM_INIT_AUTOMAKE([1.8.5 no-define foreign no-dependencies -Wall -Wno-portability -Wno-override]) +AM_INIT_AUTOMAKE([1.9.3 no-define foreign no-dependencies no-dist -Wall -Wno-portability -Wno-override]) +AH_TEMPLATE(PACKAGE, [Name of package]) +AH_TEMPLATE(VERSION, [Version number of package]) -# Runs configure.host, finds CC, CXX, and assorted other critical bits. Sets +# -fno-builtin must be present here so that a non-conflicting form of +# std::exit can be guessed by AC_PROG_CXX, and used in later tests. + +save_CXXFLAGS="$CXXFLAGS" +CXXFLAGS="$CXXFLAGS -fno-builtin" +AC_PROG_CC +AC_PROG_CXX +CXXFLAGS="$save_CXXFLAGS" + +# Runs configure.host, and assorted other critical bits. Sets # up critical shell variables. GLIBCXX_CONFIGURE -#AC_MSG_NOTICE([====== Starting libtool configuration]) -AC_LIBTOOL_DLOPEN +if test "x${with_newlib}" != "xyes"; then + AC_LIBTOOL_DLOPEN +fi AM_PROG_LIBTOOL AC_SUBST(enable_shared) AC_SUBST(enable_static) -#AC_MSG_NOTICE([====== Finished libtool configuration]) ; sleep 10 + +# Eliminate -lstdc++ addition to postdeps for cross compiles. +postdeps_CXX=`echo " $postdeps_CXX " | sed 's, -lstdc++ ,,g'` # Possibly disable most of the library. -## XXX Consider skipping unncessary tests altogether in this case, rather +## TODO: Consider skipping unncessary tests altogether in this case, rather ## than just ignoring the results. Faster /and/ more correct, win win. GLIBCXX_ENABLE_HOSTED -# Check for support bits and g++ features that don't require linking. +# Enable compiler support that doesn't require linking. GLIBCXX_ENABLE_SJLJ_EXCEPTIONS GLIBCXX_ENABLE_PCH($is_hosted) +GLIBCXX_ENABLE_THREADS +GLIBCXX_ENABLE_ATOMIC_BUILTINS +GLIBCXX_ENABLE_DECIMAL_FLOAT -# Enable all the variable C++ runtime options. -# NB: C_MBCHAR must come early. +# Checks for compiler support that doesn't require linking. +GLIBCXX_CHECK_COMPILER_FEATURES + +# Enable all the variable C++ runtime options that don't require linking. GLIBCXX_ENABLE_CSTDIO GLIBCXX_ENABLE_CLOCALE GLIBCXX_ENABLE_ALLOCATOR GLIBCXX_ENABLE_CHEADERS($c_model) dnl c_model from configure.host -GLIBCXX_ENABLE_C_MBCHAR([yes]) -GLIBCXX_ENABLE_C99([yes]) GLIBCXX_ENABLE_LONG_LONG([yes]) -GLIBCXX_ENABLE_THREADS +GLIBCXX_ENABLE_WCHAR_T([yes]) +GLIBCXX_ENABLE_C99([yes]) GLIBCXX_ENABLE_CONCEPT_CHECKS([no]) GLIBCXX_ENABLE_DEBUG_FLAGS(["-g3 -O0"]) GLIBCXX_ENABLE_DEBUG([no]) +GLIBCXX_ENABLE_PARALLEL([yes]) GLIBCXX_ENABLE_CXX_FLAGS +GLIBCXX_ENABLE_FULLY_DYNAMIC_STRING([no]) -# No surprises, no surprises... -if test $atomicity_dir = cpu/generic ; then - AC_MSG_WARN([No native atomic operations are provided for this platform.]) - if test $target_thread_file = single; then - AC_MSG_WARN([They cannot be faked when thread support is disabled.]) - AC_MSG_WARN([Thread-safety of certain classes is not guaranteed.]) - else - AC_MSG_WARN([They will be faked using a mutex.]) - AC_MSG_WARN([Performance of certain classes will degrade as a result.]) - fi -fi +# Checks for operating systems support that doesn't require linking. +GLIBCXX_CHECK_SYSTEM_ERROR + +# For the streamoff typedef. +GLIBCXX_CHECK_INT64_T + +# For LFS support. +GLIBCXX_CHECK_LFS + +# For showmanyc_helper(). +AC_CHECK_HEADERS(sys/ioctl.h sys/filio.h) +GLIBCXX_CHECK_POLL +GLIBCXX_CHECK_S_ISREG_OR_S_IFREG + +# For xsputn_2(). +AC_CHECK_HEADERS(sys/uio.h) +GLIBCXX_CHECK_WRITEV + +# For C99 support to TR1. +GLIBCXX_CHECK_C99_TR1 + +# For common values of EOF, SEEK_CUR, SEEK_END. +GLIBCXX_CHECK_STDIO_MACROS +# For gettimeofday support. +GLIBCXX_CHECK_GETTIMEOFDAY +# For clock_gettime, nanosleep and sched_yield support. +# NB: The default is [no], because otherwise it requires linking. +GLIBCXX_ENABLE_LIBSTDCXX_TIME([no]) + +# For gthread support +GLIBCXX_CHECK_GTHREADS + +AC_LC_MESSAGES + +# Check for available headers. +AC_CHECK_HEADERS([endian.h execinfo.h float.h fp.h ieeefp.h inttypes.h \ +locale.h machine/endian.h machine/param.h nan.h stdint.h stdlib.h string.h \ +strings.h sys/ipc.h sys/isa_defs.h sys/machine.h sys/param.h \ +sys/resource.h sys/sem.h sys/stat.h sys/time.h sys/types.h unistd.h \ +wchar.h wctype.h]) + +# Only do link tests if native. Else, hardcode. if $GLIBCXX_IS_NATIVE; then # We can do more elaborate tests that assume a working linker. CANADIAN=no - # Check for available headers. - AC_CHECK_HEADERS([nan.h ieeefp.h endian.h sys/isa_defs.h machine/endian.h \ - machine/param.h sys/machine.h fp.h locale.h float.h inttypes.h gconv.h \ - sys/types.h]) - - GLIBCXX_CHECK_COMPILER_FEATURES GLIBCXX_CHECK_LINKER_FEATURES GLIBCXX_CHECK_MATH_SUPPORT - GLIBCXX_CHECK_BUILTIN_MATH_SUPPORT - GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT - GLIBCXX_CHECK_WCHAR_T_SUPPORT GLIBCXX_CHECK_STDLIB_SUPPORT - # For showmanyc_helper(). - AC_CHECK_HEADERS(sys/ioctl.h sys/filio.h) - GLIBCXX_CHECK_POLL - GLIBCXX_CHECK_S_ISREG_OR_S_IFREG - - # For xsputn_2(). - AC_CHECK_HEADERS(sys/uio.h) - GLIBCXX_CHECK_WRITEV - - # For the __streamoff_base_type typedef. - GLIBCXX_CHECK_INT64_T - - # For LFS support. - GLIBCXX_CHECK_LFS - - AC_LC_MESSAGES + # For /dev/random and /dev/urandom for TR1. + GLIBCXX_CHECK_RANDOM_TR1 - AC_TRY_COMPILE( - [#include ], - [sigjmp_buf env; - while (! sigsetjmp (env, 1)) - siglongjmp (env, 1); - ], - [AC_DEFINE(HAVE_SIGSETJMP, 1, [Define if sigsetjmp is available.])]) + # For TLS support. + GCC_CHECK_TLS - AC_FUNC_MMAP + # For iconv support. + AM_ICONV else @@ -181,8 +222,6 @@ else fi # Construct crosses by hand, eliminating bits that need ld... - # GLIBCXX_CHECK_COMPILER_FEATURES - # GLIBCXX_CHECK_BUILTIN_MATH_SUPPORT # GLIBCXX_CHECK_MATH_SUPPORT # First, test for "known" system libraries. We may be using newlib even @@ -193,17 +232,12 @@ else # GLIBCXX_CHECK_STDLIB_SUPPORT AC_DEFINE(HAVE_STRTOF) - AC_DEFINE(HAVE_STRTOLD) - # AC_FUNC_MMAP - AC_DEFINE(HAVE_MMAP) AC_DEFINE(HAVE_ACOSF) AC_DEFINE(HAVE_ASINF) AC_DEFINE(HAVE_ATAN2F) AC_DEFINE(HAVE_ATANF) AC_DEFINE(HAVE_CEILF) - AC_DEFINE(HAVE_COPYSIGN) - AC_DEFINE(HAVE_COPYSIGNF) AC_DEFINE(HAVE_COSF) AC_DEFINE(HAVE_COSHF) AC_DEFINE(HAVE_EXPF) @@ -222,10 +256,9 @@ else AC_DEFINE(HAVE_TANF) AC_DEFINE(HAVE_TANHF) - AC_DEFINE(HAVE_S_ISREG) - AC_DEFINE(HAVE_S_IFREG) + AC_DEFINE(HAVE_ICONV) else - m4_include([crossconfig.m4]) + GLIBCXX_CROSSCONFIG fi # At some point, we should differentiate between architectures @@ -237,7 +270,6 @@ else AC_DEFINE(HAVE_ATAN2L) AC_DEFINE(HAVE_ATANL) AC_DEFINE(HAVE_CEILL) - AC_DEFINE(HAVE_COPYSIGNL) AC_DEFINE(HAVE_COSL) AC_DEFINE(HAVE_COSHL) AC_DEFINE(HAVE_EXPL) @@ -257,11 +289,39 @@ else AC_DEFINE(HAVE_TANL) AC_DEFINE(HAVE_TANHL) fi - fi +# Check for _Unwind_GetIPInfo. +GCC_CHECK_UNWIND_GETIPINFO + + +GCC_LINUX_FUTEX([AC_DEFINE(HAVE_LINUX_FUTEX, 1, [Define if futex syscall is available.])]) + +GCC_HEADER_STDINT(include/gstdint.h) + # This depends on GLIBCXX CHECK_LINKER_FEATURES, but without it assumes no. GLIBCXX_ENABLE_SYMVERS([yes]) +GLIBCXX_ENABLE_VISIBILITY([yes]) + +ac_ldbl_compat=no +case "$target" in + powerpc*-*-linux* | \ + powerpc*-*-gnu* | \ + sparc*-*-linux* | \ + s390*-*-linux* | \ + alpha*-*-linux*) + AC_TRY_COMPILE(, [ +#if !defined __LONG_DOUBLE_128__ || (defined(__sparc__) && defined(__arch64__)) +#error no need for long double compatibility +#endif + ], [ac_ldbl_compat=yes], [ac_ldbl_compat=no]) + if test "$ac_ldbl_compat" = yes; then + AC_DEFINE([_GLIBCXX_LONG_DOUBLE_COMPAT],1, + [Define if compatibility should be provided for -mlong-double-64.]) + port_specific_symbol_files="\$(top_srcdir)/config/os/gnu-linux/ldbl-extra.ver" + fi +esac +GLIBCXX_CONDITIONAL(GLIBCXX_LDBL_COMPAT, test $ac_ldbl_compat = yes) # This depends on GLIBCXX_ENABLE_SYMVERS and GLIBCXX_IS_NATIVE. GLIBCXX_CONFIGURE_TESTSUITE @@ -269,18 +329,23 @@ GLIBCXX_CONFIGURE_TESTSUITE # Propagate the target-specific source directories through the build chain. ATOMICITY_SRCDIR=config/${atomicity_dir} ATOMIC_WORD_SRCDIR=config/${atomic_word_dir} +ATOMIC_FLAGS=${atomic_flags} +CPU_DEFINES_SRCDIR=config/${cpu_defines_dir} OS_INC_SRCDIR=config/${os_include_dir} +ERROR_CONSTANTS_SRCDIR=config/${error_constants_dir} ABI_TWEAKS_SRCDIR=config/${abi_tweaks_dir} AC_SUBST(ATOMICITY_SRCDIR) AC_SUBST(ATOMIC_WORD_SRCDIR) +AC_SUBST(ATOMIC_FLAGS) +AC_SUBST(CPU_DEFINES_SRCDIR) AC_SUBST(ABI_TWEAKS_SRCDIR) AC_SUBST(OS_INC_SRCDIR) +AC_SUBST(ERROR_CONSTANTS_SRCDIR) + # Determine cross-compile flags and AM_CONDITIONALs. #AC_SUBST(GLIBCXX_IS_NATIVE) #AM_CONDITIONAL(CANADIAN, test $CANADIAN = yes) -# from GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT: -#AM_CONDITIONAL(GLIBCXX_BUILD_LIBMATH, test $need_libmath = yes) GLIBCXX_EVALUATE_CONDITIONALS AC_CACHE_SAVE @@ -298,10 +363,8 @@ GLIBCXX_EXPORT_INSTALL_INFO GLIBCXX_EXPORT_INCLUDES GLIBCXX_EXPORT_FLAGS -if ${CONFIG_SHELL-/bin/sh} ./libtool --tag CXX --features | - grep "enable shared" > /dev/null; -then - LIBSUPCXX_PICFLAGS=-prefer-pic +if test "$enable_shared" = yes; then + LIBSUPCXX_PICFLAGS="-prefer-pic" else LIBSUPCXX_PICFLAGS= fi @@ -310,46 +373,32 @@ AC_SUBST(LIBSUPCXX_PICFLAGS) dnl In autoconf 2.5x, AC_OUTPUT is replaced by four AC_CONFIG_* macros, dnl which can all be called multiple times as needed, plus one (different) dnl AC_OUTPUT macro. This one lists the files to be created: -AC_CONFIG_FILES( \ - Makefile \ - AC_FOREACH([DIR], glibcxx_SUBDIRS, [DIR/Makefile ]) - ) -AC_CONFIG_FILES([scripts/check_survey],[chmod +x scripts/check_survey]) +AC_CONFIG_FILES(Makefile) AC_CONFIG_FILES([scripts/testsuite_flags],[chmod +x scripts/testsuite_flags]) -dnl These commands are run at the end of config.status: -AC_CONFIG_COMMANDS([default], -[if test -n "$CONFIG_FILES"; then - # Multilibs need MULTISUBDIR defined correctly in certain makefiles so - # that multilib installs will end up installed in the correct place. - # The testsuite needs it for multilib-aware ABI baseline files. - # To work around this not being passed down from config-ml.in -> - # srcdir/Makefile.am -> srcdir/{src,libsupc++,...}/Makefile.am, manually - # append it here. Only modify Makefiles that have just been created. - # - # Also, get rid of this simulated-VPATH thing that automake does. - cat > vpsed << \_EOF +# Multilibs need MULTISUBDIR defined correctly in certain makefiles so +# that multilib installs will end up installed in the correct place. +# The testsuite needs it for multilib-aware ABI baseline files. +# To work around this not being passed down from config-ml.in -> +# srcdir/Makefile.am -> srcdir/{src,libsupc++,...}/Makefile.am, manually +# append it here. Only modify Makefiles that have just been created. +# +# Also, get rid of this simulated-VPATH thing that automake does. +AC_CONFIG_FILES(AC_FOREACH([DIR], glibcxx_SUBDIRS, [DIR/Makefile ]), + [cat > vpsed$$ << \_EOF s!`test -f '$<' || echo '$(srcdir)/'`!! _EOF - for i in $SUBDIRS; do - case $CONFIG_FILES in - *${i}/Makefile*) - #echo "Adding MULTISUBDIR to $i/Makefile" - sed -f vpsed $i/Makefile > tmp - grep '^MULTISUBDIR =' Makefile >> tmp - mv tmp $i/Makefile - ;; - esac - done - rm vpsed - fi - (cd include && ${MAKE-make}) -], -[ -# Variables needed in config.status (file generation) which aren't already -# passed by autoconf. -SUBDIRS="$SUBDIRS" + sed -f vpsed$$ $ac_file > tmp$$ + mv tmp$$ $ac_file + rm vpsed$$ + echo 'MULTISUBDIR =' >> $ac_file + ml_norecursion=yes + . ${multi_basedir}/config-ml.in + AS_UNSET([ml_norecursion]) ]) +AC_CONFIG_COMMANDS([generate-headers], + [(cd include && ${MAKE-make} pch_build= )]) + dnl And this actually makes things happen: AC_OUTPUT