diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2022-04-06 12:09:42 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2022-05-13 10:54:41 -0300 |
| commit | 900fa2573671d692ed245f76aa3f05cec462be0c (patch) | |
| tree | 221e0866faaa1e5305384a43f8de84f869c84caa /sysdeps/unix/sysv/linux/errlist-compat.h | |
| parent | 111254f3e1e1a7ae5c2eda7cebc98f93a61d417c (diff) | |
| download | glibc-900fa2573671d692ed245f76aa3f05cec462be0c.tar glibc-900fa2573671d692ed245f76aa3f05cec462be0c.tar.gz glibc-900fa2573671d692ed245f76aa3f05cec462be0c.tar.bz2 glibc-900fa2573671d692ed245f76aa3f05cec462be0c.zip | |
stdio: Remove the usage of $(fno-unit-at-a-time) for errlist.c
The errlist.c is built with -fno-toplevel-reorder to avoid compiler to
reorder the compat assembly directives due an assembler issue [1]
(fixed on 2.39).
This patch removes the compiler flags by split the compat symbol
generation in two phases. First the _sys_errlist_internal internal
without any compat symbol directive is preprocessed to generate an
assembly source code. This generate assembly is then used as input
on a platform agnostic errlist-data.S which then creates the compat
definitions. This prevents compiler to move any compat directive
prior the _sys_errlist_internal definition itself.
Checked on a make check run-built-tests=no on all affected ABIs.
[1] https://sourceware.org/bugzilla/show_bug.cgi?id=29012
Diffstat (limited to 'sysdeps/unix/sysv/linux/errlist-compat.h')
| -rw-r--r-- | sysdeps/unix/sysv/linux/errlist-compat.h | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/sysdeps/unix/sysv/linux/errlist-compat.h b/sysdeps/unix/sysv/linux/errlist-compat.h index a09b38f243..33008863f8 100644 --- a/sysdeps/unix/sysv/linux/errlist-compat.h +++ b/sysdeps/unix/sysv/linux/errlist-compat.h @@ -20,6 +20,7 @@ #define _ERRLIST_COMPAT_H #include <shlib-compat.h> +#include <limits.h> /* Define new compat symbols for symbols _sys_errlist, sys_errlist, _sys_nerr, and sys_nerr for version VERSION with NUMBERERR times number of @@ -27,17 +28,25 @@ Both _sys_errlist and sys_errlist alias to _sys_errlist_internal symbol (defined on errlist.c) while _sys_nerr and sys_nerr created new variable with the expected size. */ -#define DEFINE_COMPAT_ERRLIST(NUMBERERR, VERSION) \ - const int __##VERSION##_sys_nerr = NUMBERERR; \ - strong_alias (__##VERSION##_sys_nerr, __##VERSION##__sys_nerr); \ - declare_symbol_alias (__ ## VERSION ## _sys_errlist, _sys_errlist_internal,\ - object, NUMBERERR * (ULONG_WIDTH / UCHAR_WIDTH)); \ - declare_symbol_alias (__ ## VERSION ## __sys_errlist, \ - _sys_errlist_internal, object, \ - NUMBERERR * (ULONG_WIDTH / UCHAR_WIDTH)); \ - compat_symbol (libc, __## VERSION ## _sys_nerr, sys_nerr, VERSION); \ - compat_symbol (libc, __## VERSION ## __sys_nerr, _sys_nerr, VERSION); \ - compat_symbol (libc, __## VERSION ## _sys_errlist, sys_errlist, VERSION); \ - compat_symbol (libc, __## VERSION ## __sys_errlist, _sys_errlist, VERSION);\ +#ifdef __ASSEMBLER__ +# define DEFINE_COMPAT_ERRLIST(NUMBERERR, VERSION) \ + declare_object_symbol_alias (__ ## VERSION ## _sys_errlist, \ + _sys_errlist_internal, \ + NUMBERERR * (ULONG_WIDTH / UCHAR_WIDTH)) \ + ASM_LINE_SEP \ + declare_object_symbol_alias (__ ## VERSION ## __sys_errlist, \ + _sys_errlist_internal, \ + NUMBERERR * (ULONG_WIDTH / UCHAR_WIDTH)) \ + ASM_LINE_SEP \ + compat_symbol (libc, __## VERSION ## _sys_errlist, sys_errlist, VERSION) \ + ASM_LINE_SEP \ + compat_symbol (libc, __## VERSION ## __sys_errlist, _sys_errlist, VERSION) +#else +# define DEFINE_COMPAT_ERRLIST(NUMBERERR, VERSION) \ + const int __##VERSION##_sys_nerr = NUMBERERR; \ + strong_alias (__##VERSION##_sys_nerr, __##VERSION##__sys_nerr); \ + compat_symbol (libc, __## VERSION ## _sys_nerr, sys_nerr, VERSION); \ + compat_symbol (libc, __## VERSION ## __sys_nerr, _sys_nerr, VERSION); +#endif #endif |