X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=libstdc%2B%2B-v3%2Facinclude.m4;h=51e35ea42a62c35837754ead3a725476ebff95fe;hb=f589330e8ea56732c51e33501c5821f4fe5b9710;hp=a1356bd7b06cb33dfdd122b114cdd4ec100e28f8;hpb=e6dbf6309dedda3b10ae28e2375bd4056a566e05;p=pf3gnuchains%2Fgcc-fork.git diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index a1356bd7b06..51e35ea42a6 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -49,7 +49,7 @@ AC_DEFUN([GLIBCXX_CONFIGURE], [ # Keep these sync'd with the list in Makefile.am. The first provides an # expandable list at autoconf time; the second provides an expandable list # (i.e., shell variable) at configure time. - m4_define([glibcxx_SUBDIRS],[include libmath libsupc++ src doc po testsuite]) + m4_define([glibcxx_SUBDIRS],[include libsupc++ python src doc po testsuite]) SUBDIRS='glibcxx_SUBDIRS' # These need to be absolute paths, yet at the same time need to @@ -79,35 +79,6 @@ AC_DEFUN([GLIBCXX_CONFIGURE], [ AC_HELP_STRING([--with-newlib], [assume newlib as a system C library])) - # 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([glibcxx_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) - AC_SUBST(CFLAGS) - AC_SUBST(CXXFLAGS) - # Will set LN_S to either 'ln -s', 'ln', or 'cp -p' (if linking isn't # available). Uncomment the next line to force a particular method. AC_PROG_LN_S @@ -123,7 +94,6 @@ AC_DEFUN([GLIBCXX_CONFIGURE], [ # which are themselves conditionally expanded. ## (Right now, this only matters for enable_wchar_t, but nothing prevents ## other macros from doing the same. This should be automated.) -pme - need_libmath=no # Check for uClibc since Linux platforms use different configuration # directories depending on the C library in use. @@ -239,8 +209,8 @@ AC_DEFUN([GLIBCXX_CHECK_LINKER_FEATURES], [ if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then glibcxx_ld_is_gold=yes fi - ldver=`$LD --version 2>/dev/null | head -1 | \ - sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'` + ldver=`$LD --version 2>/dev/null | + sed -e 's/GNU g*o*ld v*e*r*s*i*o*n* *\(([^)]*)* *\) \([0-9.][0-9.]*\).*/\2/; q'` changequote([,]) glibcxx_gnu_ld_version=`echo $ldver | \ $AWK -F. '{ if (NF<3) [$]3=0; print ([$]1*100+[$]2)*100+[$]3 }'` @@ -639,7 +609,7 @@ AC_DEFUN([GLIBCXX_CONFIGURE_TESTSUITE], [ fi # Export file names for ABI checking. - baseline_dir="$glibcxx_srcdir/config/abi/post/${abi_baseline_pair}\$(MULTISUBDIR)" + baseline_dir="$glibcxx_srcdir/config/abi/post/${abi_baseline_pair}" AC_SUBST(baseline_dir) ]) @@ -1074,26 +1044,28 @@ AC_DEFUN([GLIBCXX_ENABLE_C99], [ dnl -dnl Check for clock_gettime clocks, used in the implementation of 20.8.5 -dnl [time.clock] in the current C++0x working draft. +dnl Check for clock_gettime, nanosleep and sched_yield, used in the +dnl implementation of 20.8.5 [time.clock], and 30.2.2 [thread.thread.this] +dnl in the current C++0x working draft. dnl -dnl --enable-clock-gettime -dnl --enable-clock-gettime=yes -dnl checks for the availability of monotonic and realtime clocks -dnl in libc and libposix4 and in case links the latter -dnl --enable-clock-gettime=rt +dnl --enable-libstdcxx-time +dnl --enable-libstdcxx-time=yes +dnl checks for the availability of monotonic and realtime clocks, +dnl nanosleep and sched_yield in libc and libposix4 and, in case, links +dnl the latter +dnl --enable-libstdcxx-time=rt dnl also searches (and, in case, links) librt. Note that this is dnl not always desirable because, in glibc, for example, in turn it dnl triggers the linking of libpthread too, which activates locking, dnl a large overhead for single-thread programs. -dnl --enable-clock-gettime=no -dnl --disable-clock-gettime +dnl --enable-libstdcxx-time=no +dnl --disable-libstdcxx-time dnl disables the checks completely dnl -AC_DEFUN([GLIBCXX_ENABLE_CLOCK_GETTIME], [ +AC_DEFUN([GLIBCXX_ENABLE_LIBSTDCXX_TIME], [ - AC_MSG_CHECKING([for clock_gettime clocks]) - GLIBCXX_ENABLE(clock-gettime,$1,[=KIND], + AC_MSG_CHECKING([for clock_gettime, nanosleep and sched_yield]) + GLIBCXX_ENABLE(libstdcxx-time,$1,[=KIND], [use KIND for check type], [permit yes|no|rt]) @@ -1103,19 +1075,47 @@ AC_DEFUN([GLIBCXX_ENABLE_CLOCK_GETTIME], [ CXXFLAGS="$CXXFLAGS -fno-exceptions" ac_save_LIBS="$LIBS" - ac_has_clock_monotonic=no; + ac_has_clock_monotonic=no; ac_has_clock_realtime=no; - if test x"$enable_clock_gettime" != x"no"; then + if test x"$enable_libstdcxx_time" != x"no"; then - if test x"$enable_clock_gettime" = x"rt"; then + if test x"$enable_libstdcxx_time" = x"rt"; then AC_SEARCH_LIBS(clock_gettime, [rt posix4]) + AC_SEARCH_LIBS(nanosleep, [rt posix4]) else AC_SEARCH_LIBS(clock_gettime, [posix4]) + AC_SEARCH_LIBS(nanosleep, [posix4]) fi case "$ac_cv_search_clock_gettime" in -l*) GLIBCXX_LIBS=$ac_cv_search_clock_gettime + ;; + esac + case "$ac_cv_search_nanosleep" in + -l*) GLIBCXX_LIBS="$GLIBCXX_LIBS $ac_cv_search_nanosleep" + ;; + esac + + AC_SEARCH_LIBS(sched_yield, [rt posix4]) + + case "$ac_cv_search_sched_yield" in + -lposix4*) + GLIBCXX_LIBS="$GLIBCXX_LIBS $ac_cv_search_sched_yield" + AC_DEFINE(_GLIBCXX_USE_SCHED_YIELD, 1, + [ Defined if sched_yield is available. ]) + ;; + -lrt*) + if test x"$enable_libstdcxx_time" = x"rt"; then + GLIBCXX_LIBS="$GLIBCXX_LIBS $ac_cv_search_sched_yield" + AC_DEFINE(_GLIBCXX_USE_SCHED_YIELD, 1, + [ Defined if sched_yield is available. ]) + fi + ;; + *) + AC_DEFINE(_GLIBCXX_USE_SCHED_YIELD, 1, + [ Defined if sched_yield is available. ]) + ;; esac AC_CHECK_HEADERS(unistd.h, ac_has_unistd_h=yes, ac_has_unistd_h=no) @@ -1146,8 +1146,20 @@ AC_DEFUN([GLIBCXX_ENABLE_CLOCK_GETTIME], [ ], [ac_has_clock_realtime=yes], [ac_has_clock_realtime=no]) AC_MSG_RESULT($ac_has_clock_realtime) - fi + AC_MSG_CHECKING([for nanosleep]) + AC_TRY_LINK( + [#include + #include + ], + [#if _POSIX_TIMERS > 0 + timespec tp; + #endif + nanosleep(&tp, 0); + ], [ac_has_nanosleep=yes], [ac_has_nanosleep=no]) + + AC_MSG_RESULT($ac_has_nanosleep) + fi fi if test x"$ac_has_clock_monotonic" = x"yes"; then @@ -1160,6 +1172,11 @@ AC_DEFUN([GLIBCXX_ENABLE_CLOCK_GETTIME], [ [ Defined if clock_gettime has realtime clock support. ]) fi + if test x"$ac_has_nanosleep" = x"yes"; then + AC_DEFINE(_GLIBCXX_USE_NANOSLEEP, 1, + [ Defined if nanosleep is available. ]) + fi + AC_SUBST(GLIBCXX_LIBS) CXXFLAGS="$ac_save_CXXFLAGS" @@ -1201,39 +1218,6 @@ AC_DEFUN([GLIBCXX_CHECK_GETTIMEOFDAY], [ ]) dnl -dnl Check for nanosleep, used in the implementation of 30.2.2 -dnl [thread.thread.this] in the current C++0x working draft. -dnl -AC_DEFUN([GLIBCXX_CHECK_NANOSLEEP], [ - - AC_MSG_CHECKING([for nanosleep]) - - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -fno-exceptions" - - ac_has_nanosleep=no; - AC_CHECK_HEADERS(time.h, ac_has_time_h=yes, ac_has_time_h=no) - if test x"$ac_has_time_h" = x"yes"; then - AC_MSG_CHECKING([for nanosleep]) - AC_TRY_COMPILE([#include ], - [timespec ts; nanosleep(&ts, 0);], - [ac_has_nanosleep=yes], [ac_has_nanosleep=no]) - - AC_MSG_RESULT($ac_has_nanosleep) - fi - - if test x"$ac_has_nanosleep" = x"yes"; then - AC_DEFINE(_GLIBCXX_USE_NANOSLEEP, 1, - [ Defined if nanosleep is available. ]) - fi - - CXXFLAGS="$ac_save_CXXFLAGS" - AC_LANG_RESTORE -]) - -dnl dnl Check for ISO/IEC 9899:1999 "C99" support to ISO/IEC DTR 19768 "TR1" dnl facilities in Chapter 8, "C compatibility". dnl @@ -2238,6 +2222,44 @@ AC_DEFUN([GLIBCXX_ENABLE_LONG_LONG], [ dnl +dnl Check for decimal floating point. +dnl See: +dnl http://gcc.gnu.org/onlinedocs/gcc/Decimal-Float.html#Decimal-Float +dnl +dnl This checks to see if the host supports decimal floating point types. +dnl +dnl Defines: +dnl _GLIBCXX_USE_DECIMAL_FLOAT +dnl +AC_DEFUN([GLIBCXX_ENABLE_DECIMAL_FLOAT], [ + + # Fake what AC_TRY_COMPILE does, without linking as this is + # unnecessary for this test. + + cat > conftest.$ac_ext << EOF +[#]line __oline__ "configure" +int main() +{ + _Decimal32 d1; + _Decimal64 d2; + _Decimal128 d3; + return 0; +} +EOF + + AC_MSG_CHECKING([for ISO/IEC TR 24733 ]) + if AC_TRY_EVAL(ac_compile); then + AC_DEFINE(_GLIBCXX_USE_DECIMAL_FLOAT, 1, + [Define if ISO/IEC TR 24733 decimal floating point types are supported on this host.]) + enable_dfp=yes + else + enable_dfp=no + fi + AC_MSG_RESULT($enable_dfp) + rm -f conftest* +]) + +dnl dnl Check for template specializations for the 'wchar_t' type. dnl dnl --enable-wchar_t defines _GLIBCXX_USE_WCHAR_T @@ -2570,7 +2592,7 @@ EOF if test $atomicity_dir = "cpu/generic" ; then atomicity_dir=cpu/generic/atomicity_mutex AC_MSG_WARN([No native atomic operations are provided for this platform.]) - if test $target_thread_file = single; then + if test "x$target_thread_file" = xsingle; 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 @@ -2715,7 +2737,7 @@ if test x$enable_symvers = xyes ; then else if test $with_gnu_ld = yes ; then case ${target_os} in - cygwin* | pe | mingw32*) + cygwin* | pe | mingw32* | hpux*) enable_symvers=no ;; *) enable_symvers=gnu ;; @@ -2819,6 +2841,16 @@ if test x$enable_symvers != xno ; then [Define to use symbol versioning in the shared library.]) fi +AC_CACHE_CHECK([whether the target supports .symver directive], + glibcxx_cv_have_as_symver_directive, [ + AC_TRY_COMPILE([void foo (void); __asm (".symver foo, bar@SYMVER");], + [], glibcxx_cv_have_as_symver_directive=yes, + glibcxx_cv_have_as_symver_directive=no)]) +if test $glibcxx_cv_have_as_symver_directive = yes; then + AC_DEFINE(HAVE_AS_SYMVER_DIRECTIVE, 1, + [Define to 1 if the target assembler supports .symver directive.]) +fi + AC_SUBST(SYMVER_FILE) AC_SUBST(port_specific_symbol_files) GLIBCXX_CONDITIONAL(ENABLE_SYMVERS, test $enable_symvers != no)