From bd342f0491128ad15e6ea4ff241e243b753137c9 Mon Sep 17 00:00:00 2001 From: Andrew Hsieh Date: Fri, 28 Dec 2012 18:37:49 +0800 Subject: Enable _GLIBCXX_USE_CLOCK_MONOTONIC in libstdc++ This is needed to provide "steady_clock" (or monotonic_clock in GCC 4.6/4.4.3) in See http://code.google.com/p/android/issues/detail?id=39680 Change-Id: I0c31704971dc15751ce936f563de7c42a4e645a6 --- gcc-4.4.3/libstdc++-v3/acinclude.m4 | 2 +- gcc-4.4.3/libstdc++-v3/configure | 2 +- gcc-4.6/libstdc++-v3/acinclude.m4 | 2 +- gcc-4.6/libstdc++-v3/configure | 2 +- gcc-4.7/libstdc++-v3/acinclude.m4 | 2 +- gcc-4.7/libstdc++-v3/configure | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gcc-4.4.3/libstdc++-v3/acinclude.m4 b/gcc-4.4.3/libstdc++-v3/acinclude.m4 index 195015bd2..f0c77d899 100644 --- a/gcc-4.4.3/libstdc++-v3/acinclude.m4 +++ b/gcc-4.4.3/libstdc++-v3/acinclude.m4 @@ -1162,7 +1162,7 @@ AC_DEFUN([GLIBCXX_ENABLE_LIBSTDCXX_TIME], [ [#include #include ], - [#if _POSIX_TIMERS > 0 && defined(_POSIX_MONOTONIC_CLOCK) + [#if _POSIX_TIMERS > 0 && (defined(_POSIX_MONOTONIC_CLOCK) || defined(__ANDROID__)) timespec tp; #endif clock_gettime(CLOCK_MONOTONIC, &tp); diff --git a/gcc-4.4.3/libstdc++-v3/configure b/gcc-4.4.3/libstdc++-v3/configure index 6922a6c7a..769e4c21b 100755 --- a/gcc-4.4.3/libstdc++-v3/configure +++ b/gcc-4.4.3/libstdc++-v3/configure @@ -22677,7 +22677,7 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -#if _POSIX_TIMERS > 0 && defined(_POSIX_MONOTONIC_CLOCK) +#if _POSIX_TIMERS > 0 && (defined(_POSIX_MONOTONIC_CLOCK) || defined(__ANDROID__)) timespec tp; #endif clock_gettime(CLOCK_MONOTONIC, &tp); diff --git a/gcc-4.6/libstdc++-v3/acinclude.m4 b/gcc-4.6/libstdc++-v3/acinclude.m4 index d6735e9b5..b02d1ce83 100644 --- a/gcc-4.6/libstdc++-v3/acinclude.m4 +++ b/gcc-4.6/libstdc++-v3/acinclude.m4 @@ -1175,7 +1175,7 @@ AC_DEFUN([GLIBCXX_ENABLE_LIBSTDCXX_TIME], [ [#include #include ], - [#if _POSIX_TIMERS > 0 && defined(_POSIX_MONOTONIC_CLOCK) + [#if _POSIX_TIMERS > 0 && (defined(_POSIX_MONOTONIC_CLOCK) || defined(__ANDROID__)) timespec tp; #endif clock_gettime(CLOCK_MONOTONIC, &tp); diff --git a/gcc-4.6/libstdc++-v3/configure b/gcc-4.6/libstdc++-v3/configure index 9aedd4fb7..5fb2528ed 100755 --- a/gcc-4.6/libstdc++-v3/configure +++ b/gcc-4.6/libstdc++-v3/configure @@ -19306,7 +19306,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext int main () { -#if _POSIX_TIMERS > 0 && defined(_POSIX_MONOTONIC_CLOCK) +#if _POSIX_TIMERS > 0 && (defined(_POSIX_MONOTONIC_CLOCK) || defined(__ANDROID__)) timespec tp; #endif clock_gettime(CLOCK_MONOTONIC, &tp); diff --git a/gcc-4.7/libstdc++-v3/acinclude.m4 b/gcc-4.7/libstdc++-v3/acinclude.m4 index 319e32784..c94810f0d 100644 --- a/gcc-4.7/libstdc++-v3/acinclude.m4 +++ b/gcc-4.7/libstdc++-v3/acinclude.m4 @@ -1197,7 +1197,7 @@ AC_DEFUN([GLIBCXX_ENABLE_LIBSTDCXX_TIME], [ [#include #include ], - [#if _POSIX_TIMERS > 0 && defined(_POSIX_MONOTONIC_CLOCK) + [#if _POSIX_TIMERS > 0 && (defined(_POSIX_MONOTONIC_CLOCK) || defined(__ANDROID__)) timespec tp; #endif clock_gettime(CLOCK_MONOTONIC, &tp); diff --git a/gcc-4.7/libstdc++-v3/configure b/gcc-4.7/libstdc++-v3/configure index aea3acc33..1c2d5ecac 100755 --- a/gcc-4.7/libstdc++-v3/configure +++ b/gcc-4.7/libstdc++-v3/configure @@ -19774,7 +19774,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext int main () { -#if _POSIX_TIMERS > 0 && defined(_POSIX_MONOTONIC_CLOCK) +#if _POSIX_TIMERS > 0 && (defined(_POSIX_MONOTONIC_CLOCK) || defined(__ANDROID__)) timespec tp; #endif clock_gettime(CLOCK_MONOTONIC, &tp); -- cgit v1.2.3