diff options
| author | Florian Weimer <fweimer@redhat.com> | 2022-10-18 17:00:07 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2022-10-18 17:04:10 +0200 |
| commit | 58548b9d689fb9bba67bdc5b59c8d2fa47f4f8ec (patch) | |
| tree | 0aea307f4cf761952fbdf15fd67fc3b09b43707c /misc/unwind-link.c | |
| parent | 88f4b6929c26f9240a4b0b7dcc62922f02544a09 (diff) | |
| download | glibc-58548b9d689fb9bba67bdc5b59c8d2fa47f4f8ec.tar.gz glibc-58548b9d689fb9bba67bdc5b59c8d2fa47f4f8ec.tar.xz glibc-58548b9d689fb9bba67bdc5b59c8d2fa47f4f8ec.zip | |
Use PTR_MANGLE and PTR_DEMANGLE unconditionally in C sources
In the future, this will result in a compilation failure if the macros are unexpectedly undefined (due to header inclusion ordering or header inclusion missing altogether). Assembler sources are more difficult to convert. In many cases, they are hand-optimized for the mangling and no-mangling variants, which is why they are not converted. sysdeps/s390/s390-32/__longjmp.c and sysdeps/s390/s390-64/__longjmp.c are special: These are C sources, but most of the implementation is in assembler, so the PTR_DEMANGLE macro has to be undefined in some cases, to match the assembler style. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'misc/unwind-link.c')
| -rw-r--r-- | misc/unwind-link.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/misc/unwind-link.c b/misc/unwind-link.c index 45b7886b46..e8653bbaf1 100644 --- a/misc/unwind-link.c +++ b/misc/unwind-link.c @@ -86,19 +86,17 @@ __libc_unwind_link_get (void) assert (local.ptr__Unwind_Resume != NULL); assert (local.ptr_personality != NULL); -#ifdef PTR_MANGLE PTR_MANGLE (local.ptr__Unwind_Backtrace); PTR_MANGLE (local.ptr__Unwind_ForcedUnwind); PTR_MANGLE (local.ptr__Unwind_GetCFA); -# if UNWIND_LINK_GETIP +#if UNWIND_LINK_GETIP PTR_MANGLE (local.ptr__Unwind_GetIP); -# endif +#endif PTR_MANGLE (local.ptr__Unwind_Resume); -# if UNWIND_LINK_FRAME_STATE_FOR +#if UNWIND_LINK_FRAME_STATE_FOR PTR_MANGLE (local.ptr___frame_state_for); -# endif - PTR_MANGLE (local.ptr_personality); #endif + PTR_MANGLE (local.ptr_personality); __libc_lock_lock (lock); if (atomic_load_relaxed (&global_libgcc_handle) != NULL) |