diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2023-12-13 09:45:44 +0000 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2024-01-07 00:58:46 +0000 |
| commit | 8c5d00f8291d718ef64c742b9c971e16f75e5074 (patch) | |
| tree | 07fe2622ffc9715fa020305fd7d888456f1401ae | |
| parent | 7d11d813583efad652c83c7631ef8d6d18489119 (diff) | |
| download | gcc-8c5d00f8291d718ef64c742b9c971e16f75e5074.zip gcc-8c5d00f8291d718ef64c742b9c971e16f75e5074.tar.gz gcc-8c5d00f8291d718ef64c742b9c971e16f75e5074.tar.bz2 | |
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*.
| -rw-r--r-- | libstdc++-v3/libsupc++/unwind-cxx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libstdc++-v3/libsupc++/unwind-cxx.h b/libstdc++-v3/libsupc++/unwind-cxx.h index f7eef0d..abc8b80 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__ |