From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <aoliva@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2140)
 id E634E3897839; Tue, 19 May 2020 08:37:44 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E634E3897839
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org;
 s=default; t=1589877464;
 bh=3riFnnHcaDOFTSOTN4p2M97b7eGQNVQCxFzw4kJ5Azs=;
 h=From:To:Subject:Date:From;
 b=BWEZHuQhmXbKvdaPPOUtTnaZRp4muZFbZOTjCy7YWeSg1fkwEXJEscs4rsKgSA4c1
 i63iB+eTv3RoEc7eSaqdWY475B7oZsCR2gfU70AiJf+2rf2dFmkbf0Fa6SWTXkLoo6
 uMRtBdH87qfTLMO7Rgr9JdfKxRZ4yxIKL5ay02lU=
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Alexandre Oliva <aoliva@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc(refs/users/aoliva/heads/testbase)] libstdc++: Fix the return
 type of __cxa_finalize
X-Act-Checkin: gcc
X-Git-Author: Fangrui Song <maskray@google.com>
X-Git-Refname: refs/users/aoliva/heads/testbase
X-Git-Oldrev: ae8a08ff59d28b17489d5c454bc07bfb70f0dff9
X-Git-Newrev: 1405ed433443c7df22364ef8c6574bbf9b10b61a
Message-Id: <20200519083744.E634E3897839@sourceware.org>
Date: Tue, 19 May 2020 08:37:44 +0000 (GMT)
X-BeenThere: libstdc++-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Libstdc++-cvs mailing list <libstdc++-cvs.gcc.gnu.org>
List-Unsubscribe: <http://gcc.gnu.org/mailman/options/libstdc++-cvs>,
 <mailto:libstdc++-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/libstdc++-cvs/>
List-Help: <mailto:libstdc++-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <http://gcc.gnu.org/mailman/listinfo/libstdc++-cvs>,
 <mailto:libstdc++-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 19 May 2020 08:37:45 -0000

https://gcc.gnu.org/g:1405ed433443c7df22364ef8c6574bbf9b10b61a

commit 1405ed433443c7df22364ef8c6574bbf9b10b61a
Author: Fangrui Song <maskray@google.com>
Date:   Mon May 4 23:07:19 2020 +0100

    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:
---
 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  <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.