From patchwork Wed May 11 19:54:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 53822 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 90F333836427 for ; Wed, 11 May 2022 19:56:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 90F333836427 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1652299009; bh=mmUMEe6vnxsQwsXBDfMJjmqhjQPQJW/UVHIu38AJw5I=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=NGyfgBSNkG8bQPegPlRpPCLyGv6IoFCNLNqClOKsTQd3WOXVQKPDQkcDU+7fbcJF3 5pFCDuFT1jSdzkHurCqZr3pNVIcA0j400Ry3Sio3iyhZ8oQqrxp0vP98zW5LIssJu9 l1k3Ks9UoTkeYzG/+vH9/1p5MBuZUFuXfxGEE3Cs= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-ot1-x32c.google.com (mail-ot1-x32c.google.com [IPv6:2607:f8b0:4864:20::32c]) by sourceware.org (Postfix) with ESMTPS id 7BC2D3836403 for ; Wed, 11 May 2022 19:55:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7BC2D3836403 Received: by mail-ot1-x32c.google.com with SMTP id i25-20020a9d6259000000b00605df9afea7so1200953otk.1 for ; Wed, 11 May 2022 12:55:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mmUMEe6vnxsQwsXBDfMJjmqhjQPQJW/UVHIu38AJw5I=; b=V75YIzSq96XyldORa6894TiMvIZHtJxatuZcmTUXlLE89mwkC7dLdfpoVTRpJsKarp W8wr63a5rFhVqGZpkLxLb6EWEn19XfdWTVrBspOLKepGb47oPA0xNZhYp6IiowGochAD afYQwS85yQNMJw0lllxTRVPjYjBz+sdaPvsOZqvZAYElUGqSTxqWsA90A4X0XSc3NyeJ PLA/eQJ5eG/0ZMhmYTsa49bQhN36UrE7dR7Px52mGsb9YHZOQsa68KVi4clin6ojwZuX kAPF0ssgX4cNaKTxUAFj6x4A2olTSiH1v5aN4prp8RLyxb38Oeq3XYfk8cbFk/1OOCFl fz+Q== X-Gm-Message-State: AOAM531kUJGrPxRXzOkeOFRDT0fFytEfQFCUrnDblxwLrN3f94BXuo+X 7gaWlx5xFo0zWiquFIxQ6o7Ii+oTxLACnw== X-Google-Smtp-Source: ABdhPJwyUqlK7HGmZax/3PfnL6lX+ieMdXx8Y4UjxN2RUTHkQbgh50hmf6vveMaQOAQqz4RUt/ac1g== X-Received: by 2002:a9d:5d16:0:b0:5ce:127a:1c42 with SMTP id b22-20020a9d5d16000000b005ce127a1c42mr10095207oti.350.1652298907386; Wed, 11 May 2022 12:55:07 -0700 (PDT) Received: from birita.. ([2804:431:c7ca:5fbd:9d46:f0f6:e4b6:b83b]) by smtp.gmail.com with ESMTPSA id k22-20020a05687015d600b000edde90fac9sm886322oad.53.2022.05.11.12.55.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 May 2022 12:55:06 -0700 (PDT) To: libc-alpha@sourceware.org, Fangrui Song Subject: [PATCH 2/4] stdio: Remove the usage of $(fno-unit-at-a-time) for errlist.c Date: Wed, 11 May 2022 16:54:55 -0300 Message-Id: <20220511195457.410681-3-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220511195457.410681-1-adhemerval.zanella@linaro.org> References: <20220511195457.410681-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" The errlist.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 patch removes the compiler flags by split the compat symbol generation in two phases. First the _sys_errlist_internal internal 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 errlist-data.S which then creates the compat definitions. This prevents compiler to move any compat directive prior the _sys_errlist_internal definition itself. Checked on a make check run-built-tests=no on all affected ABIs. [1] https://sourceware.org/bugzilla/show_bug.cgi?id=29012 --- include/stdio.h | 1 + stdio-common/Makefile | 17 +++++++++- stdio-common/err_map.h | 24 +++++++++++++ stdio-common/errlist-compat-data.h | 1 + stdio-common/errlist-compat.c | 1 - stdio-common/errlist-data-gen.c | 34 +++++++++++++++++++ stdio-common/errlist-data.S | 7 ++++ stdio-common/errlist.c | 20 +++-------- sysdeps/mach/hurd/{errlist.c => err_map.h} | 9 +++-- ...errlist-compat.c => errlist-compat-data.h} | 0 ...errlist-compat.c => errlist-compat-data.h} | 0 sysdeps/unix/sysv/linux/errlist-compat.h | 33 +++++++++++------- ...errlist-compat.c => errlist-compat-data.h} | 0 ...errlist-compat.c => errlist-compat-data.h} | 0 ...errlist-compat.c => errlist-compat-data.h} | 0 15 files changed, 115 insertions(+), 32 deletions(-) create mode 100644 stdio-common/err_map.h create mode 100644 stdio-common/errlist-compat-data.h delete mode 100644 stdio-common/errlist-compat.c create mode 100644 stdio-common/errlist-data-gen.c create mode 100644 stdio-common/errlist-data.S rename sysdeps/mach/hurd/{errlist.c => err_map.h} (83%) rename sysdeps/unix/sysv/linux/alpha/{errlist-compat.c => errlist-compat-data.h} (100%) rename sysdeps/unix/sysv/linux/{errlist-compat.c => errlist-compat-data.h} (100%) rename sysdeps/unix/sysv/linux/hppa/{errlist-compat.c => errlist-compat-data.h} (100%) rename sysdeps/unix/sysv/linux/mips/{errlist-compat.c => errlist-compat-data.h} (100%) rename sysdeps/unix/sysv/linux/sparc/{errlist-compat.c => errlist-compat-data.h} (100%) 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..087acb82b6 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,17 @@ tests-special += $(objpfx)tst-errno-manual.out include ../Rules +$(objpfx)errlist-data-aux.os: errlist-data-gen.c + $(make-target-directory) + $(compile-command.c) $(no-stack-protector) -S + +$(objpfx)errlist-data-aux.o: errlist-data-gen.c + $(make-target-directory) + $(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 +350,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/err_map.h b/stdio-common/err_map.h new file mode 100644 index 0000000000..6cc3aa3375 --- /dev/null +++ b/stdio-common/err_map.h @@ -0,0 +1,24 @@ +/* Internal errno names mapping definition. + Copyright (C) 2022 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _ERR_MAP_H +#define _ERR_MAP_H + +#define ERR_MAP(n) (n) + +#endif 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..db4f50e6db --- /dev/null +++ b/stdio-common/errlist-data-gen.c @@ -0,0 +1,34 @@ +/* Internal errno names mapping definition. + Copyright (C) 2022 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include +#include +#include +#include + +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..4c0a0a218d 100644 --- a/stdio-common/errlist.c +++ b/stdio-common/errlist.c @@ -16,29 +16,17 @@ License along with the GNU C Library; if not, see . */ -#include +#include +#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 - }; +#include 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/mach/hurd/errlist.c b/sysdeps/mach/hurd/err_map.h similarity index 83% rename from sysdeps/mach/hurd/errlist.c rename to sysdeps/mach/hurd/err_map.h index 2d782ffc67..22d21ca9f1 100644 --- a/sysdeps/mach/hurd/errlist.c +++ b/sysdeps/mach/hurd/err_map.h @@ -1,4 +1,5 @@ -/* Copyright (C) 1998-2022 Free Software Foundation, Inc. +/* Internal errno names mapping definition. Hurd version. + Copyright (C) 2022 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -15,7 +16,11 @@ License along with the GNU C Library; if not, see . */ +#ifndef _ERR_MAP_H +#define _ERR_MAP_H + #include #define ERR_MAP(value) err_get_code (value) -#include + +#endif 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..33008863f8 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,25 @@ 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)) \ + ASM_LINE_SEP \ + declare_object_symbol_alias (__ ## VERSION ## __sys_errlist, \ + _sys_errlist_internal, \ + NUMBERERR * (ULONG_WIDTH / UCHAR_WIDTH)) \ + ASM_LINE_SEP \ + 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