From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 213663858C2D; Sun, 7 Jan 2024 01:00:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 213663858C2D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1704589233; bh=Ft8upCR7o8TeEd1OpVpeCS7YwJ+5DHsHfcYzxq7VmB0=; h=From:To:Subject:Date:From; b=H4vIXWzbJi92BxTqQVpgmEEByPz4pO/gmCG2jgKULsvxq+/vfHNpwbiensncuzfqe JNVPM8gUVML+4VlezmcuBG88XLdk98VXILTKil7gtae+rgFuCsy/i3scBbRYbK/17R e3OGcLskBdYetqZkp34s1V37jXMM2QQsb5gbKHw4= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r14-6975] libstdc++: Avoid conflicting declaration in eh_call.cc [PR112997] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 7d11d813583efad652c83c7631ef8d6d18489119 X-Git-Newrev: 8c5d00f8291d718ef64c742b9c971e16f75e5074 Message-Id: <20240107010033.213663858C2D@sourceware.org> Date: Sun, 7 Jan 2024 01:00:33 +0000 (GMT) List-Id: https://gcc.gnu.org/g:8c5d00f8291d718ef64c742b9c971e16f75e5074 commit r14-6975-g8c5d00f8291d718ef64c742b9c971e16f75e5074 Author: Jonathan Wakely Date: Wed Dec 13 09:45:44 2023 +0000 libstdc++: Avoid conflicting declaration in eh_call.cc [PR112997] r14-1527-g2415024e0f81f8 changed the parameter of the __cxa_call_terminate definition, but there's also a declaration in unwind-cxx.h which should have been changed too. libstdc++-v3/ChangeLog: PR libstdc++/112997 * libsupc++/unwind-cxx.h (__cxa_call_terminate): Change first parameter to void*. Diff: --- libstdc++-v3/libsupc++/unwind-cxx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libstdc++-v3/libsupc++/unwind-cxx.h b/libstdc++-v3/libsupc++/unwind-cxx.h index f7eef0da6e2..abc8b808f26 100644 --- a/libstdc++-v3/libsupc++/unwind-cxx.h +++ b/libstdc++-v3/libsupc++/unwind-cxx.h @@ -167,7 +167,7 @@ struct __cxa_eh_globals // throws, and if bad_exception needs to be thrown. Called from the // compiler. extern "C" void __cxa_call_unexpected (void *) __attribute__((__noreturn__)); -extern "C" void __cxa_call_terminate (_Unwind_Exception*) throw () +extern "C" void __cxa_call_terminate (void*) throw () __attribute__((__noreturn__)); #ifdef __ARM_EABI_UNWINDER__