X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=libstdc%2B%2B-v3%2Fconfigure.ac;h=1fd8119b51d39caecb1a37f562b839e2afd08ea0;hb=d7aff14aca156f61b8586f879749e695c416ff20;hp=4ad8d0ebfad2f480f624ae725d9f7c6367826de1;hpb=d0ff4e646322cf50ab9f0c32d7a83876795eb584;p=pf3gnuchains%2Fgcc-fork.git diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac index 4ad8d0ebfad..1fd8119b51d 100644 --- a/libstdc++-v3/configure.ac +++ b/libstdc++-v3/configure.ac @@ -1,6 +1,6 @@ # 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) @@ -12,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:10:0 +libtool_VERSION=6:14:0 AC_SUBST(libtool_VERSION) # Find the rest of the source tree framework. @@ -78,11 +78,42 @@ AM_INIT_AUTOMAKE([1.9.3 no-define foreign no-dependencies -Wall -Wno-portability 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 +# We're almost certainly being configured before anything else which uses +# C++, so all of our AC_PROG_* discoveries will be cached. It's vital that +# we not cache the value of CXX that we "discover" here, because it's set +# to something unique for us and libjava. Other target libraries need to +# find CXX for themselves. We yank the rug out from under the normal AC_* +# process by sneakily renaming the cache variable. This also lets us debug +# the value of "our" CXX in postmortems. +# +# We must also force CXX to /not/ be a precious variable, otherwise the +# wrong (non-multilib-adjusted) value will be used in multilibs. This +# little trick also affects CPPFLAGS, CXXFLAGS, and LDFLAGS. And as a side +# effect, CXXFLAGS is no longer automagically subst'd, so we have to do +# that ourselves. Un-preciousing AC_PROG_CC also affects CC and CFLAGS. +# +# -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. + +m4_define([ac_cv_prog_CXX],[glibcxx_cv_prog_CXX]) +m4_rename([_AC_ARG_VAR_PRECIOUS],[glibcxx_PRECIOUS]) +m4_define([_AC_ARG_VAR_PRECIOUS],[]) +save_CXXFLAGS="$CXXFLAGS" +CXXFLAGS="$CXXFLAGS -fno-builtin" +AC_PROG_CC +AC_PROG_CXX +CXXFLAGS="$save_CXXFLAGS" +m4_rename_force([glibcxx_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) +AC_SUBST(CFLAGS) +AC_SUBST(CXXFLAGS) + +# Runs configure.host, and assorted other critical bits. Sets # up critical shell variables. GLIBCXX_CONFIGURE -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) @@ -95,8 +126,14 @@ GLIBCXX_ENABLE_HOSTED # 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 that doesn't require linking. +# 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 @@ -107,82 +144,68 @@ 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]) -# Checks for operating systems support that don't require linking. +# Checks for operating systems support that doesn't require linking. GLIBCXX_CHECK_SYSTEM_ERROR -# No surprises, no surprises... -GLIBCXX_ENABLE_THREADS -GLIBCXX_ENABLE_ATOMIC_BUILTINS -if test $atomicity_dir = cpu/generic/atomicity_mutex ; 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 +# For the streamoff typedef. +GLIBCXX_CHECK_INT64_T -GLIBCXX_CHECK_COMPILER_FEATURES +# For LFS support. +GLIBCXX_CHECK_LFS -if $GLIBCXX_IS_NATIVE; then +# For showmanyc_helper(). +AC_CHECK_HEADERS(sys/ioctl.h sys/filio.h) +GLIBCXX_CHECK_POLL +GLIBCXX_CHECK_S_ISREG_OR_S_IFREG - # We can do more elaborate tests that assume a working linker. - CANADIAN=no +# For xsputn_2(). +AC_CHECK_HEADERS(sys/uio.h) +GLIBCXX_CHECK_WRITEV - # 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 sys/ipc.h sys/sem.h]) +# For C99 support to TR1. +GLIBCXX_CHECK_C99_TR1 - GLIBCXX_CHECK_LINKER_FEATURES - GLIBCXX_CHECK_MATH_SUPPORT - GLIBCXX_CHECK_BUILTIN_MATH_SUPPORT - GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT - GLIBCXX_CHECK_STDLIB_SUPPORT +# For common values of EOF, SEEK_CUR, SEEK_END. +GLIBCXX_CHECK_STDIO_MACROS - # For showmanyc_helper(). - AC_CHECK_HEADERS(sys/ioctl.h sys/filio.h) - GLIBCXX_CHECK_POLL - GLIBCXX_CHECK_S_ISREG_OR_S_IFREG +# For gettimeofday support. +GLIBCXX_CHECK_GETTIMEOFDAY - # For xsputn_2(). - AC_CHECK_HEADERS(sys/uio.h) - GLIBCXX_CHECK_WRITEV +# For clock_gettime, nanosleep and sched_yield support. +# NB: The default is [no], because otherwise it requires linking. +GLIBCXX_ENABLE_LIBSTDCXX_TIME([no]) - # For the __streamoff_base_type typedef. - GLIBCXX_CHECK_INT64_T +# For gthread support +GLIBCXX_CHECK_GTHREADS - # For LFS support. - GLIBCXX_CHECK_LFS +AC_LC_MESSAGES - # For C99 support to TR1. - GLIBCXX_CHECK_C99_TR1 +# Check for available headers. +AC_CHECK_HEADERS([endian.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]) - # For dev/random and dev/urandom for TR1. - GLIBCXX_CHECK_RANDOM_TR1 - - # For TLS support. - GCC_CHECK_TLS +# Only do link tests if native. Else, hardcode. +if $GLIBCXX_IS_NATIVE; then - # For _Unwind_GetIPInfo. - GCC_CHECK_UNWIND_GETIPINFO + # We can do more elaborate tests that assume a working linker. + CANADIAN=no - AC_LC_MESSAGES + GLIBCXX_CHECK_LINKER_FEATURES + GLIBCXX_CHECK_MATH_SUPPORT + GLIBCXX_CHECK_STDLIB_SUPPORT - 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 /dev/random and /dev/urandom for TR1. + GLIBCXX_CHECK_RANDOM_TR1 - AC_FUNC_MMAP + # For TLS support. + GCC_CHECK_TLS # For iconv support. AM_ICONV @@ -215,7 +238,6 @@ else fi # Construct crosses by hand, eliminating bits that need ld... - # GLIBCXX_CHECK_BUILTIN_MATH_SUPPORT # GLIBCXX_CHECK_MATH_SUPPORT # First, test for "known" system libraries. We may be using newlib even @@ -226,16 +248,12 @@ else # GLIBCXX_CHECK_STDLIB_SUPPORT AC_DEFINE(HAVE_STRTOF) - # 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) @@ -254,9 +272,6 @@ else AC_DEFINE(HAVE_TANF) AC_DEFINE(HAVE_TANHF) - AC_DEFINE(HAVE_S_ISREG) - AC_DEFINE(HAVE_S_IFREG) - AC_DEFINE(HAVE_ICONV) else GLIBCXX_CROSSCONFIG @@ -271,7 +286,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) @@ -291,11 +305,15 @@ else AC_DEFINE(HAVE_TANL) AC_DEFINE(HAVE_TANHL) fi +fi - # Assume we have _Unwind_GetIPInfo for cross-compiles. - AC_DEFINE(HAVE_GETIPINFO) +# Check for _Unwind_GetIPInfo. +GCC_CHECK_UNWIND_GETIPINFO -fi + +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]) @@ -327,21 +345,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 @@ -369,45 +389,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(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