From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 48AA93856DCE; Fri, 29 Apr 2022 13:58:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 48AA93856DCE Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/azanella/clang] stdio: Remove the usage of $(fno-unit-at-a-time) for siglist.c X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/clang X-Git-Oldrev: 90295adb7b1d6d066402e5358c7f8bd64cc9f314 X-Git-Newrev: 2b274a9047f443b955291b3f1d0e9d401881b899 Message-Id: <20220429135846.48AA93856DCE@sourceware.org> Date: Fri, 29 Apr 2022 13:58:46 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Apr 2022 13:58:46 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=2b274a9047f443b955291b3f1d0e9d401881b899 commit 2b274a9047f443b955291b3f1d0e9d401881b899 Author: Adhemerval Zanella Date: Thu Apr 7 17:15:56 2022 -0300 stdio: Remove the usage of $(fno-unit-at-a-time) for siglist.c Diff: --- stdio-common/Makefile | 12 +++++++++++- stdio-common/{siglist.c => siglist-gen.c} | 2 -- stdio-common/siglist.S | 7 +++++++ .../{siglist-compat.h => siglist-compat-def.h} | 21 ++++++++++++--------- sysdeps/generic/siglist-compat.c | 1 - .../hurd/{siglist-compat.c => siglist-compat.h} | 2 +- .../linux/{siglist-compat.c => siglist-compat.h} | 7 +++++-- 7 files changed, 36 insertions(+), 16 deletions(-) diff --git a/stdio-common/Makefile b/stdio-common/Makefile index 4a97380911..e663cd5927 100644 --- a/stdio-common/Makefile +++ b/stdio-common/Makefile @@ -215,6 +215,8 @@ tests := \ generated += \ errlist-data-aux.os \ errlist-data-aux.o \ + siglist-aux.os \ + siglist-aux.o \ # generated test-srcs = tst-unbputc tst-printf tst-printfsz-islongdouble @@ -260,6 +262,15 @@ $(objpfx)errlist-data-aux.o: errlist-data-gen.c $(objpfx)errlist-data.os: $(objpfx)errlist-data-aux.os $(objpfx)errlist-data.o: $(objpfx)errlist-data-aux.o +$(objpfx)siglist-aux.os: siglist-gen.c + $(compile-command.c) $(no-stack-protector) -S + +$(objpfx)siglist-aux.o: siglist-gen.c + $(compile-command.c) $(no-stack-protector) -S + +$(objpfx)siglist.os: $(objpfx)siglist-aux.os +$(objpfx)siglist.o: $(objpfx)siglist-aux.o + ifeq ($(run-built-tests),yes) LOCALES := \ de_DE.ISO-8859-1 \ @@ -348,7 +359,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 similarity index 97% rename from stdio-common/siglist.c rename to stdio-common/siglist-gen.c index bb88d5300f..a3dccac3db 100644 --- a/stdio-common/siglist.c +++ b/stdio-common/siglist-gen.c @@ -35,5 +35,3 @@ const char *const __sys_sigabbrev[NSIG] = #undef init_sig }; libc_hidden_def (__sys_sigabbrev) - -#include diff --git a/stdio-common/siglist.S b/stdio-common/siglist.S new file mode 100644 index 0000000000..327f105e6f --- /dev/null +++ b/stdio-common/siglist.S @@ -0,0 +1,7 @@ +#ifdef SHARED +# include "siglist-aux.os" +#else +# include "siglist-aux.o" +#endif + +#include diff --git a/sysdeps/generic/siglist-compat.h b/sysdeps/generic/siglist-compat-def.h similarity index 73% rename from sysdeps/generic/siglist-compat.h rename to sysdeps/generic/siglist-compat-def.h index 05a0d63855..1f84a3d166 100644 --- a/sysdeps/generic/siglist-compat.h +++ b/sysdeps/generic/siglist-compat-def.h @@ -28,15 +28,18 @@ 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)); \ + 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); \ compat_symbol (libc, __## VERSION ## sys_siglist, sys_siglist, \ 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/mach/hurd/siglist-compat.c b/sysdeps/mach/hurd/siglist-compat.h similarity index 97% rename from sysdeps/mach/hurd/siglist-compat.c rename to sysdeps/mach/hurd/siglist-compat.h index 5334b0885b..d4f0182f10 100644 --- a/sysdeps/mach/hurd/siglist-compat.c +++ b/sysdeps/mach/hurd/siglist-compat.h @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see . */ -#include +#include #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1) DEFINE_COMPAT_SIGLIST (33, GLIBC_2_0) diff --git a/sysdeps/unix/sysv/linux/siglist-compat.c b/sysdeps/unix/sysv/linux/siglist-compat.h similarity index 87% rename from sysdeps/unix/sysv/linux/siglist-compat.c rename to sysdeps/unix/sysv/linux/siglist-compat.h index cbc77289c0..2a9801276d 100644 --- a/sysdeps/unix/sysv/linux/siglist-compat.c +++ b/sysdeps/unix/sysv/linux/siglist-compat.h @@ -16,7 +16,10 @@ License along with the GNU C Library; if not, see . */ -#include +#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) @@ -27,5 +30,5 @@ 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) +DEFINE_COMPAT_SIGLIST (_NSIG, GLIBC_2_3_3) #endif