aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.old-deja/g++.abi/cxa_vec.C10
2 files changed, 13 insertions, 2 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f9dfb7f..357fe77 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
2004-09-15 Mark Mitchell <mark@codesourcery.com>
+ * testsuite/g++.old-deja/g++.abi/cxa_vec.C: Adjust for ARM
+ EABI.
+
+2004-09-15 Mark Mitchell <mark@codesourcery.com>
+
* g++.dg/opt/switch1.C: New test.
2004-09-15 Joseph S. Myers <jsm@polyomino.org.uk>
diff --git a/gcc/testsuite/g++.old-deja/g++.abi/cxa_vec.C b/gcc/testsuite/g++.old-deja/g++.abi/cxa_vec.C
index a6fdc44..3c05f16 100644
--- a/gcc/testsuite/g++.old-deja/g++.abi/cxa_vec.C
+++ b/gcc/testsuite/g++.old-deja/g++.abi/cxa_vec.C
@@ -22,14 +22,17 @@ static bool dtor_repeat = false;
#endif
// our pseudo ctors and dtors
-static void ctor (void *)
+static abi::__cxa_cdtor_return_type ctor (void *x)
{
if (!ctor_count)
throw 1;
ctor_count--;
+#ifdef __ARM_EABI__
+ return x;
+#endif
}
-static void dtor (void *)
+static abi::__cxa_cdtor_return_type dtor (void *x)
{
if (!dtor_count)
{
@@ -38,6 +41,9 @@ static void dtor (void *)
throw 1;
}
dtor_count--;
+#ifdef __ARM_EABI__
+ return x;
+#endif
}
// track new and delete