From cf0dafe8efece0317bb04f73ef4f1add7afe0314 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <daywalker@users.sourceforge.net>
Date: Mon, 29 Jul 2002 20:42:39 +0000
Subject: [PATCH] Trying to support the new C++ ABI of gcc 3.x

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@549
---
 coregrind/vg_clientfuncs.c | 22 ++++++++++++++++++++--
 vg_clientfuncs.c           | 22 ++++++++++++++++++++--
 2 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/coregrind/vg_clientfuncs.c b/coregrind/vg_clientfuncs.c
index 80bdae671..c71b6db49 100644
--- a/coregrind/vg_clientfuncs.c
+++ b/coregrind/vg_clientfuncs.c
@@ -107,7 +107,6 @@ void* malloc ( Int n )
    return (void*)v;
 }
 
-
 void* __builtin_new ( Int n )
 {
    void* v;
@@ -133,6 +132,11 @@ void* __builtin_new ( Int n )
    return v;
 }
 
+/* gcc 3.X.X mangles them differently. */
+void* _Znwj ( Int n )
+{
+  return __builtin_new(n);
+}
 
 void* __builtin_vec_new ( Int n )
 {
@@ -159,6 +163,11 @@ void* __builtin_vec_new ( Int n )
    return v;
 }
 
+/* gcc 3.X.X mangles them differently. */
+void* _Znaj ( Int n )
+{
+  return __builtin_vec_new(n);
+}
 
 void free ( void* p )
 {
@@ -174,7 +183,6 @@ void free ( void* p )
    }
 }
 
-
 void __builtin_delete ( void* p )
 {
    if (VG_(clo_trace_malloc))
@@ -189,6 +197,11 @@ void __builtin_delete ( void* p )
    }
 }
 
+/* gcc 3.X.X mangles them differently. */
+void _ZdlPv ( void* p )
+{
+  __builtin_delete(p);
+}
 
 void __builtin_vec_delete ( void* p )
 {
@@ -204,6 +217,11 @@ void __builtin_vec_delete ( void* p )
    }
 }
 
+/* gcc 3.X.X mangles them differently. */
+void _ZdaPv ( void* p )
+{
+  __builtin_vec_delete(p);
+}
 
 void* calloc ( Int nmemb, Int size )
 {
diff --git a/vg_clientfuncs.c b/vg_clientfuncs.c
index 80bdae671..c71b6db49 100644
--- a/vg_clientfuncs.c
+++ b/vg_clientfuncs.c
@@ -107,7 +107,6 @@ void* malloc ( Int n )
    return (void*)v;
 }
 
-
 void* __builtin_new ( Int n )
 {
    void* v;
@@ -133,6 +132,11 @@ void* __builtin_new ( Int n )
    return v;
 }
 
+/* gcc 3.X.X mangles them differently. */
+void* _Znwj ( Int n )
+{
+  return __builtin_new(n);
+}
 
 void* __builtin_vec_new ( Int n )
 {
@@ -159,6 +163,11 @@ void* __builtin_vec_new ( Int n )
    return v;
 }
 
+/* gcc 3.X.X mangles them differently. */
+void* _Znaj ( Int n )
+{
+  return __builtin_vec_new(n);
+}
 
 void free ( void* p )
 {
@@ -174,7 +183,6 @@ void free ( void* p )
    }
 }
 
-
 void __builtin_delete ( void* p )
 {
    if (VG_(clo_trace_malloc))
@@ -189,6 +197,11 @@ void __builtin_delete ( void* p )
    }
 }
 
+/* gcc 3.X.X mangles them differently. */
+void _ZdlPv ( void* p )
+{
+  __builtin_delete(p);
+}
 
 void __builtin_vec_delete ( void* p )
 {
@@ -204,6 +217,11 @@ void __builtin_vec_delete ( void* p )
    }
 }
 
+/* gcc 3.X.X mangles them differently. */
+void _ZdaPv ( void* p )
+{
+  __builtin_vec_delete(p);
+}
 
 void* calloc ( Int nmemb, Int size )
 {