Patchwork Default to --enable-libstdcxx-time=auto

login
register
mail settings
Submitter Jakub Jelinek
Date May 23, 2013, 4:26 p.m.
Message ID <20130523162611.GA1377@tucnak.redhat.com>
Download mbox | patch
Permalink /patch/245979/
State New
Headers show

Comments

Jakub Jelinek - May 23, 2013, 4:26 p.m.
On Thu, May 23, 2013 at 04:02:18PM +0200, Jakub Jelinek wrote:
> So, here is an untested 4.8 branch patch.  The @GLIBCXX_3.4.17 +
> @@GLIBCXX_3.4.19 stuff gets ugly, I admit, but don't have other solution.
> Tested just that it compiles/links, abi list looks good and abi.exp testing,
> haven't actually tried to test it more than that.

Now fully bootstrapped/regtested on x86_64-linux and i686-linux.

Here is the corresponding trunk patch (untested at this point though):

2013-05-23  Jakub Jelinek  <jakub@redhat.com>

	* src/c++11/chrono.cc: If _GLIBCXX_USE_CLOCK_MONOTONIC_SYSCALL,
	include unistd.h and sys/syscall.h.  If _GLIBCXX_COMPATIBILITY_CXX0X,
	don't define system_clock::is_steady, system_clock::now() and
	steady_clock::is_steady.
	(std::chrono::system_clock::now()): If
	_GLIBCXX_USE_CLOCK_MONOTONIC_SYSCALL, call
	syscall (SYS_clock_gettime, ...) instead of clock_gettime (...).
	(std::chrono::system_clock::now()): Likewise.  Add weak attribute
	if _GLIBCXX_COMPATIBILITY_CXX0X and compatibility-chrono.cc will
	be non-empty.
	* src/Makefile.am (cxx11_sources): Add compatibility-chrono.cc.
	(compatibility-chrono.lo, compatibility-chrono.o): New goals.
	* src/c++11/compatibility-chrono.cc: New file.
	* acinclude.m4 (GLIBCXX_ENABLE_LIBSTDCXX_TIME): On linux*, check for
	syscall (SYS_clock_gettime, CLOCK_MONOTONIC, &tp).
	* testsuite/util/testsuite_abi.cc (check_version): Add
	GLIBCXX_3.4.20 version and make it the latest.
	* config/abi/pre/gnu.ver (_ZNSt6chrono12steady_clock3nowEv): Export
	also @@GLIBCXX_3.4.19.  Move all symbols so far added for GCC 4.9 to
	@@GLIBCXX_3.4.20 instead.
	* config/abi/post/i386-linux-gnu/baseline_symbols.txt: Regenerated.
	* config/abi/post/s390x-linux-gnu/baseline_symbols.txt: Regenerated.
	* config/abi/post/powerpc64-linux-gnu/baseline_symbols.txt:
	Regenerated.
	* config/abi/post/powerpc64-linux-gnu/32/baseline_symbols.txt:
	Regenerated.
	* config/abi/post/x86_64-linux-gnu/baseline_symbols.txt: Regenerated.
	* config/abi/post/x86_64-linux-gnu/32/baseline_symbols.txt:
	Regenerated.
	* config/abi/post/powerpc-linux-gnu/baseline_symbols.txt: Regenerated.
	* config/abi/post/s390-linux-gnu/baseline_symbols.txt: Regenerated.
	* config/abi/post/i486-linux-gnu/baseline_symbols.txt: Regenerated.
	* config.h.in: Regenerated.
	* src/Makefile.in: Regenerated.
	* configure: Regenerated.


	Jakub
Rainer Orth - May 23, 2013, 8:45 p.m.
Jakub Jelinek <jakub@redhat.com> writes:

> On Thu, May 23, 2013 at 04:02:18PM +0200, Jakub Jelinek wrote:
>> So, here is an untested 4.8 branch patch.  The @GLIBCXX_3.4.17 +
>> @@GLIBCXX_3.4.19 stuff gets ugly, I admit, but don't have other solution.
>> Tested just that it compiles/links, abi list looks good and abi.exp testing,
>> haven't actually tried to test it more than that.
>
> Now fully bootstrapped/regtested on x86_64-linux and i686-linux.

This patch breaks Solaris bootstrap:

ld: fatal: libstdc++-symbols.ver-sun: 4423: symbol 'std::chrono::steady_clock::now()' is already defined in file: libstdc++-symbols.ver-sun: symbol version conflict
collect2: error: ld returned 1 exit status
make[6]: *** [libstdc++.la] Error 1

I think std::chrono::steady_clock::now() needs to be protected with
!(__sun__ && __svr4__) in GLIBCXX_3.4.17 since it only became available
by default with Jonathan's patch.

	Rainer
Jakub Jelinek - May 23, 2013, 8:50 p.m.
On Thu, May 23, 2013 at 10:45:32PM +0200, Rainer Orth wrote:
> Jakub Jelinek <jakub@redhat.com> writes:
> 
> > On Thu, May 23, 2013 at 04:02:18PM +0200, Jakub Jelinek wrote:
> >> So, here is an untested 4.8 branch patch.  The @GLIBCXX_3.4.17 +
> >> @@GLIBCXX_3.4.19 stuff gets ugly, I admit, but don't have other solution.
> >> Tested just that it compiles/links, abi list looks good and abi.exp testing,
> >> haven't actually tried to test it more than that.
> >
> > Now fully bootstrapped/regtested on x86_64-linux and i686-linux.
> 
> This patch breaks Solaris bootstrap:
> 
> ld: fatal: libstdc++-symbols.ver-sun: 4423: symbol 'std::chrono::steady_clock::now()' is already defined in file: libstdc++-symbols.ver-sun: symbol version conflict
> collect2: error: ld returned 1 exit status
> make[6]: *** [libstdc++.la] Error 1
> 
> I think std::chrono::steady_clock::now() needs to be protected with
> !(__sun__ && __svr4__) in GLIBCXX_3.4.17 since it only became available
> by default with Jonathan's patch.

Ah, I see, gnu.ver has some
#ifdef HAVE_SYMVER_SYMBOL_RENAMING_RUNTIME_SUPPORT
#endif
guards there, does it work if you add it around the
GLIBCXX_3.4.17 std::chrono::steady_clock::now() definition?
Seems the solaris baseline_symbols.txt files don't meantion
this symbol, thus it wasn't exported before and thus the
compat definition there isn't really needed for Solaris.

	Jakub
Rainer Orth - May 23, 2013, 8:56 p.m.
Jakub Jelinek <jakub@redhat.com> writes:

> On Thu, May 23, 2013 at 10:45:32PM +0200, Rainer Orth wrote:
>> Jakub Jelinek <jakub@redhat.com> writes:
>> 
>> > On Thu, May 23, 2013 at 04:02:18PM +0200, Jakub Jelinek wrote:
>> >> So, here is an untested 4.8 branch patch.  The @GLIBCXX_3.4.17 +
>> >> @@GLIBCXX_3.4.19 stuff gets ugly, I admit, but don't have other solution.
>> >> Tested just that it compiles/links, abi list looks good and abi.exp testing,
>> >> haven't actually tried to test it more than that.
>> >
>> > Now fully bootstrapped/regtested on x86_64-linux and i686-linux.
>> 
>> This patch breaks Solaris bootstrap:
>> 
>> ld: fatal: libstdc++-symbols.ver-sun: 4423: symbol 'std::chrono::steady_clock::now()' is already defined in file: libstdc++-symbols.ver-sun: symbol version conflict
>> collect2: error: ld returned 1 exit status
>> make[6]: *** [libstdc++.la] Error 1
>> 
>> I think std::chrono::steady_clock::now() needs to be protected with
>> !(__sun__ && __svr4__) in GLIBCXX_3.4.17 since it only became available
>> by default with Jonathan's patch.
>
> Ah, I see, gnu.ver has some
> #ifdef HAVE_SYMVER_SYMBOL_RENAMING_RUNTIME_SUPPORT
> #endif
> guards there, does it work if you add it around the
> GLIBCXX_3.4.17 std::chrono::steady_clock::now() definition?

If I do so, I would probably get an abi_check failure: with your patch,
std::chrono::steady_clock::now() ends up in GLIBCXX_3.4.19 while it
should appear in GLIBCXX_3.4.20 since this is new in GCC 4.9.

> Seems the solaris baseline_symbols.txt files don't meantion
> this symbol, thus it wasn't exported before and thus the
> compat definition there isn't really needed for Solaris.

Right, it only got enable by defaulting --enable-libstdcxx-time to auto.

	Rainer
Jakub Jelinek - May 23, 2013, 9:06 p.m.
On Thu, May 23, 2013 at 10:56:25PM +0200, Rainer Orth wrote:
> >> I think std::chrono::steady_clock::now() needs to be protected with
> >> !(__sun__ && __svr4__) in GLIBCXX_3.4.17 since it only became available
> >> by default with Jonathan's patch.
> >
> > Ah, I see, gnu.ver has some
> > #ifdef HAVE_SYMVER_SYMBOL_RENAMING_RUNTIME_SUPPORT
> > #endif
> > guards there, does it work if you add it around the
> > GLIBCXX_3.4.17 std::chrono::steady_clock::now() definition?
> 
> If I do so, I would probably get an abi_check failure: with your patch,
> std::chrono::steady_clock::now() ends up in GLIBCXX_3.4.19 while it
> should appear in GLIBCXX_3.4.20 since this is new in GCC 4.9.

In that case, either the --enable-libstdcxx-time=auto patch needs to be
backported to 4.8.1, or at least a small portion of it (do that auto thing
on Solaris only)?
Have steady_clock::now() as @GLIBCXX_3.4.17 + @@GLIBCXX_3.4.19 on Linux,
@@GLIBCXX_3.4.20 on Solaris, something else on other OSes would be quite
confusing.

> > Seems the solaris baseline_symbols.txt files don't meantion
> > this symbol, thus it wasn't exported before and thus the
> > compat definition there isn't really needed for Solaris.
> 
> Right, it only got enable by defaulting --enable-libstdcxx-time to auto.

	Jakub
Rainer Orth - May 23, 2013, 9:08 p.m.
Jakub Jelinek <jakub@redhat.com> writes:

> On Thu, May 23, 2013 at 10:56:25PM +0200, Rainer Orth wrote:
>> >> I think std::chrono::steady_clock::now() needs to be protected with
>> >> !(__sun__ && __svr4__) in GLIBCXX_3.4.17 since it only became available
>> >> by default with Jonathan's patch.
>> >
>> > Ah, I see, gnu.ver has some
>> > #ifdef HAVE_SYMVER_SYMBOL_RENAMING_RUNTIME_SUPPORT
>> > #endif
>> > guards there, does it work if you add it around the
>> > GLIBCXX_3.4.17 std::chrono::steady_clock::now() definition?
>> 
>> If I do so, I would probably get an abi_check failure: with your patch,
>> std::chrono::steady_clock::now() ends up in GLIBCXX_3.4.19 while it
>> should appear in GLIBCXX_3.4.20 since this is new in GCC 4.9.
>
> In that case, either the --enable-libstdcxx-time=auto patch needs to be
> backported to 4.8.1, or at least a small portion of it (do that auto thing
> on Solaris only)?
> Have steady_clock::now() as @GLIBCXX_3.4.17 + @@GLIBCXX_3.4.19 on Linux,
> @@GLIBCXX_3.4.20 on Solaris, something else on other OSes would be quite
> confusing.

Agreed, that seems the best course of action if that's an option.

	Rainer
Rainer Orth - May 23, 2013, 9:54 p.m.
Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> writes:

> Jakub Jelinek <jakub@redhat.com> writes:
>
>> On Thu, May 23, 2013 at 10:56:25PM +0200, Rainer Orth wrote:
>>> >> I think std::chrono::steady_clock::now() needs to be protected with
>>> >> !(__sun__ && __svr4__) in GLIBCXX_3.4.17 since it only became available
>>> >> by default with Jonathan's patch.
>>> >
>>> > Ah, I see, gnu.ver has some
>>> > #ifdef HAVE_SYMVER_SYMBOL_RENAMING_RUNTIME_SUPPORT
>>> > #endif
>>> > guards there, does it work if you add it around the
>>> > GLIBCXX_3.4.17 std::chrono::steady_clock::now() definition?
>>> 
>>> If I do so, I would probably get an abi_check failure: with your patch,
>>> std::chrono::steady_clock::now() ends up in GLIBCXX_3.4.19 while it
>>> should appear in GLIBCXX_3.4.20 since this is new in GCC 4.9.
>>
>> In that case, either the --enable-libstdcxx-time=auto patch needs to be
>> backported to 4.8.1, or at least a small portion of it (do that auto thing
>> on Solaris only)?
>> Have steady_clock::now() as @GLIBCXX_3.4.17 + @@GLIBCXX_3.4.19 on Linux,
>> @@GLIBCXX_3.4.20 on Solaris, something else on other OSes would be quite
>> confusing.
>
> Agreed, that seems the best course of action if that's an option.

I just remembered that we aren't there yet even on mainline:

* This snippet

  http://gcc.gnu.org/ml/gcc-patches/2013-05/msg01255.html

  is necessary to avoid bootstrap failure on Solaris 9.

* We'll need to link every C++ program with -lrt on Solaris, as
  mentioned in the same message.  I suppose the best way to do this is
  along the lines of libgfortran.spec, rather than duplicate the
  necessary configury between g++ and libstdc++.  This might prove
  pretty invasive for the testsuite, though, and delay the 4.8.1 release
  quite a bit.

	Rainer
Jonathan Wakely - May 24, 2013, 8:17 a.m.
On 23 May 2013 21:56, Rainer Orth wrote:
>
> Right, it only got enable by defaulting --enable-libstdcxx-time to auto.

I think it would have been enabled previously with
--enable-libstdcxx-time=rt, but it wasn't tested and so didn't make it
into the linker script at the same time as the GNU symbol did.
Rainer Orth - May 24, 2013, 8:53 a.m.
Jonathan Wakely <jwakely.gcc@gmail.com> writes:

> On 23 May 2013 21:56, Rainer Orth wrote:
>>
>> Right, it only got enable by defaulting --enable-libstdcxx-time to auto.
>
> I think it would have been enabled previously with
> --enable-libstdcxx-time=rt, but it wasn't tested and so didn't make it
> into the linker script at the same time as the GNU symbol did.

Of course, but I only test with default options.
--enable-libstdcxx-time should probably have been documented as a
possibly ABI-breaking option.

	Rainer

Patch

--- libstdc++-v3/src/c++11/chrono.cc.jj	2013-02-04 18:15:15.078395533 +0100
+++ libstdc++-v3/src/c++11/chrono.cc	2013-05-23 18:06:40.562825017 +0200
@@ -32,13 +32,18 @@ 
      defined(_GLIBCXX_USE_GETTIMEOFDAY)
 #include <sys/time.h>
 #endif
+#ifdef _GLIBCXX_USE_CLOCK_MONOTONIC_SYSCALL
+#include <unistd.h>
+#include <sys/syscall.h>
+#endif
 
 namespace std _GLIBCXX_VISIBILITY(default)
 {
   namespace chrono
   {
   _GLIBCXX_BEGIN_NAMESPACE_VERSION
- 
+
+#ifndef _GLIBCXX_COMPATIBILITY_CXX0X
     constexpr bool system_clock::is_steady;
 
     system_clock::time_point
@@ -47,7 +52,11 @@  namespace std _GLIBCXX_VISIBILITY(defaul
 #ifdef _GLIBCXX_USE_CLOCK_REALTIME
       timespec tp;
       // -EINVAL, -EFAULT
+#ifdef _GLIBCXX_USE_CLOCK_MONOTONIC_SYSCALL
+      syscall(SYS_clock_gettime, CLOCK_REALTIME, &tp);
+#else
       clock_gettime(CLOCK_REALTIME, &tp);
+#endif
       return time_point(duration(chrono::seconds(tp.tv_sec)
 				 + chrono::nanoseconds(tp.tv_nsec)));
 #elif defined(_GLIBCXX_USE_GETTIMEOFDAY)
@@ -61,16 +70,29 @@  namespace std _GLIBCXX_VISIBILITY(defaul
       return system_clock::from_time_t(__sec);
 #endif
     }
+#endif
     
 #ifdef _GLIBCXX_USE_CLOCK_MONOTONIC
+#ifndef _GLIBCXX_COMPATIBILITY_CXX0X
     constexpr bool steady_clock::is_steady;
+#endif
 
+#if defined(_GLIBCXX_SYMVER_GNU) && defined(_GLIBCXX_SHARED) \
+    && defined(_GLIBCXX_HAVE_AS_SYMVER_DIRECTIVE) \
+    && defined(_GLIBCXX_HAVE_SYMVER_SYMBOL_RENAMING_RUNTIME_SUPPORT) \
+    && !defined(_GLIBCXX_COMPATIBILITY_CXX0X)
+    __attribute__((__weak__))
+#endif
     steady_clock::time_point
     steady_clock::now() noexcept
     {
       timespec tp;
       // -EINVAL, -EFAULT
+#ifdef _GLIBCXX_USE_CLOCK_MONOTONIC_SYSCALL
+      syscall(SYS_clock_gettime, CLOCK_MONOTONIC, &tp);
+#else
       clock_gettime(CLOCK_MONOTONIC, &tp);
+#endif
       return time_point(duration(chrono::seconds(tp.tv_sec)
 				 + chrono::nanoseconds(tp.tv_nsec)));
     }
--- libstdc++-v3/src/Makefile.am.jj	2013-02-14 20:11:41.491575233 +0100
+++ libstdc++-v3/src/Makefile.am	2013-05-23 18:06:40.578824061 +0200
@@ -50,7 +50,8 @@  cxx98_sources = \
 cxx11_sources = \
 	compatibility-c++0x.cc \
 	compatibility-atomic-c++0x.cc \
-	compatibility-thread-c++0x.cc
+	compatibility-thread-c++0x.cc \
+	compatibility-chrono.cc
 
 libstdc___la_SOURCES = $(cxx98_sources) $(cxx11_sources)
 
@@ -97,6 +98,11 @@  compatibility-thread-c++0x.lo: compatibi
 compatibility-thread-c++0x.o: compatibility-thread-c++0x.cc
 	$(CXXCOMPILE) -std=gnu++11 -c $<
 
+compatibility-chrono.lo: compatibility-chrono.cc
+	$(LTCXXCOMPILE) -std=gnu++11 -c $<
+compatibility-chrono.o: compatibility-chrono.cc
+	$(CXXCOMPILE) -std=gnu++11 -c $<
+
 # A note on compatibility and static libraries.
 # 
 # static lib == linked against only this version, should not need compat
--- libstdc++-v3/src/c++11/compatibility-chrono.cc.jj	2013-05-23 18:06:40.585823828 +0200
+++ libstdc++-v3/src/c++11/compatibility-chrono.cc	2013-05-23 18:06:40.585823828 +0200
@@ -0,0 +1,58 @@ 
+// Compatibility symbols for previous versions, C++0x bits -*- C++ -*-
+
+// Copyright (C) 2013 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
+
+#define _GLIBCXX_COMPATIBILITY_CXX0X
+#include <bits/c++config.h>
+
+#if defined(_GLIBCXX_SYMVER_GNU) && defined(_GLIBCXX_SHARED) \
+    && defined(_GLIBCXX_HAVE_AS_SYMVER_DIRECTIVE)\
+    && defined(_GLIBCXX_HAVE_SYMVER_SYMBOL_RENAMING_RUNTIME_SUPPORT)
+
+#define steady_clock steady_clockXX
+#include "chrono.cc"
+
+// The rename syntax for default exported names is
+//   asm (".symver name1,exportedname@GLIBCXX_3.4.17")
+//   asm (".symver name2,exportedname@@GLIBCXX_3.4.19")
+// In the future, GLIBCXX_ABI > 6 should remove all uses of
+// _GLIBCXX_*_SYMVER macros in this file.
+
+#define _GLIBCXX_3_4_17_SYMVER(XXname, name) \
+   extern "C" void \
+   _X##name() \
+   __attribute__ ((alias(#XXname))); \
+   asm (".symver " "_X" #name "," #name "@GLIBCXX_3.4.17");
+
+#define _GLIBCXX_3_4_19_SYMVER(XXname, name) \
+   extern "C" void \
+   _Y##name() \
+   __attribute__ ((alias(#XXname))); \
+   asm (".symver " "_Y" #name  "," #name "@@GLIBCXX_3.4.19");
+
+_GLIBCXX_3_4_17_SYMVER(_ZNSt6chrono14steady_clockXX3nowEv,
+		       _ZNSt6chrono12steady_clock3nowEv)
+_GLIBCXX_3_4_19_SYMVER(_ZNSt6chrono14steady_clockXX3nowEv,
+		       _ZNSt6chrono12steady_clock3nowEv)
+
+#endif
--- libstdc++-v3/acinclude.m4.jj	2013-05-23 18:06:19.841949134 +0200
+++ libstdc++-v3/acinclude.m4	2013-05-23 18:06:40.586823808 +0200
@@ -1322,6 +1322,31 @@  AC_DEFUN([GLIBCXX_ENABLE_LIBSTDCXX_TIME]
     fi
   fi
 
+  if test x"$ac_has_clock_monotonic" != x"yes"; then
+    case ${target_os} in
+      linux*)
+	AC_MSG_CHECKING([for clock_gettime syscall])
+	AC_TRY_COMPILE(
+	  [#include <unistd.h>
+	   #include <time.h>
+	   #include <sys/syscall.h>
+	  ],
+	  [#if _POSIX_TIMERS > 0 && defined(_POSIX_MONOTONIC_CLOCK)
+	    timespec tp;
+	   #endif
+	   syscall(SYS_clock_gettime, CLOCK_MONOTONIC, &tp);
+	   syscall(SYS_clock_gettime, CLOCK_REALTIME, &tp);
+	  ], [ac_has_clock_monotonic_syscall=yes], [ac_has_clock_monotonic_syscall=no])
+	AC_MSG_RESULT($ac_has_clock_monotonic_syscall)
+	if test x"$ac_has_clock_monotonic_syscall" = x"yes"; then
+	  AC_DEFINE(_GLIBCXX_USE_CLOCK_MONOTONIC_SYSCALL, 1,
+	  [ Defined if clock_gettime syscall has monotonic clock support. ])
+	  ac_has_clock_monotonic=yes
+	  ac_has_clock_realtime=yes
+	fi;;
+    esac
+  fi
+
   if test x"$ac_has_clock_monotonic" = x"yes"; then
     AC_DEFINE(_GLIBCXX_USE_CLOCK_MONOTONIC, 1,
       [ Defined if clock_gettime has monotonic clock support. ])
--- libstdc++-v3/testsuite/util/testsuite_abi.cc.jj	2013-05-10 10:36:28.000000000 +0200
+++ libstdc++-v3/testsuite/util/testsuite_abi.cc	2013-05-23 18:12:15.933965878 +0200
@@ -199,6 +199,7 @@  check_version(symbol& test, bool added)
       known_versions.push_back("GLIBCXX_3.4.17");
       known_versions.push_back("GLIBCXX_3.4.18");
       known_versions.push_back("GLIBCXX_3.4.19");
+      known_versions.push_back("GLIBCXX_3.4.20");
       known_versions.push_back("CXXABI_1.3");
       known_versions.push_back("CXXABI_LDBL_1.3");
       known_versions.push_back("CXXABI_1.3.1");
@@ -225,7 +226,7 @@  check_version(symbol& test, bool added)
 	test.version_status = symbol::incompatible;
 
       // Check that added symbols are added in the latest pre-release version.
-      bool latestp = (test.version_name == "GLIBCXX_3.4.19"
+      bool latestp = (test.version_name == "GLIBCXX_3.4.20"
 		     || test.version_name == "CXXABI_1.3.8"
 		     || test.version_name == "CXXABI_TM_1");
       if (added && !latestp)
--- libstdc++-v3/config/abi/pre/gnu.ver.jj	2013-05-10 10:36:28.640688086 +0200
+++ libstdc++-v3/config/abi/pre/gnu.ver	2013-05-23 18:11:51.087096178 +0200
@@ -1345,6 +1345,11 @@  GLIBCXX_3.4.18 {
 } GLIBCXX_3.4.17;
 
 GLIBCXX_3.4.19 {
+    # std::chrono::steady_clock::now()
+    _ZNSt6chrono12steady_clock3nowEv;
+} GLIBCXX_3.4.18;
+
+GLIBCXX_3.4.20 {
 
     # std::get_new_handler()
     _ZSt15get_new_handlerv;
@@ -1355,7 +1360,7 @@  GLIBCXX_3.4.19 {
     # std::get_unexpected()
     _ZSt14get_unexpectedv;
 
-} GLIBCXX_3.4.18;
+} GLIBCXX_3.4.19;
 
 # Symbols in the support library (libsupc++) have their own tag.
 CXXABI_1.3 {
--- libstdc++-v3/config/abi/post/i386-linux-gnu/baseline_symbols.txt.jj	2013-03-07 16:47:15.756981144 +0100
+++ libstdc++-v3/config/abi/post/i386-linux-gnu/baseline_symbols.txt	2013-05-23 18:06:40.635823435 +0200
@@ -1938,6 +1938,8 @@  FUNC:_ZNSt6__norm15_List_node_base7rever
 FUNC:_ZNSt6__norm15_List_node_base8transferEPS0_S1_@@GLIBCXX_3.4.9
 FUNC:_ZNSt6__norm15_List_node_base9_M_unhookEv@@GLIBCXX_3.4.14
 FUNC:_ZNSt6chrono12system_clock3nowEv@@GLIBCXX_3.4.11
+FUNC:_ZNSt6chrono12steady_clock3nowEv@@GLIBCXX_3.4.19
+FUNC:_ZNSt6chrono12steady_clock3nowEv@GLIBCXX_3.4.17
 FUNC:_ZNSt6gslice8_IndexerC1EjRKSt8valarrayIjES4_@@GLIBCXX_3.4
 FUNC:_ZNSt6gslice8_IndexerC2EjRKSt8valarrayIjES4_@@GLIBCXX_3.4
 FUNC:_ZNSt6locale11_M_coalesceERKS_S1_i@@GLIBCXX_3.4
@@ -2514,6 +2516,7 @@  OBJECT:0:GLIBCXX_3.4.15
 OBJECT:0:GLIBCXX_3.4.16
 OBJECT:0:GLIBCXX_3.4.17
 OBJECT:0:GLIBCXX_3.4.18
+OBJECT:0:GLIBCXX_3.4.19
 OBJECT:0:GLIBCXX_3.4.2
 OBJECT:0:GLIBCXX_3.4.3
 OBJECT:0:GLIBCXX_3.4.4
--- libstdc++-v3/config/abi/post/s390x-linux-gnu/baseline_symbols.txt.jj	2013-03-07 16:47:15.917980229 +0100
+++ libstdc++-v3/config/abi/post/s390x-linux-gnu/baseline_symbols.txt	2013-05-23 18:06:40.662823272 +0200
@@ -2128,6 +2128,8 @@  FUNC:_ZNSt6__norm15_List_node_base7rever
 FUNC:_ZNSt6__norm15_List_node_base8transferEPS0_S1_@@GLIBCXX_3.4.9
 FUNC:_ZNSt6__norm15_List_node_base9_M_unhookEv@@GLIBCXX_3.4.14
 FUNC:_ZNSt6chrono12system_clock3nowEv@@GLIBCXX_3.4.11
+FUNC:_ZNSt6chrono12steady_clock3nowEv@@GLIBCXX_3.4.19
+FUNC:_ZNSt6chrono12steady_clock3nowEv@GLIBCXX_3.4.17
 FUNC:_ZNSt6gslice8_IndexerC1EmRKSt8valarrayImES4_@@GLIBCXX_3.4
 FUNC:_ZNSt6gslice8_IndexerC2EmRKSt8valarrayImES4_@@GLIBCXX_3.4
 FUNC:_ZNSt6locale11_M_coalesceERKS_S1_i@@GLIBCXX_3.4
@@ -2748,6 +2750,7 @@  OBJECT:0:GLIBCXX_3.4.15
 OBJECT:0:GLIBCXX_3.4.16
 OBJECT:0:GLIBCXX_3.4.17
 OBJECT:0:GLIBCXX_3.4.18
+OBJECT:0:GLIBCXX_3.4.19
 OBJECT:0:GLIBCXX_3.4.2
 OBJECT:0:GLIBCXX_3.4.3
 OBJECT:0:GLIBCXX_3.4.4
--- libstdc++-v3/config/abi/post/powerpc64-linux-gnu/baseline_symbols.txt.jj	2013-03-07 16:47:15.871980491 +0100
+++ libstdc++-v3/config/abi/post/powerpc64-linux-gnu/baseline_symbols.txt	2013-05-23 18:06:40.689823108 +0200
@@ -2128,6 +2128,8 @@  FUNC:_ZNSt6__norm15_List_node_base7rever
 FUNC:_ZNSt6__norm15_List_node_base8transferEPS0_S1_@@GLIBCXX_3.4.9
 FUNC:_ZNSt6__norm15_List_node_base9_M_unhookEv@@GLIBCXX_3.4.14
 FUNC:_ZNSt6chrono12system_clock3nowEv@@GLIBCXX_3.4.11
+FUNC:_ZNSt6chrono12steady_clock3nowEv@@GLIBCXX_3.4.19
+FUNC:_ZNSt6chrono12steady_clock3nowEv@GLIBCXX_3.4.17
 FUNC:_ZNSt6gslice8_IndexerC1EmRKSt8valarrayImES4_@@GLIBCXX_3.4
 FUNC:_ZNSt6gslice8_IndexerC2EmRKSt8valarrayImES4_@@GLIBCXX_3.4
 FUNC:_ZNSt6locale11_M_coalesceERKS_S1_i@@GLIBCXX_3.4
@@ -2748,6 +2750,7 @@  OBJECT:0:GLIBCXX_3.4.15
 OBJECT:0:GLIBCXX_3.4.16
 OBJECT:0:GLIBCXX_3.4.17
 OBJECT:0:GLIBCXX_3.4.18
+OBJECT:0:GLIBCXX_3.4.19
 OBJECT:0:GLIBCXX_3.4.2
 OBJECT:0:GLIBCXX_3.4.3
 OBJECT:0:GLIBCXX_3.4.4
--- libstdc++-v3/config/abi/post/powerpc64-linux-gnu/32/baseline_symbols.txt.jj	2013-03-07 16:47:15.847980627 +0100
+++ libstdc++-v3/config/abi/post/powerpc64-linux-gnu/32/baseline_symbols.txt	2013-05-23 18:06:40.717822939 +0200
@@ -2128,6 +2128,8 @@  FUNC:_ZNSt6__norm15_List_node_base7rever
 FUNC:_ZNSt6__norm15_List_node_base8transferEPS0_S1_@@GLIBCXX_3.4.9
 FUNC:_ZNSt6__norm15_List_node_base9_M_unhookEv@@GLIBCXX_3.4.14
 FUNC:_ZNSt6chrono12system_clock3nowEv@@GLIBCXX_3.4.11
+FUNC:_ZNSt6chrono12steady_clock3nowEv@@GLIBCXX_3.4.19
+FUNC:_ZNSt6chrono12steady_clock3nowEv@GLIBCXX_3.4.17
 FUNC:_ZNSt6gslice8_IndexerC1EjRKSt8valarrayIjES4_@@GLIBCXX_3.4
 FUNC:_ZNSt6gslice8_IndexerC2EjRKSt8valarrayIjES4_@@GLIBCXX_3.4
 FUNC:_ZNSt6locale11_M_coalesceERKS_S1_i@@GLIBCXX_3.4
@@ -2748,6 +2750,7 @@  OBJECT:0:GLIBCXX_3.4.15
 OBJECT:0:GLIBCXX_3.4.16
 OBJECT:0:GLIBCXX_3.4.17
 OBJECT:0:GLIBCXX_3.4.18
+OBJECT:0:GLIBCXX_3.4.19
 OBJECT:0:GLIBCXX_3.4.2
 OBJECT:0:GLIBCXX_3.4.3
 OBJECT:0:GLIBCXX_3.4.4
--- libstdc++-v3/config/abi/post/x86_64-linux-gnu/baseline_symbols.txt.jj	2013-03-07 16:47:16.001979751 +0100
+++ libstdc++-v3/config/abi/post/x86_64-linux-gnu/baseline_symbols.txt	2013-05-23 18:06:40.739822806 +0200
@@ -1938,6 +1938,8 @@  FUNC:_ZNSt6__norm15_List_node_base7rever
 FUNC:_ZNSt6__norm15_List_node_base8transferEPS0_S1_@@GLIBCXX_3.4.9
 FUNC:_ZNSt6__norm15_List_node_base9_M_unhookEv@@GLIBCXX_3.4.14
 FUNC:_ZNSt6chrono12system_clock3nowEv@@GLIBCXX_3.4.11
+FUNC:_ZNSt6chrono12steady_clock3nowEv@@GLIBCXX_3.4.19
+FUNC:_ZNSt6chrono12steady_clock3nowEv@GLIBCXX_3.4.17
 FUNC:_ZNSt6gslice8_IndexerC1EmRKSt8valarrayImES4_@@GLIBCXX_3.4
 FUNC:_ZNSt6gslice8_IndexerC2EmRKSt8valarrayImES4_@@GLIBCXX_3.4
 FUNC:_ZNSt6locale11_M_coalesceERKS_S1_i@@GLIBCXX_3.4
@@ -2514,6 +2516,7 @@  OBJECT:0:GLIBCXX_3.4.15
 OBJECT:0:GLIBCXX_3.4.16
 OBJECT:0:GLIBCXX_3.4.17
 OBJECT:0:GLIBCXX_3.4.18
+OBJECT:0:GLIBCXX_3.4.19
 OBJECT:0:GLIBCXX_3.4.2
 OBJECT:0:GLIBCXX_3.4.3
 OBJECT:0:GLIBCXX_3.4.4
--- libstdc++-v3/config/abi/post/x86_64-linux-gnu/32/baseline_symbols.txt.jj	2013-03-07 16:47:15.953980024 +0100
+++ libstdc++-v3/config/abi/post/x86_64-linux-gnu/32/baseline_symbols.txt	2013-05-23 18:06:40.763822661 +0200
@@ -1938,6 +1938,8 @@  FUNC:_ZNSt6__norm15_List_node_base7rever
 FUNC:_ZNSt6__norm15_List_node_base8transferEPS0_S1_@@GLIBCXX_3.4.9
 FUNC:_ZNSt6__norm15_List_node_base9_M_unhookEv@@GLIBCXX_3.4.14
 FUNC:_ZNSt6chrono12system_clock3nowEv@@GLIBCXX_3.4.11
+FUNC:_ZNSt6chrono12steady_clock3nowEv@@GLIBCXX_3.4.19
+FUNC:_ZNSt6chrono12steady_clock3nowEv@GLIBCXX_3.4.17
 FUNC:_ZNSt6gslice8_IndexerC1EjRKSt8valarrayIjES4_@@GLIBCXX_3.4
 FUNC:_ZNSt6gslice8_IndexerC2EjRKSt8valarrayIjES4_@@GLIBCXX_3.4
 FUNC:_ZNSt6locale11_M_coalesceERKS_S1_i@@GLIBCXX_3.4
@@ -2514,6 +2516,7 @@  OBJECT:0:GLIBCXX_3.4.15
 OBJECT:0:GLIBCXX_3.4.16
 OBJECT:0:GLIBCXX_3.4.17
 OBJECT:0:GLIBCXX_3.4.18
+OBJECT:0:GLIBCXX_3.4.19
 OBJECT:0:GLIBCXX_3.4.2
 OBJECT:0:GLIBCXX_3.4.3
 OBJECT:0:GLIBCXX_3.4.4
--- libstdc++-v3/config/abi/post/powerpc-linux-gnu/baseline_symbols.txt.jj	2013-03-07 16:47:15.884980416 +0100
+++ libstdc++-v3/config/abi/post/powerpc-linux-gnu/baseline_symbols.txt	2013-05-23 18:06:40.782822546 +0200
@@ -2128,6 +2128,8 @@  FUNC:_ZNSt6__norm15_List_node_base7rever
 FUNC:_ZNSt6__norm15_List_node_base8transferEPS0_S1_@@GLIBCXX_3.4.9
 FUNC:_ZNSt6__norm15_List_node_base9_M_unhookEv@@GLIBCXX_3.4.14
 FUNC:_ZNSt6chrono12system_clock3nowEv@@GLIBCXX_3.4.11
+FUNC:_ZNSt6chrono12steady_clock3nowEv@@GLIBCXX_3.4.19
+FUNC:_ZNSt6chrono12steady_clock3nowEv@GLIBCXX_3.4.17
 FUNC:_ZNSt6gslice8_IndexerC1EjRKSt8valarrayIjES4_@@GLIBCXX_3.4
 FUNC:_ZNSt6gslice8_IndexerC2EjRKSt8valarrayIjES4_@@GLIBCXX_3.4
 FUNC:_ZNSt6locale11_M_coalesceERKS_S1_i@@GLIBCXX_3.4
@@ -2748,6 +2750,7 @@  OBJECT:0:GLIBCXX_3.4.15
 OBJECT:0:GLIBCXX_3.4.16
 OBJECT:0:GLIBCXX_3.4.17
 OBJECT:0:GLIBCXX_3.4.18
+OBJECT:0:GLIBCXX_3.4.19
 OBJECT:0:GLIBCXX_3.4.2
 OBJECT:0:GLIBCXX_3.4.3
 OBJECT:0:GLIBCXX_3.4.4
--- libstdc++-v3/config/abi/post/s390-linux-gnu/baseline_symbols.txt.jj	2013-03-07 16:47:15.892980371 +0100
+++ libstdc++-v3/config/abi/post/s390-linux-gnu/baseline_symbols.txt	2013-05-23 18:06:40.792822486 +0200
@@ -2128,6 +2128,8 @@  FUNC:_ZNSt6__norm15_List_node_base7rever
 FUNC:_ZNSt6__norm15_List_node_base8transferEPS0_S1_@@GLIBCXX_3.4.9
 FUNC:_ZNSt6__norm15_List_node_base9_M_unhookEv@@GLIBCXX_3.4.14
 FUNC:_ZNSt6chrono12system_clock3nowEv@@GLIBCXX_3.4.11
+FUNC:_ZNSt6chrono12steady_clock3nowEv@@GLIBCXX_3.4.19
+FUNC:_ZNSt6chrono12steady_clock3nowEv@GLIBCXX_3.4.17
 FUNC:_ZNSt6gslice8_IndexerC1EmRKSt8valarrayImES4_@@GLIBCXX_3.4
 FUNC:_ZNSt6gslice8_IndexerC2EmRKSt8valarrayImES4_@@GLIBCXX_3.4
 FUNC:_ZNSt6locale11_M_coalesceERKS_S1_i@@GLIBCXX_3.4
@@ -2748,6 +2750,7 @@  OBJECT:0:GLIBCXX_3.4.15
 OBJECT:0:GLIBCXX_3.4.16
 OBJECT:0:GLIBCXX_3.4.17
 OBJECT:0:GLIBCXX_3.4.18
+OBJECT:0:GLIBCXX_3.4.19
 OBJECT:0:GLIBCXX_3.4.2
 OBJECT:0:GLIBCXX_3.4.3
 OBJECT:0:GLIBCXX_3.4.4
--- libstdc++-v3/config/abi/post/i486-linux-gnu/baseline_symbols.txt.jj	2013-03-07 16:47:15.807980856 +0100
+++ libstdc++-v3/config/abi/post/i486-linux-gnu/baseline_symbols.txt	2013-05-23 18:06:40.806822401 +0200
@@ -1938,6 +1938,8 @@  FUNC:_ZNSt6__norm15_List_node_base7rever
 FUNC:_ZNSt6__norm15_List_node_base8transferEPS0_S1_@@GLIBCXX_3.4.9
 FUNC:_ZNSt6__norm15_List_node_base9_M_unhookEv@@GLIBCXX_3.4.14
 FUNC:_ZNSt6chrono12system_clock3nowEv@@GLIBCXX_3.4.11
+FUNC:_ZNSt6chrono12steady_clock3nowEv@@GLIBCXX_3.4.19
+FUNC:_ZNSt6chrono12steady_clock3nowEv@GLIBCXX_3.4.17
 FUNC:_ZNSt6gslice8_IndexerC1EjRKSt8valarrayIjES4_@@GLIBCXX_3.4
 FUNC:_ZNSt6gslice8_IndexerC2EjRKSt8valarrayIjES4_@@GLIBCXX_3.4
 FUNC:_ZNSt6locale11_M_coalesceERKS_S1_i@@GLIBCXX_3.4
@@ -2514,6 +2516,7 @@  OBJECT:0:GLIBCXX_3.4.15
 OBJECT:0:GLIBCXX_3.4.16
 OBJECT:0:GLIBCXX_3.4.17
 OBJECT:0:GLIBCXX_3.4.18
+OBJECT:0:GLIBCXX_3.4.19
 OBJECT:0:GLIBCXX_3.4.2
 OBJECT:0:GLIBCXX_3.4.3
 OBJECT:0:GLIBCXX_3.4.4
--- libstdc++-v3/config.h.in.jj	2013-04-10 08:32:04.601960092 +0200
+++ libstdc++-v3/config.h.in	2013-05-23 18:06:40.828822268 +0200
@@ -813,6 +813,9 @@ 
 /* Defined if clock_gettime has monotonic clock support. */
 #undef _GLIBCXX_USE_CLOCK_MONOTONIC
 
+/* Defined if clock_gettime syscall has monotonic clock support. */
+#undef _GLIBCXX_USE_CLOCK_MONOTONIC_SYSCALL
+
 /* Defined if clock_gettime has realtime clock support. */
 #undef _GLIBCXX_USE_CLOCK_REALTIME
 
--- libstdc++-v3/src/Makefile.in.jj	2013-02-14 20:11:41.438575540 +0100
+++ libstdc++-v3/src/Makefile.in	2013-05-23 18:06:40.844822172 +0200
@@ -93,7 +93,7 @@  am__DEPENDENCIES_1 =
 am__objects_2 = compatibility.lo compatibility-debug_list.lo \
 	compatibility-debug_list-2.lo $(am__objects_1)
 am__objects_3 = compatibility-c++0x.lo compatibility-atomic-c++0x.lo \
-	compatibility-thread-c++0x.lo
+	compatibility-thread-c++0x.lo compatibility-chrono.lo
 am_libstdc___la_OBJECTS = $(am__objects_2) $(am__objects_3)
 libstdc___la_OBJECTS = $(am_libstdc___la_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
@@ -351,7 +351,8 @@  cxx98_sources = \
 cxx11_sources = \
 	compatibility-c++0x.cc \
 	compatibility-atomic-c++0x.cc \
-	compatibility-thread-c++0x.cc
+	compatibility-thread-c++0x.cc \
+	compatibility-chrono.cc
 
 libstdc___la_SOURCES = $(cxx98_sources) $(cxx11_sources)
 libstdc___la_LIBADD = \
@@ -848,6 +849,11 @@  compatibility-thread-c++0x.lo: compatibi
 compatibility-thread-c++0x.o: compatibility-thread-c++0x.cc
 	$(CXXCOMPILE) -std=gnu++11 -c $<
 
+compatibility-chrono.lo: compatibility-chrono.cc
+	$(LTCXXCOMPILE) -std=gnu++11 -c $<
+compatibility-chrono.o: compatibility-chrono.cc
+	$(CXXCOMPILE) -std=gnu++11 -c $<
+
 # Symbol versioning for shared libraries.
 @ENABLE_SYMVERS_TRUE@libstdc++-symbols.ver:  ${glibcxx_srcdir}/$(SYMVER_FILE) \
 @ENABLE_SYMVERS_TRUE@		$(port_specific_symbol_files)
--- libstdc++-v3/configure.jj	2013-05-23 18:06:19.685950078 +0200
+++ libstdc++-v3/configure	2013-05-23 18:06:40.862822063 +0200
@@ -19883,6 +19883,48 @@  $as_echo "$ac_has_nanosleep" >&6; }
     fi
   fi
 
+  if test x"$ac_has_clock_monotonic" != x"yes"; then
+    case ${target_os} in
+      linux*)
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime syscall" >&5
+$as_echo_n "checking for clock_gettime syscall... " >&6; }
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <unistd.h>
+	   #include <time.h>
+	   #include <sys/syscall.h>
+
+int
+main ()
+{
+#if _POSIX_TIMERS > 0 && defined(_POSIX_MONOTONIC_CLOCK)
+	    timespec tp;
+	   #endif
+	   syscall(SYS_clock_gettime, CLOCK_MONOTONIC, &tp);
+	   syscall(SYS_clock_gettime, CLOCK_REALTIME, &tp);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_has_clock_monotonic_syscall=yes
+else
+  ac_has_clock_monotonic_syscall=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_has_clock_monotonic_syscall" >&5
+$as_echo "$ac_has_clock_monotonic_syscall" >&6; }
+	if test x"$ac_has_clock_monotonic_syscall" = x"yes"; then
+
+$as_echo "#define _GLIBCXX_USE_CLOCK_MONOTONIC_SYSCALL 1" >>confdefs.h
+
+	  ac_has_clock_monotonic=yes
+	  ac_has_clock_realtime=yes
+	fi;;
+    esac
+  fi
+
   if test x"$ac_has_clock_monotonic" = x"yes"; then
 
 $as_echo "#define _GLIBCXX_USE_CLOCK_MONOTONIC 1" >>confdefs.h