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 | |
parent | 111254f3e1e1a7ae5c2eda7cebc98f93a61d417c (diff) | |
download | glibc-900fa2573671d692ed245f76aa3f05cec462be0c.zip glibc-900fa2573671d692ed245f76aa3f05cec462be0c.tar.gz glibc-900fa2573671d692ed245f76aa3f05cec462be0c.tar.bz2 |
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')
-rw-r--r-- | sysdeps/mach/hurd/err_map.h (renamed from sysdeps/mach/hurd/errlist.c) | 9 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/alpha/errlist-compat-data.h (renamed from sysdeps/unix/sysv/linux/alpha/errlist-compat.c) | 0 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/errlist-compat-data.h (renamed from sysdeps/unix/sysv/linux/errlist-compat.c) | 0 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/errlist-compat.h | 33 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/hppa/errlist-compat-data.h (renamed from sysdeps/unix/sysv/linux/hppa/errlist-compat.c) | 0 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/mips/errlist-compat-data.h (renamed from sysdeps/unix/sysv/linux/mips/errlist-compat.c) | 0 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/sparc/errlist-compat-data.h (renamed from sysdeps/unix/sysv/linux/sparc/errlist-compat.c) | 0 |
7 files changed, 28 insertions, 14 deletions
diff --git a/sysdeps/mach/hurd/errlist.c b/sysdeps/mach/hurd/err_map.h index 2d782ff..22d21ca 100644 --- a/sysdeps/mach/hurd/errlist.c +++ b/sysdeps/mach/hurd/err_map.h @@ -1,4 +1,5 @@ -/* Copyright (C) 1998-2022 Free Software Foundation, Inc. +/* Internal errno names mapping definition. Hurd version. + Copyright (C) 2022 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -15,7 +16,11 @@ License along with the GNU C Library; if not, see <https://www.gnu.org/licenses/>. */ +#ifndef _ERR_MAP_H +#define _ERR_MAP_H + #include <mach/error.h> #define ERR_MAP(value) err_get_code (value) -#include <stdio-common/errlist.c> + +#endif diff --git a/sysdeps/unix/sysv/linux/alpha/errlist-compat.c b/sysdeps/unix/sysv/linux/alpha/errlist-compat-data.h index 9c0ed1e..9c0ed1e 100644 --- a/sysdeps/unix/sysv/linux/alpha/errlist-compat.c +++ b/sysdeps/unix/sysv/linux/alpha/errlist-compat-data.h diff --git a/sysdeps/unix/sysv/linux/errlist-compat.c b/sysdeps/unix/sysv/linux/errlist-compat-data.h index 1a779ac..1a779ac 100644 --- a/sysdeps/unix/sysv/linux/errlist-compat.c +++ b/sysdeps/unix/sysv/linux/errlist-compat-data.h diff --git a/sysdeps/unix/sysv/linux/errlist-compat.h b/sysdeps/unix/sysv/linux/errlist-compat.h index a09b38f..3300886 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 diff --git a/sysdeps/unix/sysv/linux/hppa/errlist-compat.c b/sysdeps/unix/sysv/linux/hppa/errlist-compat-data.h index bb5c95c..bb5c95c 100644 --- a/sysdeps/unix/sysv/linux/hppa/errlist-compat.c +++ b/sysdeps/unix/sysv/linux/hppa/errlist-compat-data.h diff --git a/sysdeps/unix/sysv/linux/mips/errlist-compat.c b/sysdeps/unix/sysv/linux/mips/errlist-compat-data.h index 2ad8ac1..2ad8ac1 100644 --- a/sysdeps/unix/sysv/linux/mips/errlist-compat.c +++ b/sysdeps/unix/sysv/linux/mips/errlist-compat-data.h diff --git a/sysdeps/unix/sysv/linux/sparc/errlist-compat.c b/sysdeps/unix/sysv/linux/sparc/errlist-compat-data.h index b7a43d3..b7a43d3 100644 --- a/sysdeps/unix/sysv/linux/sparc/errlist-compat.c +++ b/sysdeps/unix/sysv/linux/sparc/errlist-compat-data.h |