diff options
| author | Jonathan Wakely <jwakely.gcc@gmail.com> | 2012-12-20 14:36:56 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2012-12-20 14:36:56 +0000 |
| commit | 8ed812cc4be88f3bd042cecfa42a402df08d10d0 (patch) | |
| tree | 0d2a84cb3f0ff31372af99337ec596b7f10c07a6 /libstdc++-v3/src | |
| parent | d5ae0ba6636d9d5e8b24b0859b860365aa4d943c (diff) | |
| download | gcc-8ed812cc4be88f3bd042cecfa42a402df08d10d0.zip gcc-8ed812cc4be88f3bd042cecfa42a402df08d10d0.tar.gz gcc-8ed812cc4be88f3bd042cecfa42a402df08d10d0.tar.bz2 | |
re PR libstdc++/55741 (bootstrap fails in libstdc++-v3/src/c++11/thread.cc)
PR libstdc++/55741
* acinclude.m4 (GLIBCXX_ENABLE_LIBSTDCXX_TIME): Check for Sleep.
* config.h.in: Regenerate.
* configure: Regenerate.
* src/c++11/thread.cc (__sleep_for): Use Sleep if available.
From-SVN: r194635
Diffstat (limited to 'libstdc++-v3/src')
| -rw-r--r-- | libstdc++-v3/src/c++11/thread.cc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/libstdc++-v3/src/c++11/thread.cc b/libstdc++-v3/src/c++11/thread.cc index fa86a1b..b04e6dc 100644 --- a/libstdc++-v3/src/c++11/thread.cc +++ b/libstdc++-v3/src/c++11/thread.cc @@ -61,6 +61,8 @@ static inline int get_nprocs() #ifndef _GLIBCXX_USE_NANOSLEEP # ifdef _GLIBCXX_HAVE_SLEEP # include <unistd.h> +# elif defined(_GLIBCXX_HAVE_WIN32_SLEEP) +# include <windows.h> # else # error "No sleep function known for this target" # endif @@ -170,9 +172,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION static_cast<long>(__ns.count()) }; ::nanosleep(&__ts, 0); -#else -# ifdef _GLIBCXX_HAVE_SLEEP -# ifdef _GLIBCXX_HAVE_USLEEP +#elif defined(_GLIBCXX_HAVE_SLEEP) +# ifdef _GLIBCXX_HAVE_USLEEP ::sleep(__s.count()); if (__ns.count() > 0) { @@ -181,10 +182,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __us = 1; ::usleep(__us); } -# else +# else ::sleep(__s.count() + (__ns >= 1000000)); -# endif # endif +#elif defined(_GLIBCXX_HAVE_WIN32_SLEEP) + unsigned long ms = __ns.count() / 1000000; + if (__ns.count() > 0 && ms == 0) + ms = 1; + ::Sleep(chrono::milliseconds(__s).count() + ms); #endif } |