diff options
| author | Caroline Tice <cmtice@chromium.org> | 2013-06-21 12:05:49 -0700 |
|---|---|---|
| committer | Caroline Tice <cmtice@chromium.org> | 2013-06-21 12:05:49 -0700 |
| commit | 9c1705845241cdea5cf61574218edef282901fbd (patch) | |
| tree | 021da661f8a821bc7eea277521fa13f2043879a0 /libstdc++-v3/testsuite/30_threads/timed_mutex/native_handle/1.cc | |
| parent | 9bdedf4df4166718fa0a44811c643214c6880471 (diff) | |
| parent | 8a46ed36b0449c870d0a938c1010ad610ebcf4f7 (diff) | |
| download | gcc-9c1705845241cdea5cf61574218edef282901fbd.tar.gz | |
Merge branch 'master' into vtv
Conflicts:
gcc/ChangeLog
gcc/cp/ChangeLog
gcc/cp/decl2.c
gcc/varasm.c
libstdc++-v3/ChangeLog
Diffstat (limited to 'libstdc++-v3/testsuite/30_threads/timed_mutex/native_handle/1.cc')
| -rw-r--r-- | libstdc++-v3/testsuite/30_threads/timed_mutex/native_handle/1.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libstdc++-v3/testsuite/30_threads/timed_mutex/native_handle/1.cc b/libstdc++-v3/testsuite/30_threads/timed_mutex/native_handle/1.cc index 96545631c2f..992105e0702 100644 --- a/libstdc++-v3/testsuite/30_threads/timed_mutex/native_handle/1.cc +++ b/libstdc++-v3/testsuite/30_threads/timed_mutex/native_handle/1.cc @@ -1,5 +1,5 @@ -// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } } -// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* powerpc-ibm-aix* } } +// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } } +// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } } // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } } // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } } // { dg-require-cstdint "" } |