[gcc r14-6975] libstdc++: Avoid conflicting declaration in eh_call.cc [PR112997]

Jonathan Wakely redi@gcc.gnu.org
Sun Jan 7 01:00:33 GMT 2024


https://gcc.gnu.org/g:8c5d00f8291d718ef64c742b9c971e16f75e5074

commit r14-6975-g8c5d00f8291d718ef64c742b9c971e16f75e5074
Author: Jonathan Wakely <jwakely@redhat.com>
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__


More information about the Libstdc++-cvs mailing list