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 /iconv/skeleton.c | |
| parent | 88f4b6929c26f9240a4b0b7dcc62922f02544a09 (diff) | |
| download | 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 'iconv/skeleton.c')
| -rw-r--r-- | iconv/skeleton.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/iconv/skeleton.c b/iconv/skeleton.c index 42ee0b6508..9eaf9a4948 100644 --- a/iconv/skeleton.c +++ b/iconv/skeleton.c @@ -404,10 +404,8 @@ FUNCTION_NAME (struct __gconv_step *step, struct __gconv_step_data *data, if ((data->__flags & __GCONV_IS_LAST) == 0) { fct = next_step->__fct; -#ifdef PTR_DEMANGLE if (next_step->__shlib_handle != NULL) PTR_DEMANGLE (fct); -#endif } /* If the function is called with no input this means we have to reset |