From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 37DE73856DCC; Fri, 29 Apr 2022 13:58:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 37DE73856DCC 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 errlist.c X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/clang X-Git-Oldrev: 1f02cbc23601aeac55a92fa978b55846a54efda3 X-Git-Newrev: 90295adb7b1d6d066402e5358c7f8bd64cc9f314 Message-Id: <20220429135841.37DE73856DCC@sourceware.org> Date: Fri, 29 Apr 2022 13:58:41 +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:41 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=90295adb7b1d6d066402e5358c7f8bd64cc9f314 commit 90295adb7b1d6d066402e5358c7f8bd64cc9f314 Author: Adhemerval Zanella Date: Wed Apr 6 12:09:42 2022 -0300 stdio: Remove the usage of $(fno-unit-at-a-time) for errlist.c Diff: --- include/stdio.h | 1 + stdio-common/Makefile | 15 ++++++++++- stdio-common/errlist-compat-data.h | 1 + stdio-common/errlist-compat.c | 1 - stdio-common/errlist-data-gen.c | 19 +++++++++++++ stdio-common/errlist-data.S | 7 +++++ stdio-common/errlist.c | 11 +------- .../{errlist-compat.c => errlist-compat-data.h} | 0 .../{errlist-compat.c => errlist-compat-data.h} | 0 sysdeps/unix/sysv/linux/errlist-compat.h | 31 +++++++++++++--------- .../{errlist-compat.c => errlist-compat-data.h} | 0 .../{errlist-compat.c => errlist-compat-data.h} | 0 .../{errlist-compat.c => errlist-compat-data.h} | 0 13 files changed, 62 insertions(+), 24 deletions(-) diff --git a/include/stdio.h b/include/stdio.h index 23b7fd288c..a6f7fd43cb 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -180,6 +180,7 @@ int __vfxprintf (FILE *__fp, const char *__fmt, __gnuc_va_list, attribute_hidden; extern const char *const _sys_errlist_internal[] attribute_hidden; +extern const size_t _sys_errlist_internal_len attribute_hidden; extern const char *__get_errlist (int) attribute_hidden; extern const char *__get_errname (int) attribute_hidden; diff --git a/stdio-common/Makefile b/stdio-common/Makefile index a1603e82fe..4a97380911 100644 --- a/stdio-common/Makefile +++ b/stdio-common/Makefile @@ -88,6 +88,7 @@ routines := \ aux := \ errlist \ + errlist-data \ errname \ fxprintf \ printf-parsemb \ @@ -211,6 +212,10 @@ tests := \ xbug \ # tests +generated += \ + errlist-data-aux.os \ + errlist-data-aux.o \ + # generated test-srcs = tst-unbputc tst-printf tst-printfsz-islongdouble @@ -246,6 +251,15 @@ tests-special += $(objpfx)tst-errno-manual.out include ../Rules +$(objpfx)errlist-data-aux.os: errlist-data-gen.c + $(compile-command.c) $(no-stack-protector) -S + +$(objpfx)errlist-data-aux.o: errlist-data-gen.c + $(compile-command.c) $(no-stack-protector) -S + +$(objpfx)errlist-data.os: $(objpfx)errlist-data-aux.os +$(objpfx)errlist-data.o: $(objpfx)errlist-data-aux.o + ifeq ($(run-built-tests),yes) LOCALES := \ de_DE.ISO-8859-1 \ @@ -334,7 +348,6 @@ CFLAGS-isoc99_vfscanf.c += -fexceptions CFLAGS-isoc99_vscanf.c += -fexceptions CFLAGS-isoc99_fscanf.c += -fexceptions CFLAGS-isoc99_scanf.c += -fexceptions -CFLAGS-errlist.c += $(fno-unit-at-a-time) CFLAGS-siglist.c += $(fno-unit-at-a-time) # scanf14a.c and scanf16a.c test a deprecated extension which is no diff --git a/stdio-common/errlist-compat-data.h b/stdio-common/errlist-compat-data.h new file mode 100644 index 0000000000..7c89c9a5a4 --- /dev/null +++ b/stdio-common/errlist-compat-data.h @@ -0,0 +1 @@ +/* Empty */ diff --git a/stdio-common/errlist-compat.c b/stdio-common/errlist-compat.c deleted file mode 100644 index 6e25b021ab..0000000000 --- a/stdio-common/errlist-compat.c +++ /dev/null @@ -1 +0,0 @@ -/* Empty. */ diff --git a/stdio-common/errlist-data-gen.c b/stdio-common/errlist-data-gen.c new file mode 100644 index 0000000000..0d24a220a5 --- /dev/null +++ b/stdio-common/errlist-data-gen.c @@ -0,0 +1,19 @@ +#include +#include +#include +#include + +#ifndef ERR_MAP +# define ERR_MAP(n) n +#endif + +const char *const _sys_errlist_internal[] = + { +#define _S(n, str) [ERR_MAP(n)] = str, +#include +#undef _S + }; +const size_t _sys_errlist_internal_len = array_length (_sys_errlist_internal); + +/* Include to get the definitions for sys_nerr/_sys_nerr. */ +#include diff --git a/stdio-common/errlist-data.S b/stdio-common/errlist-data.S new file mode 100644 index 0000000000..a9856c5080 --- /dev/null +++ b/stdio-common/errlist-data.S @@ -0,0 +1,7 @@ +#ifdef SHARED +# include "errlist-data-aux.os" +#else +# include "errlist-data-aux.o" +#endif + +#include diff --git a/stdio-common/errlist.c b/stdio-common/errlist.c index 1c09a31a7a..5a472c34c2 100644 --- a/stdio-common/errlist.c +++ b/stdio-common/errlist.c @@ -25,20 +25,11 @@ # define ERR_MAP(n) n #endif -const char *const _sys_errlist_internal[] = - { -#define _S(n, str) [ERR_MAP(n)] = str, -#include -#undef _S - }; - const char * __get_errlist (int errnum) { int mapped = ERR_MAP (errnum); - if (mapped >= 0 && mapped < array_length (_sys_errlist_internal)) + if (mapped >= 0 && mapped < _sys_errlist_internal_len) return _sys_errlist_internal[mapped]; return NULL; } - -#include diff --git a/sysdeps/unix/sysv/linux/alpha/errlist-compat.c b/sysdeps/unix/sysv/linux/alpha/errlist-compat-data.h similarity index 100% rename from sysdeps/unix/sysv/linux/alpha/errlist-compat.c rename to sysdeps/unix/sysv/linux/alpha/errlist-compat-data.h diff --git a/sysdeps/unix/sysv/linux/errlist-compat.c b/sysdeps/unix/sysv/linux/errlist-compat-data.h similarity index 100% rename from sysdeps/unix/sysv/linux/errlist-compat.c rename to sysdeps/unix/sysv/linux/errlist-compat-data.h diff --git a/sysdeps/unix/sysv/linux/errlist-compat.h b/sysdeps/unix/sysv/linux/errlist-compat.h index a09b38f243..13a0fa292a 100644 --- a/sysdeps/unix/sysv/linux/errlist-compat.h +++ b/sysdeps/unix/sysv/linux/errlist-compat.h @@ -20,6 +20,7 @@ #define _ERRLIST_COMPAT_H #include +#include /* Define new compat symbols for symbols _sys_errlist, sys_errlist, _sys_nerr, and sys_nerr for version VERSION with NUMBERERR times number of @@ -27,17 +28,23 @@ Both _sys_errlist and sys_errlist alias to _sys_errlist_internal symbol (defined on errlist.c) while _sys_nerr and sys_nerr created new variable with the expected size. */ -#define DEFINE_COMPAT_ERRLIST(NUMBERERR, VERSION) \ - const int __##VERSION##_sys_nerr = NUMBERERR; \ - strong_alias (__##VERSION##_sys_nerr, __##VERSION##__sys_nerr); \ - declare_symbol_alias (__ ## VERSION ## _sys_errlist, _sys_errlist_internal,\ - object, NUMBERERR * (ULONG_WIDTH / UCHAR_WIDTH)); \ - declare_symbol_alias (__ ## VERSION ## __sys_errlist, \ - _sys_errlist_internal, object, \ - NUMBERERR * (ULONG_WIDTH / UCHAR_WIDTH)); \ - compat_symbol (libc, __## VERSION ## _sys_nerr, sys_nerr, VERSION); \ - compat_symbol (libc, __## VERSION ## __sys_nerr, _sys_nerr, VERSION); \ - compat_symbol (libc, __## VERSION ## _sys_errlist, sys_errlist, VERSION); \ - compat_symbol (libc, __## VERSION ## __sys_errlist, _sys_errlist, VERSION);\ +#ifdef __ASSEMBLER__ +# define DEFINE_COMPAT_ERRLIST(NUMBERERR, VERSION) \ + declare_object_symbol_alias (__ ## VERSION ## _sys_errlist, \ + _sys_errlist_internal, \ + NUMBERERR * (ULONG_WIDTH / UCHAR_WIDTH)) \ + declare_object_symbol_alias (__ ## VERSION ## __sys_errlist, \ + _sys_errlist_internal, \ + NUMBERERR * (ULONG_WIDTH / UCHAR_WIDTH)) \ + compat_symbol (libc, __## VERSION ## _sys_errlist, sys_errlist, VERSION) \ + ASM_LINE_SEP \ + compat_symbol (libc, __## VERSION ## __sys_errlist, _sys_errlist, VERSION) +#else +# define DEFINE_COMPAT_ERRLIST(NUMBERERR, VERSION) \ + const int __##VERSION##_sys_nerr = NUMBERERR; \ + strong_alias (__##VERSION##_sys_nerr, __##VERSION##__sys_nerr); \ + compat_symbol (libc, __## VERSION ## _sys_nerr, sys_nerr, VERSION); \ + compat_symbol (libc, __## VERSION ## __sys_nerr, _sys_nerr, VERSION); +#endif #endif diff --git a/sysdeps/unix/sysv/linux/hppa/errlist-compat.c b/sysdeps/unix/sysv/linux/hppa/errlist-compat-data.h similarity index 100% rename from sysdeps/unix/sysv/linux/hppa/errlist-compat.c rename to sysdeps/unix/sysv/linux/hppa/errlist-compat-data.h diff --git a/sysdeps/unix/sysv/linux/mips/errlist-compat.c b/sysdeps/unix/sysv/linux/mips/errlist-compat-data.h similarity index 100% rename from sysdeps/unix/sysv/linux/mips/errlist-compat.c rename to sysdeps/unix/sysv/linux/mips/errlist-compat-data.h diff --git a/sysdeps/unix/sysv/linux/sparc/errlist-compat.c b/sysdeps/unix/sysv/linux/sparc/errlist-compat-data.h similarity index 100% rename from sysdeps/unix/sysv/linux/sparc/errlist-compat.c rename to sysdeps/unix/sysv/linux/sparc/errlist-compat-data.h