diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2022-04-01 14:17:07 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2024-04-17 16:12:41 -0300 |
| commit | c7fbd2d41ba5acc69c5fe10af5dfce2821eb8b36 (patch) | |
| tree | 7e0aff1a7eecd7800adacded0b3ff51850da7c94 | |
| parent | e2aecf83252b829fa3704123e8c975938c0faeb5 (diff) | |
| download | glibc-c7fbd2d41ba5acc69c5fe10af5dfce2821eb8b36.tar.gz glibc-c7fbd2d41ba5acc69c5fe10af5dfce2821eb8b36.tar.xz glibc-c7fbd2d41ba5acc69c5fe10af5dfce2821eb8b36.zip | |
Handle abort call for -fexceptions call
clang might generate an abort call when cleanup functions (set by __attribute__ ((cleanup)) calls functions not marked as nothrow. We can mitigate by marking some internal functions as __THROW, but it is not possible for functions that issue used-provided callbacks (for instance pthread_once).
| -rw-r--r-- | sysdeps/generic/symbol-hacks.h | 7 | ||||
| -rw-r--r-- | sysdeps/nptl/lowlevellock.h | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/sysdeps/generic/symbol-hacks.h b/sysdeps/generic/symbol-hacks.h index 1115e4c0a7..560116d575 100644 --- a/sysdeps/generic/symbol-hacks.h +++ b/sysdeps/generic/symbol-hacks.h @@ -6,6 +6,13 @@ asm ("memmove = __GI_memmove"); asm ("memset = __GI_memset"); asm ("memcpy = __GI_memcpy"); +/* clang might generate an abort call when cleanup functions (set by + __attribute__ ((cleanup)) calls functions not marked as nothrow. + We can mitigate by marking some internal functions as __THROW, + but it is not possible for functions that issue used-provided + callbacks (for instance pthread_once). */ +asm ("abort = __GI_abort"); + /* Some targets do not use __stack_chk_fail_local. In libc.so, redirect __stack_chk_fail to a hidden reference __stack_chk_fail_local, to avoid the PLT reference. diff --git a/sysdeps/nptl/lowlevellock.h b/sysdeps/nptl/lowlevellock.h index 1fc4936a6c..4a769b799a 100644 --- a/sysdeps/nptl/lowlevellock.h +++ b/sysdeps/nptl/lowlevellock.h @@ -125,9 +125,9 @@ libc_hidden_proto (__lll_lock_wait) #define lll_cond_lock(futex, private) __lll_cond_lock (&(futex), private) -extern void __lll_lock_wake_private (int *futex); +extern void __lll_lock_wake_private (int *futex) __THROW; libc_hidden_proto (__lll_lock_wake_private) -extern void __lll_lock_wake (int *futex, int private); +extern void __lll_lock_wake (int *futex, int private) __THROW; libc_hidden_proto (__lll_lock_wake) /* This is an expression rather than a statement even though its value is |