diff options
| author | Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> | 2011-11-21 14:28:49 +0000 |
|---|---|---|
| committer | Rainer Orth <ro@gcc.gnu.org> | 2011-11-21 14:28:49 +0000 |
| commit | cf54716442d585e0f3988470a9596e006adec6ed (patch) | |
| tree | 5f781a4d775052d759a4d2b329ccf7f877cd4230 /gcc | |
| parent | ca20a08e2660cf50bf7488925a63aa10f3bb8c47 (diff) | |
| download | gcc-cf54716442d585e0f3988470a9596e006adec6ed.zip gcc-cf54716442d585e0f3988470a9596e006adec6ed.tar.gz gcc-cf54716442d585e0f3988470a9596e006adec6ed.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/c-c++-common/tm/malloc.c | 4 |
2 files changed, 8 insertions, 1 deletions
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 <ro@CeBiTec.Uni-Bielefeld.DE> + + * c-c++-common/tm/malloc.c: Scan tree dumps for std::malloc if + *-*-solaris2* && c++. + 2011-11-20 Joey Ye <joey.ye@arm.com> * 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" } } */ |