From 1405ed433443c7df22364ef8c6574bbf9b10b61a Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Mon, 4 May 2020 23:07:19 +0100 Subject: [PATCH] libstdc++: Fix the return type of __cxa_finalize This should return void according to the Itanium C++ ABI. 2020-05-04 Fangrui Song * libsupc++/cxxabi.h (__cxa_finalize): Fix return type. --- libstdc++-v3/ChangeLog | 4 ++++ libstdc++-v3/libsupc++/cxxabi.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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 + + * libsupc++/cxxabi.h (__cxa_finalize): Fix return type. + 2020-05-04 Jonathan Wakely * 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. -- 2.30.2