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 --- stdio-common/Makefile | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'stdio-common/Makefile') 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 -- cgit v1.2.3