From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by sourceware.org (Postfix) with ESMTPS id 83C3E3857405 for ; Thu, 12 May 2022 17:06:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 83C3E3857405 Received: by mail-pj1-x1030.google.com with SMTP id j10-20020a17090a94ca00b001dd2131159aso8447606pjw.0 for ; Thu, 12 May 2022 10:06:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=pfHiONFBmGS9Ra8dRQMvCuMCh8bGBGhQ8KrzpPLnrIo=; b=8FSC9KKLNOZzbUbCnyaRu/OOQpVBd5ENVvRhpb1r43YYCdVqfi2qYw+3IbSco/30n5 kIY8AtDhxhYRWLbu1UvHqD5Fwnep2Ae1wbUiOTNI4XGGvIzhdXUysjJvmG4HfX/qeJJ4 F+MdBTYX44I01iPsc6RxGZjHJ5+Yj9U0EkEF1Be8Bcq66nJQOqGhIUFSlRdWt+kTyKxe 3/F4MAsOrnJNLI3XiDJapJlMERHQPdAjEC2UcTVRfz7+d28PsVc9K81X/HpuYK76JNhm O29u5ny9ouezA6R8D2uUW7LsGE37q/Iy5OAOFO2j2mlsArWYFGaXdjepyAwXPoxPf6qp 7/7Q== X-Gm-Message-State: AOAM5328+xHDOyDyBY9owIKXL4JpoNWfPcAgKLKLJTlCXKxDI7vpk4LM ueJRNW3o4D0z0675T4gsBa1thgtzN64lLg== X-Google-Smtp-Source: ABdhPJzJOJFRFv7uxApZ9cXnCupRJLkIYuiPywUQhKJ0hU6EhS4tflEIwTYI23Q0JwSLSc0ydAaFHw== X-Received: by 2002:a17:902:db12:b0:15e:acc0:ea84 with SMTP id m18-20020a170902db1200b0015eacc0ea84mr815905plx.127.1652375198211; Thu, 12 May 2022 10:06:38 -0700 (PDT) Received: from google.com ([2620:15c:2ce:200:e892:f9c7:57f5:14db]) by smtp.gmail.com with ESMTPSA id z8-20020a170902ccc800b0015ee24acf38sm125449ple.212.2022.05.12.10.06.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 May 2022 10:06:37 -0700 (PDT) Date: Thu, 12 May 2022 10:06:34 -0700 From: Fangrui Song To: Adhemerval Zanella Cc: libc-alpha@sourceware.org Subject: Re: [PATCH v2 3/4] stdio: Remove the usage of $(fno-unit-at-a-time) for siglist.c Message-ID: <20220512170634.t6wxco2heqxaw3bc@google.com> References: <20220512125931.523712-1-adhemerval.zanella@linaro.org> <20220512125931.523712-4-adhemerval.zanella@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <20220512125931.523712-4-adhemerval.zanella@linaro.org> X-Spam-Status: No, score=-27.2 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, ENV_AND_HDR_SPF_MATCH, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE, USER_IN_DEF_DKIM_WL, USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 May 2022 17:06:42 -0000 On 2022-05-12, Adhemerval Zanella wrote: >The siglist.c is build with -fno-toplevel-reorder to avoid compiler >to reorder the compat assembly directives due a static linker >issue [1] (fixed on 2.39). This description needs similar changes like the patch for errlist.c. Reviewed-by: Fangrui Song >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_internal definition itself. Typo. _sys_siglist? >Checked on a make check run-built-tests=no on all affected ABIs. >--- > include/signal.h | 6 ++--- > stdio-common/Makefile | 14 +++++++++- > stdio-common/{siglist.c => siglist-gen.c} | 4 --- > stdio-common/siglist.S | 7 +++++ > ...{siglist-compat.h => siglist-compat-def.h} | 27 ++++++++++--------- > sysdeps/generic/siglist-compat.c | 1 - > .../{siglist-compat.c => siglist-compat.h} | 7 +++-- > .../{siglist-compat.c => siglist-compat.h} | 7 +++-- > 8 files changed, 47 insertions(+), 26 deletions(-) > rename stdio-common/{siglist.c => siglist-gen.c} (92%) > create mode 100644 stdio-common/siglist.S > rename sysdeps/generic/{siglist-compat.h => siglist-compat-def.h} (69%) > delete mode 100644 sysdeps/generic/siglist-compat.c > rename sysdeps/mach/hurd/{siglist-compat.c => siglist-compat.h} (86%) > rename sysdeps/unix/sysv/linux/{siglist-compat.c => siglist-compat.h} (87%) > >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.c b/stdio-common/siglist-gen.c >similarity index 92% >rename from stdio-common/siglist.c >rename to stdio-common/siglist-gen.c >index bb88d5300f..95441b707d 100644 >--- a/stdio-common/siglist.c >+++ b/stdio-common/siglist-gen.c >@@ -26,7 +26,6 @@ const char *const __sys_siglist[NSIG] = > #include > #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 > #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..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/sysdeps/generic/siglist-compat.h b/sysdeps/generic/siglist-compat-def.h >similarity index 69% >rename from sysdeps/generic/siglist-compat.h >rename to sysdeps/generic/siglist-compat-def.h >index 05a0d63855..f5a1840dc3 100644 >--- a/sysdeps/generic/siglist-compat.h >+++ b/sysdeps/generic/siglist-compat-def.h >@@ -28,20 +28,23 @@ > 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); \ >+ VERSION) ASM_LINE_SEP \ > compat_symbol (libc, __## VERSION ## sys_siglist, sys_siglist, \ >- VERSION); \ >+ VERSION) ASM_LINE_SEP \ > compat_symbol (libc, __## VERSION ## _sys_sigabbrev, sys_sigabbrev, \ >- VERSION); \ >+ 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/mach/hurd/siglist-compat.c b/sysdeps/mach/hurd/siglist-compat.h >similarity index 86% >rename from sysdeps/mach/hurd/siglist-compat.c >rename to sysdeps/mach/hurd/siglist-compat.h >index 5334b0885b..17bb0401aa 100644 >--- a/sysdeps/mach/hurd/siglist-compat.c >+++ b/sysdeps/mach/hurd/siglist-compat.h >@@ -16,12 +16,15 @@ > 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 (33, GLIBC_2_0) > #endif > > #if SHLIB_COMPAT (libc, GLIBC_2_1, GLIBC_2_32) >-DEFINE_COMPAT_SIGLIST (NSIG, GLIBC_2_1) >+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.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 >-- >2.34.1 >