From 8c5d00f8291d718ef64c742b9c971e16f75e5074 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely <jwakely@redhat.com> Date: Wed, 13 Dec 2023 09:45:44 +0000 Subject: [PATCH] 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*. --- 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 f7eef0da6e25..abc8b808f267 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__ -- GitLab