summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libstdc++-v3/ChangeLog4
-rw-r--r--libstdc++-v3/libsupc++/cxxabi.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index a011ec5f45a..f4839debf76 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2020-05-04 Fangrui Song <maskray@google.com>
+
+ * libsupc++/cxxabi.h (__cxa_finalize): Fix return type.
+
2020-05-04 Jonathan Wakely <jwakely@redhat.com>
* doc/xml/faq.xml: Use working link for SGI STL FAQ.
diff --git a/libstdc++-v3/libsupc++/cxxabi.h b/libstdc++-v3/libsupc++/cxxabi.h
index 50298205daa..000713ecdf8 100644
--- a/libstdc++-v3/libsupc++/cxxabi.h
+++ b/libstdc++-v3/libsupc++/cxxabi.h
@@ -127,7 +127,7 @@ namespace __cxxabiv1
int
__cxa_atexit(void (*)(void*), void*, void*) _GLIBCXX_NOTHROW;
- int
+ void
__cxa_finalize(void*);
// TLS destruction.