aboutsummaryrefslogtreecommitdiffstats
path: root/gcc-4.6
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2013-01-03 02:12:43 -0800
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-01-03 02:12:43 -0800
commita16b557938a0a448303fd913af1ff76e09674966 (patch)
treeac64455561b300d89346bb2fdeb31b4d25b8f6e8 /gcc-4.6
parentbd342f0491128ad15e6ea4ff241e243b753137c9 (diff)
downloadtoolchain_gcc-a16b557938a0a448303fd913af1ff76e09674966.zip
toolchain_gcc-a16b557938a0a448303fd913af1ff76e09674966.tar.gz
toolchain_gcc-a16b557938a0a448303fd913af1ff76e09674966.tar.bz2
Revert "Enable _GLIBCXX_USE_CLOCK_MONOTONIC in libstdc++"
This reverts commit bd342f0491128ad15e6ea4ff241e243b753137c9 In favor of later/better fix in 75d889ea23f0ff1ecaa5cb79b435aca25460a4c9 Change-Id: Iae68d49b39b528d790c7404e657f3daa32a19864
Diffstat (limited to 'gcc-4.6')
-rw-r--r--gcc-4.6/libstdc++-v3/acinclude.m42
-rwxr-xr-xgcc-4.6/libstdc++-v3/configure2
2 files changed, 2 insertions, 2 deletions
diff --git a/gcc-4.6/libstdc++-v3/acinclude.m4 b/gcc-4.6/libstdc++-v3/acinclude.m4
index b02d1ce..d6735e9 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 <unistd.h>
#include <time.h>
],
- [#if _POSIX_TIMERS > 0 && (defined(_POSIX_MONOTONIC_CLOCK) || defined(__ANDROID__))
+ [#if _POSIX_TIMERS > 0 && defined(_POSIX_MONOTONIC_CLOCK)
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 5fb2528..9aedd4f 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) || defined(__ANDROID__))
+#if _POSIX_TIMERS > 0 && defined(_POSIX_MONOTONIC_CLOCK)
timespec tp;
#endif
clock_gettime(CLOCK_MONOTONIC, &tp);