re PR libstdc++/89461 (FAIL: experimental/net/timer/waitable/cons.cc)
PR libstdc++/89461 * testsuite/lib/libstdc++.exp: Locate libatomic. * testsuite/lib/dg-options.exp (add_options_for_libatomic): New. * testsuite/20_util/shared_ptr/thread/default_weaktoshared.cc: Add libatomic options. * testsuite/20_util/shared_ptr/thread/mutex_weaktoshared.cc: Likewise. * testsuite/experimental/net/timer/waitable/cons.cc: Likewise. * testsuite/experimental/net/timer/waitable/dest.cc: Likewise. * testsuite/experimental/net/timer/waitable/ops.cc: Likewise. From-SVN: r269628
This commit is contained in:
parent
b9da027866
commit
2ff656f421
|
@ -1,3 +1,15 @@
|
|||
2019-03-12 John David Anglin <dave.anglin@bell.net>
|
||||
|
||||
PR libstdc++/89461
|
||||
* testsuite/lib/libstdc++.exp: Locate libatomic.
|
||||
* testsuite/lib/dg-options.exp (add_options_for_libatomic): New.
|
||||
* testsuite/20_util/shared_ptr/thread/default_weaktoshared.cc: Add
|
||||
libatomic options.
|
||||
* testsuite/20_util/shared_ptr/thread/mutex_weaktoshared.cc: Likewise.
|
||||
* testsuite/experimental/net/timer/waitable/cons.cc: Likewise.
|
||||
* testsuite/experimental/net/timer/waitable/dest.cc: Likewise.
|
||||
* testsuite/experimental/net/timer/waitable/ops.cc: Likewise.
|
||||
|
||||
2019-03-11 Jonathan Wakely <jwakely@redhat.com>
|
||||
|
||||
PR libstdc++/89460
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
|
||||
// { dg-do run }
|
||||
// { dg-options "-pthread" }
|
||||
// { dg-add-options libatomic }
|
||||
// { dg-require-effective-target c++11 }
|
||||
// { dg-require-effective-target pthread }
|
||||
// { dg-require-cstdint "" }
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
|
||||
// { dg-do run }
|
||||
// { dg-options "-pthread" }
|
||||
// { dg-add-options libatomic }
|
||||
// { dg-require-effective-target c++11 }
|
||||
// { dg-require-effective-target pthread }
|
||||
// { dg-require-cstdint "" }
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
// <http://www.gnu.org/licenses/>.
|
||||
|
||||
// { dg-do run { target c++14 } }
|
||||
// { dg-add-options libatomic }
|
||||
|
||||
#include <experimental/timer>
|
||||
#include <testsuite_hooks.h>
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
// <http://www.gnu.org/licenses/>.
|
||||
|
||||
// { dg-do run { target c++14 } }
|
||||
// { dg-add-options libatomic }
|
||||
|
||||
#include <experimental/timer>
|
||||
#include <testsuite_hooks.h>
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
// <http://www.gnu.org/licenses/>.
|
||||
|
||||
// { dg-do run { target c++14 } }
|
||||
// { dg-add-options libatomic }
|
||||
|
||||
#include <experimental/timer>
|
||||
#include <testsuite_hooks.h>
|
||||
|
|
|
@ -257,6 +257,15 @@ proc add_options_for_net_ts { flags } {
|
|||
return $flags
|
||||
}
|
||||
|
||||
# Add to FLAGS all the target-specific flags to link to libatomic, if required.
|
||||
|
||||
proc add_options_for_libatomic { flags } {
|
||||
if { [istarget hppa*-*-hpux*] || [istarget riscv*-*-*] } {
|
||||
return "$flags -L../../libatomic/.libs -latomic"
|
||||
}
|
||||
return $flags
|
||||
}
|
||||
|
||||
# Like dg-options, but adds to the default options rather than replacing them.
|
||||
|
||||
proc dg-additional-options { args } {
|
||||
|
|
|
@ -161,6 +161,17 @@ proc libstdc++_init { testfile } {
|
|||
}
|
||||
v3track gccdir 3
|
||||
|
||||
# Locate libatomic.
|
||||
set v3-libatomic 0
|
||||
set libatomicdir [lookfor_file $blddir/../libatomic .libs/libatomic.$shlib_ext]
|
||||
if {$libatomicdir != ""} {
|
||||
set v3-libatomic 1
|
||||
set libatomicdir [file dirname $libatomicdir]
|
||||
append ld_library_path_tmp ":${libatomicdir}"
|
||||
verbose -log "libatomic support detected"
|
||||
}
|
||||
v3track libatomicdir 3
|
||||
|
||||
# Locate libgomp. This is only required for parallel mode.
|
||||
set v3-libgomp 0
|
||||
set libgompdir [lookfor_file $blddir/../libgomp .libs/libgomp.$shlib_ext]
|
||||
|
|
Loading…
Reference in New Issue