From cf54716442d585e0f3988470a9596e006adec6ed Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Mon, 21 Nov 2011 14:28:49 +0000 Subject: [PATCH] Adapt c-c++-common/tm/malloc.c for Solaris headers with C++ * c-c++-common/tm/malloc.c: Scan tree dumps for std::malloc if *-*-solaris2* && c++. From-SVN: r181579 --- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/c-c++-common/tm/malloc.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5c1fb00..3785361 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-11-21 Rainer Orth + + * c-c++-common/tm/malloc.c: Scan tree dumps for std::malloc if + *-*-solaris2* && c++. + 2011-11-20 Joey Ye * gcc.dg/volatile-bitfields-1.c: New. diff --git a/gcc/testsuite/c-c++-common/tm/malloc.c b/gcc/testsuite/c-c++-common/tm/malloc.c index de7a766..81bcc56 100644 --- a/gcc/testsuite/c-c++-common/tm/malloc.c +++ b/gcc/testsuite/c-c++-common/tm/malloc.c @@ -17,7 +17,9 @@ void foobar(void) z = (char *)malloc (666); } -/* { dg-final { scan-tree-dump-times " malloc .666" 1 "tmmark" } } */ +/* { dg-final { scan-tree-dump-times " malloc .666" 1 "tmmark" { target { ! { *-*-solaris2* && c++ } } } } } */ +/* Solaris 2 headers are C++-aware and declare std::malloc. */ +/* { dg-final { scan-tree-dump-times " std::malloc .666" 1 "tmmark" { target { *-*-solaris2* && c++ } } } } */ /* { dg-final { scan-tree-dump-times "__builtin__ITM_malloc" 1 "tmmark" } } */ /* { dg-final { scan-tree-dump-times "__builtin__ITM_calloc" 1 "tmmark" } } */ /* { dg-final { scan-tree-dump-times "__builtin__ITM_free" 2 "tmmark" } } */ -- 2.7.4