aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libstdc++-v3/ChangeLog4
-rw-r--r--libstdc++-v3/testsuite/20_util/shared_ptr/cons/58659.cc2
2 files changed, 5 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1716af6..60978e8 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-09 Marcus Shawcroft <marcus.shawcroft@arm.com>
+
+ * testsuite/20_util/shared_ptr/cons/58659.cc: Use __builtin_abort().
+
2013-10-08 Jonathan Wakely <jwakely.gcc@gmail.com>
* testsuite/*: Remove stray semi-colons after function definitions.
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/58659.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/58659.cc
index 5e7c730..1b823bc 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/58659.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/58659.cc
@@ -48,7 +48,7 @@ namespace std
void deallocate(value_type* p, size_t n)
{
if (n != 1 || p != (void*)storage || !allocated)
- abort();
+ __builtin_abort();
allocated = false;
}