aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2016-07-31 13:02:17 +0000
committerJonathan Wakely <jwakely@redhat.com>2016-07-31 13:02:17 +0000
commitf2d051cba204b868ac5f400694b42515e2acb026 (patch)
tree4db0f92c8311740ba392021d2f3eae647d3fbeb2
parentf661737807ce2a03c7935c8712c3ef580846b351 (diff)
Make check_effective_target_c++ work for libstdc++
* lib/target-supports.exp (check_effective_target_c): Fix indentation. (check_effective_target_c++): Likewise. Also match for libstdc++. git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@238916 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/lib/target-supports.exp10
2 files changed, 10 insertions, 5 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 829d8975037..ab7ab94b2de 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-07-31 Jonathan Wakely <jwakely@redhat.com>
+
+ * lib/target-supports.exp (check_effective_target_c): Fix indentation.
+ (check_effective_target_c++): Likewise. Also match for libstdc++.
+
2016-07-30 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/41922
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index 770268f3e2f..9c5194d0d9a 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -7001,9 +7001,9 @@ proc check_effective_target_masm_intel {} {
# Return 1 if the language for the compiler under test is C.
proc check_effective_target_c { } {
- global tool
+ global tool
if [string match $tool "gcc"] {
- return 1
+ return 1
}
return 0
}
@@ -7011,9 +7011,9 @@ proc check_effective_target_c { } {
# Return 1 if the language for the compiler under test is C++.
proc check_effective_target_c++ { } {
- global tool
- if [string match $tool "g++"] {
- return 1
+ global tool
+ if { [string match $tool "g++"] || [string match $tool "libstdc++"] } {
+ return 1
}
return 0
}