aboutsummaryrefslogtreecommitdiff
path: root/gcc/testsuite/c-c++-common/tm/malloc.c
diff options
context:
space:
mode:
authorJeff Law <law@redhat.com>2011-11-30 05:16:36 +0000
committerJeff Law <law@redhat.com>2011-11-30 05:16:36 +0000
commit7b5177cc9956a68a50825c443a6d396fdc1af2b5 (patch)
treea6b80dca8f72a2e7640e4d535901e42325b2a954 /gcc/testsuite/c-c++-common/tm/malloc.c
parent6377b0d9b395f395e25bd4a030a9056171433061 (diff)
parentee4a734e5eece9824adc2a26e518c99bbdbe802e (diff)
Weekly merge from trunk. No regressions.reload-v2a
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/reload-v2a@181834 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/testsuite/c-c++-common/tm/malloc.c')
-rw-r--r--gcc/testsuite/c-c++-common/tm/malloc.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/gcc/testsuite/c-c++-common/tm/malloc.c b/gcc/testsuite/c-c++-common/tm/malloc.c
index de7a766e36c..81bcc56fc41 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" } } */