From: Fangrui Song <maskray@google.com>
Date: Mon, 4 May 2020 22:07:19 +0000 (+0100)
Subject: libstdc++: Fix the return type of __cxa_finalize
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1405ed433443c7df22364ef8c6574bbf9b10b61a;p=gcc.git

libstdc++: Fix the return type of __cxa_finalize

This should return void according to the Itanium C++ ABI.

2020-05-04  Fangrui Song  <maskray@google.com>

	* libsupc++/cxxabi.h (__cxa_finalize): Fix return type.
---

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.