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 /stdio-common/errlist.c | |
parent | 111254f3e1e1a7ae5c2eda7cebc98f93a61d417c (diff) | |
download | glibc-900fa2573671d692ed245f76aa3f05cec462be0c.tar.gz glibc-900fa2573671d692ed245f76aa3f05cec462be0c.tar.xz 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 'stdio-common/errlist.c')
-rw-r--r-- | stdio-common/errlist.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/stdio-common/errlist.c b/stdio-common/errlist.c index 1c09a31a7a..4c0a0a218d 100644 --- a/stdio-common/errlist.c +++ b/stdio-common/errlist.c @@ -16,29 +16,17 @@ License along with the GNU C Library; if not, see <https://www.gnu.org/licenses/>. */ -#include <stdio.h> +#include <array_length.h> +#include <err_map.h> #include <errno.h> #include <libintl.h> -#include <array_length.h> - -#ifndef ERR_MAP -# define ERR_MAP(n) n -#endif - -const char *const _sys_errlist_internal[] = - { -#define _S(n, str) [ERR_MAP(n)] = str, -#include <errlist.h> -#undef _S - }; +#include <stdio.h> const char * __get_errlist (int errnum) { int mapped = ERR_MAP (errnum); - if (mapped >= 0 && mapped < array_length (_sys_errlist_internal)) + if (mapped >= 0 && mapped < _sys_errlist_internal_len) return _sys_errlist_internal[mapped]; return NULL; } - -#include <errlist-compat.c> |