diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2022-04-07 17:15:56 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2022-05-13 10:54:41 -0300 |
| commit | 6fad891dfd5236002a2e64e26279c1d6dfa79565 (patch) | |
| tree | 6258506ca4e1fd0d9e88a2a0c551984d5e644acd /stdio-common | |
| parent | 900fa2573671d692ed245f76aa3f05cec462be0c (diff) | |
| download | glibc-6fad891dfd5236002a2e64e26279c1d6dfa79565.zip glibc-6fad891dfd5236002a2e64e26279c1d6dfa79565.tar.gz glibc-6fad891dfd5236002a2e64e26279c1d6dfa79565.tar.bz2 | |
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 <maskray@google.com>
Diffstat (limited to 'stdio-common')
| -rw-r--r-- | stdio-common/Makefile | 14 | ||||
| -rw-r--r-- | stdio-common/siglist-gen.c (renamed from stdio-common/siglist.c) | 4 | ||||
| -rw-r--r-- | stdio-common/siglist.S | 7 |
3 files changed, 20 insertions, 5 deletions
diff --git a/stdio-common/Makefile b/stdio-common/Makefile index 08bc998..cb85e94 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.c b/stdio-common/siglist-gen.c index bb88d53..95441b7 100644 --- a/stdio-common/siglist.c +++ b/stdio-common/siglist-gen.c @@ -26,7 +26,6 @@ const char *const __sys_siglist[NSIG] = #include <siglist.h> #undef init_sig }; -libc_hidden_def (__sys_siglist) const char *const __sys_sigabbrev[NSIG] = { @@ -34,6 +33,3 @@ const char *const __sys_sigabbrev[NSIG] = #include <siglist.h> #undef init_sig }; -libc_hidden_def (__sys_sigabbrev) - -#include <siglist-compat.c> diff --git a/stdio-common/siglist.S b/stdio-common/siglist.S new file mode 100644 index 0000000..f84cdac --- /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 <siglist-compat.h> |