From 6fad891dfd5236002a2e64e26279c1d6dfa79565 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Thu, 7 Apr 2022 17:15:56 -0300 Subject: stdio: Remove the usage of $(fno-unit-at-a-time) for siglist.c The siglist.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_siglist and __sys_sigabbrev 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 siglist.S which then creates the compat definitions. This prevents compiler to move any compat directive prior the _sys_errlist definition itself. Checked on a make check run-built-tests=no on all affected ABIs. Reviewed-by: Fangrui Song --- include/signal.h | 6 ++-- stdio-common/Makefile | 14 ++++++++- stdio-common/siglist-gen.c | 35 ++++++++++++++++++++++ stdio-common/siglist.S | 7 +++++ stdio-common/siglist.c | 39 ------------------------- sysdeps/generic/siglist-compat-def.h | 50 ++++++++++++++++++++++++++++++++ sysdeps/generic/siglist-compat.c | 1 - sysdeps/generic/siglist-compat.h | 47 ------------------------------ sysdeps/mach/hurd/siglist-compat.c | 27 ----------------- sysdeps/mach/hurd/siglist-compat.h | 30 +++++++++++++++++++ sysdeps/unix/sysv/linux/siglist-compat.c | 31 -------------------- sysdeps/unix/sysv/linux/siglist-compat.h | 34 ++++++++++++++++++++++ 12 files changed, 171 insertions(+), 150 deletions(-) create mode 100644 stdio-common/siglist-gen.c create mode 100644 stdio-common/siglist.S delete mode 100644 stdio-common/siglist.c create mode 100644 sysdeps/generic/siglist-compat-def.h delete mode 100644 sysdeps/generic/siglist-compat.c delete mode 100644 sysdeps/generic/siglist-compat.h delete mode 100644 sysdeps/mach/hurd/siglist-compat.c create mode 100644 sysdeps/mach/hurd/siglist-compat.h delete mode 100644 sysdeps/unix/sysv/linux/siglist-compat.c create mode 100644 sysdeps/unix/sysv/linux/siglist-compat.h diff --git a/include/signal.h b/include/signal.h index 2a278697c1..73f18dddd7 100644 --- a/include/signal.h +++ b/include/signal.h @@ -14,10 +14,8 @@ libc_hidden_proto (__sigpause) libc_hidden_proto (raise) libc_hidden_proto (__libc_current_sigrtmin) libc_hidden_proto (__libc_current_sigrtmax) -extern const char * const __sys_siglist[_NSIG]; -libc_hidden_proto (__sys_siglist) -extern const char * const __sys_sigabbrev[_NSIG]; -libc_hidden_proto (__sys_sigabbrev) +extern const char * const __sys_siglist[_NSIG] attribute_hidden; +extern const char * const __sys_sigabbrev[_NSIG] attribute_hidden; /* Now define the internal interfaces. */ extern __sighandler_t __bsd_signal (int __sig, __sighandler_t __handler); diff --git a/stdio-common/Makefile b/stdio-common/Makefile index 08bc998436..cb85e949c0 100644 --- a/stdio-common/Makefile +++ b/stdio-common/Makefile @@ -215,6 +215,8 @@ tests := \ generated += \ errlist-data-aux-shared.S \ errlist-data-aux.S \ + siglist-aux-shared.S \ + siglist-aux.S \ # generated test-srcs = tst-unbputc tst-printf tst-printfsz-islongdouble @@ -265,6 +267,17 @@ $(objpfx)errlist-data-aux.S: errlist-data-gen.c $(objpfx)errlist-data.os: $(objpfx)errlist-data-aux-shared.S $(objpfx)errlist-data.o: $(objpfx)errlist-data-aux.S +$(objpfx)siglist-aux-shared.S: siglist-gen.c + $(make-target-directory) + $(compile-command.c) $(pic-cppflags) $(pic-ccflag) $(no-stack-protector) -S + +$(objpfx)siglist-aux.S: siglist-gen.c + $(make-target-directory) + $(compile-command.c) $(pie-default) $(no-stack-protector) -S + +$(objpfx)siglist.os: $(objpfx)siglist-aux-shared.S +$(objpfx)siglist.o: $(objpfx)siglist-aux.S + ifeq ($(run-built-tests),yes) LOCALES := \ de_DE.ISO-8859-1 \ @@ -353,7 +366,6 @@ CFLAGS-isoc99_vfscanf.c += -fexceptions CFLAGS-isoc99_vscanf.c += -fexceptions CFLAGS-isoc99_fscanf.c += -fexceptions CFLAGS-isoc99_scanf.c += -fexceptions -CFLAGS-siglist.c += $(fno-unit-at-a-time) # scanf14a.c and scanf16a.c test a deprecated extension which is no # longer visible under most conformance levels; see the source files diff --git a/stdio-common/siglist-gen.c b/stdio-common/siglist-gen.c new file mode 100644 index 0000000000..95441b707d --- /dev/null +++ b/stdio-common/siglist-gen.c @@ -0,0 +1,35 @@ +/* Define list of all signal numbers and their names. + Copyright (C) 1997-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 + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include +#include + +const char *const __sys_siglist[NSIG] = +{ +#define init_sig(sig, abbrev, desc) [sig] = desc, +#include +#undef init_sig +}; + +const char *const __sys_sigabbrev[NSIG] = +{ +#define init_sig(sig, abbrev, desc) [sig] = abbrev, +#include +#undef init_sig +}; diff --git a/stdio-common/siglist.S b/stdio-common/siglist.S new file mode 100644 index 0000000000..f84cdac976 --- /dev/null +++ b/stdio-common/siglist.S @@ -0,0 +1,7 @@ +#ifdef SHARED +# include "siglist-aux-shared.S" +#else +# include "siglist-aux.S" +#endif + +#include diff --git a/stdio-common/siglist.c b/stdio-common/siglist.c deleted file mode 100644 index bb88d5300f..0000000000 --- a/stdio-common/siglist.c +++ /dev/null @@ -1,39 +0,0 @@ -/* Define list of all signal numbers and their names. - Copyright (C) 1997-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 - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#include -#include -#include - -const char *const __sys_siglist[NSIG] = -{ -#define init_sig(sig, abbrev, desc) [sig] = desc, -#include -#undef init_sig -}; -libc_hidden_def (__sys_siglist) - -const char *const __sys_sigabbrev[NSIG] = -{ -#define init_sig(sig, abbrev, desc) [sig] = abbrev, -#include -#undef init_sig -}; -libc_hidden_def (__sys_sigabbrev) - -#include diff --git a/sysdeps/generic/siglist-compat-def.h b/sysdeps/generic/siglist-compat-def.h new file mode 100644 index 0000000000..f5a1840dc3 --- /dev/null +++ b/sysdeps/generic/siglist-compat-def.h @@ -0,0 +1,50 @@ +/* Generic siglist compatibility macro definitions. + Copyright (C) 2020-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 + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _SIGLIST_COMPAT_H +#define _SIGLIST_COMPAT_H + +#include +#include + +/* Define new compat symbols for sys_siglist, _sys_siglist, and sys_sigabbrev + for version VERSION with NUMBERSIG times the number of bytes per long int. + Both _sys_siglist and sys_siglist alias to __sys_siglist while + sys_sigabbrev alias to __sys_sigabbrev. Both target alias are + define in siglist.c. */ +#define DEFINE_COMPAT_SIGLIST(NUMBERSIG, VERSION) \ + declare_object_symbol_alias (__ ## VERSION ## _sys_siglist, \ + __sys_siglist, \ + NUMBERSIG * (ULONG_WIDTH / UCHAR_WIDTH)) \ + ASM_LINE_SEP \ + declare_object_symbol_alias (__ ## VERSION ## sys_siglist, \ + __sys_siglist, \ + NUMBERSIG * (ULONG_WIDTH / UCHAR_WIDTH)) \ + ASM_LINE_SEP \ + declare_object_symbol_alias (__ ## VERSION ## _sys_sigabbrev, \ + __sys_sigabbrev, \ + NUMBERSIG * (ULONG_WIDTH / UCHAR_WIDTH)) \ + ASM_LINE_SEP \ + compat_symbol (libc, __## VERSION ## _sys_siglist, _sys_siglist, \ + VERSION) ASM_LINE_SEP \ + compat_symbol (libc, __## VERSION ## sys_siglist, sys_siglist, \ + VERSION) ASM_LINE_SEP \ + compat_symbol (libc, __## VERSION ## _sys_sigabbrev, sys_sigabbrev, \ + VERSION) + +#endif diff --git a/sysdeps/generic/siglist-compat.c b/sysdeps/generic/siglist-compat.c deleted file mode 100644 index 6e25b021ab..0000000000 --- a/sysdeps/generic/siglist-compat.c +++ /dev/null @@ -1 +0,0 @@ -/* Empty. */ diff --git a/sysdeps/generic/siglist-compat.h b/sysdeps/generic/siglist-compat.h deleted file mode 100644 index 05a0d63855..0000000000 --- a/sysdeps/generic/siglist-compat.h +++ /dev/null @@ -1,47 +0,0 @@ -/* Generic siglist compatibility macro definitions. - Copyright (C) 2020-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 - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#ifndef _SIGLIST_COMPAT_H -#define _SIGLIST_COMPAT_H - -#include -#include - -/* Define new compat symbols for sys_siglist, _sys_siglist, and sys_sigabbrev - for version VERSION with NUMBERSIG times the number of bytes per long int. - Both _sys_siglist and sys_siglist alias to __sys_siglist while - sys_sigabbrev alias to __sys_sigabbrev. Both target alias are - define in siglist.c. */ -#define DEFINE_COMPAT_SIGLIST(NUMBERSIG, VERSION) \ - declare_symbol_alias (__ ## VERSION ## _sys_siglist, \ - __sys_siglist, \ - object, NUMBERSIG * (ULONG_WIDTH / UCHAR_WIDTH)); \ - declare_symbol_alias (__ ## VERSION ## sys_siglist, \ - __sys_siglist, \ - object, NUMBERSIG * (ULONG_WIDTH / UCHAR_WIDTH)); \ - declare_symbol_alias (__ ## VERSION ## _sys_sigabbrev, \ - __sys_sigabbrev, \ - object, NUMBERSIG * (ULONG_WIDTH / UCHAR_WIDTH)); \ - compat_symbol (libc, __## VERSION ## _sys_siglist, _sys_siglist, \ - VERSION); \ - compat_symbol (libc, __## VERSION ## sys_siglist, sys_siglist, \ - VERSION); \ - compat_symbol (libc, __## VERSION ## _sys_sigabbrev, sys_sigabbrev, \ - VERSION); \ - -#endif diff --git a/sysdeps/mach/hurd/siglist-compat.c b/sysdeps/mach/hurd/siglist-compat.c deleted file mode 100644 index 5334b0885b..0000000000 --- a/sysdeps/mach/hurd/siglist-compat.c +++ /dev/null @@ -1,27 +0,0 @@ -/* Compatibility signal numbers and their names symbols. Hurd version. - Copyright (C) 1997-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 - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#include - -#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1) -DEFINE_COMPAT_SIGLIST (33, GLIBC_2_0) -#endif - -#if SHLIB_COMPAT (libc, GLIBC_2_1, GLIBC_2_32) -DEFINE_COMPAT_SIGLIST (NSIG, GLIBC_2_1) -#endif diff --git a/sysdeps/mach/hurd/siglist-compat.h b/sysdeps/mach/hurd/siglist-compat.h new file mode 100644 index 0000000000..17bb0401aa --- /dev/null +++ b/sysdeps/mach/hurd/siglist-compat.h @@ -0,0 +1,30 @@ +/* Compatibility signal numbers and their names symbols. Hurd version. + Copyright (C) 1997-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 + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +/* To get _NSIG definition. */ +#define _SIGNAL_H +#include + +#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1) +DEFINE_COMPAT_SIGLIST (33, GLIBC_2_0) +#endif + +#if SHLIB_COMPAT (libc, GLIBC_2_1, GLIBC_2_32) +DEFINE_COMPAT_SIGLIST (_NSIG, GLIBC_2_1) +#endif diff --git a/sysdeps/unix/sysv/linux/siglist-compat.c b/sysdeps/unix/sysv/linux/siglist-compat.c deleted file mode 100644 index cbc77289c0..0000000000 --- a/sysdeps/unix/sysv/linux/siglist-compat.c +++ /dev/null @@ -1,31 +0,0 @@ -/* Compatibility signal numbers and their names symbols. Linux version. - Copyright (C) 1997-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 - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#include - -#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1) -DEFINE_COMPAT_SIGLIST (32, GLIBC_2_0) -#endif - -#if SHLIB_COMPAT (libc, GLIBC_2_1, GLIBC_2_3_3) -DEFINE_COMPAT_SIGLIST (64, GLIBC_2_1) -#endif - -#if SHLIB_COMPAT (libc, GLIBC_2_3_3, GLIBC_2_32) -DEFINE_COMPAT_SIGLIST (NSIG, GLIBC_2_3_3) -#endif diff --git a/sysdeps/unix/sysv/linux/siglist-compat.h b/sysdeps/unix/sysv/linux/siglist-compat.h new file mode 100644 index 0000000000..2a9801276d --- /dev/null +++ b/sysdeps/unix/sysv/linux/siglist-compat.h @@ -0,0 +1,34 @@ +/* Compatibility signal numbers and their names symbols. Linux version. + Copyright (C) 1997-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 + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +/* To get _NSIG definition. */ +#define _SIGNAL_H +#include + +#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1) +DEFINE_COMPAT_SIGLIST (32, GLIBC_2_0) +#endif + +#if SHLIB_COMPAT (libc, GLIBC_2_1, GLIBC_2_3_3) +DEFINE_COMPAT_SIGLIST (64, GLIBC_2_1) +#endif + +#if SHLIB_COMPAT (libc, GLIBC_2_3_3, GLIBC_2_32) +DEFINE_COMPAT_SIGLIST (_NSIG, GLIBC_2_3_3) +#endif -- cgit 1.4.1