From 1d171a16fb74b7fc3179c57a7de72a6927824673 Mon Sep 17 00:00:00 2001 From: mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> Date: Thu, 5 May 2005 04:05:35 +0000 Subject: [PATCH] * testsuite/lib/libstdc++.exp (v3-build_support): Look for __GTHREADS, rather than _GLIBCXX_HAVE_GTHR_DEFAULT, to determine whether or not thread support is available. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@99256 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 4 ++++ libstdc++-v3/testsuite/lib/libstdc++.exp | 16 ++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 0eb21b15948f..414e88390cf8 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,9 @@ 2005-05-04 Mark Mitchell <mark@codesourcery.com> + * testsuite/lib/libstdc++.exp (v3-build_support): Look for + __GTHREADS, rather than _GLIBCXX_HAVE_GTHR_DEFAULT, to determine + whether or not thread support is available. + * docs/html/test.html: Explain how to run the testsuite on an installed directory. diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp index 7f8008538eb1..60624df26034 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp @@ -314,17 +314,17 @@ proc v3-build_support {} { set config_src "config.cc" set f [open $config_src "w"] puts $f "#include <bits/c++config.h>" + puts $f "#include <bits/gthr.h>" close $f set preprocessed [v3_target_compile $config_src "" \ preprocess "additional_flags=-dN"] - foreach l $preprocessed { - if { [string first "_GLIBCXX_USE_WCHAR_T" $l] != -1 } { - verbose -log "wchar_t support detected" - set v3-wchar_t 1 - } elseif { [string first "_GLIBCXX_HAVE_GTHR_DEFAULT" $l] != -1 } { - verbose -log "thread support detected" - set v3-threads 1 - } + if { [string first "_GLIBCXX_USE_WCHAR_T" $preprocessed] != -1 } { + verbose -log "wchar_t support detected" + set v3-wchar_t 1 + } + if { [string first "__GTHREADS" $preprocessed] != -1 } { + verbose -log "thread support detected" + set v3-threads 1 } # Build the support objects. -- GitLab