From patchwork Fri Apr 15 12:38:44 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: 52979 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 08040385624A for ; Fri, 15 Apr 2022 12:39:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 08040385624A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1650026353; bh=4sTh0PrPqbcS8Su2/NbKb0DBD6AdbON7pD4N/MyZLws=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=i7mpJIM1Lnr/yYrC5Csj0I9z+mkk8xWS9leNxG+53/PL48L7m/bDytS60MWlHlb2u dnIsrwDt3LOIr1MZSOioQafme+xDYxNTzE1ORBPoKY7lRJbTIXbSFAUNMs9/lY4N44 vJCUVi6sR54gBUkrq44sAjfNw3vPI/VNFxYfK66o= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oa1-x35.google.com (mail-oa1-x35.google.com [IPv6:2001:4860:4864:20::35]) by sourceware.org (Postfix) with ESMTPS id 4AA7C3857378 for ; Fri, 15 Apr 2022 12:38:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4AA7C3857378 Received: by mail-oa1-x35.google.com with SMTP id 586e51a60fabf-d6ca46da48so7968784fac.12 for ; Fri, 15 Apr 2022 05:38:51 -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:mime-version :content-transfer-encoding; bh=4sTh0PrPqbcS8Su2/NbKb0DBD6AdbON7pD4N/MyZLws=; b=pbra4MYlgGOzzOlnM/11/29i2r4NkH57B1HpJU2s1M2mDYoGhj7xdJbAqUMC4ZzDw5 ajZtK+BaZPlCm8cw/nC1W1Q8yB8QZqy7fynwJUXRMopraQlQ28qHDmQuPqdkRARmVyzZ 33Va8jM8hkN3xcdYrrR59HdTpf9hDrN6Ouelj/Puab6bMCiLOIMdfgsPWLXJ42in7A8C YPifhCC0sWxBvnfoqzTUJbxV79Lim7HbrB0TsbuldjYSl/FUFfjOutC4xDMIKlySfq0I xL0M+PSbwHFFt4vVZJjWN0UfLkEQ8E22HsBGgUwOkN2CpSgsp2TUakT91QEDCkiCENKv aaCA== X-Gm-Message-State: AOAM533aEhFluDGf8RUmcWgRG1Aiovw6YyZWghU1SMFmOjfTj9KO8dlI ueZ3wok/Dq1nlvf53F8zddw2qaxotQ/Jgg== X-Google-Smtp-Source: ABdhPJwToi5NWjwDZq6FDXiVefTqP/fPSDsjZ2yMEImJYr8qx9Yhk3ETfvdFts5/sAWRqIKdFfDiyw== X-Received: by 2002:a05:6870:1607:b0:de:984:496d with SMTP id b7-20020a056870160700b000de0984496dmr1295448oae.253.1650026330044; Fri, 15 Apr 2022 05:38:50 -0700 (PDT) Received: from birita.. ([2804:431:c7ca:431f:b5dd:a121:9ce0:993e]) by smtp.gmail.com with ESMTPSA id c20-20020a4a2854000000b00329d3f076aasm1106945oof.24.2022.04.15.05.38.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Apr 2022 05:38:49 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [COMMITTED] stdio: Split __get_errname definition from errlist.c Date: Fri, 15 Apr 2022 09:38:44 -0300 Message-Id: <20220415123844.3901212-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-Spam-Status: No, score=-12.9 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 loader does not need to pull all __get_errlist definitions and its size is decreased: Before: $ size elf/ld.so text data bss dec hex filename 197774 11024 456 209254 33166 elf/ld.so After: $ size elf/ld.so text data bss dec hex filename 191510 9936 456 201902 314ae elf/ld.so Checked on x86_64-linux-gnu. --- stdio-common/Makefile | 1 + stdio-common/errlist.c | 38 ++--------------------- stdio-common/errname.c | 61 +++++++++++++++++++++++++++++++++++++ sysdeps/mach/hurd/errname.c | 21 +++++++++++++ 4 files changed, 85 insertions(+), 36 deletions(-) create mode 100644 stdio-common/errname.c create mode 100644 sysdeps/mach/hurd/errname.c diff --git a/stdio-common/Makefile b/stdio-common/Makefile index 435cd8904f..a1603e82fe 100644 --- a/stdio-common/Makefile +++ b/stdio-common/Makefile @@ -88,6 +88,7 @@ routines := \ aux := \ errlist \ + errname \ fxprintf \ printf-parsemb \ printf-parsewc \ diff --git a/stdio-common/errlist.c b/stdio-common/errlist.c index 310b858e31..1c09a31a7a 100644 --- a/stdio-common/errlist.c +++ b/stdio-common/errlist.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1991-2022 Free Software Foundation, Inc. +/* Internal errno names mapping definition. + Copyright (C) 1991-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 @@ -40,39 +41,4 @@ __get_errlist (int errnum) return NULL; } -static const union sys_errname_t -{ - struct - { -#define MSGSTRFIELD1(line) str##line -#define MSGSTRFIELD(line) MSGSTRFIELD1(line) -#define _S(n, str) char MSGSTRFIELD(__LINE__)[sizeof(#n)]; -#include -#undef _S - }; - char str[0]; -} _sys_errname = { { -#define _S(n, s) #n, -#include -#undef _S -} }; - -static const unsigned short _sys_errnameidx[] = -{ -#define _S(n, s) \ - [ERR_MAP(n)] = offsetof(union sys_errname_t, MSGSTRFIELD(__LINE__)), -#include -#undef _S -}; - -const char * -__get_errname (int errnum) -{ - int mapped = ERR_MAP (errnum); - if (mapped < 0 || mapped >= array_length (_sys_errnameidx) - || (mapped > 0 && _sys_errnameidx[mapped] == 0)) - return NULL; - return _sys_errname.str + _sys_errnameidx[mapped]; -} - #include diff --git a/stdio-common/errname.c b/stdio-common/errname.c new file mode 100644 index 0000000000..08e4cecbd1 --- /dev/null +++ b/stdio-common/errname.c @@ -0,0 +1,61 @@ +/* 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 + +#ifndef ERR_MAP +# define ERR_MAP(n) n +#endif + +static const union sys_errname_t +{ + struct + { +#define MSGSTRFIELD1(line) str##line +#define MSGSTRFIELD(line) MSGSTRFIELD1(line) +#define _S(n, str) char MSGSTRFIELD(__LINE__)[sizeof(#n)]; +#include +#undef _S + }; + char str[0]; +} _sys_errname = { { +#define _S(n, s) #n, +#include +#undef _S +} }; + +static const unsigned short _sys_errnameidx[] = +{ +#define _S(n, s) \ + [ERR_MAP(n)] = offsetof(union sys_errname_t, MSGSTRFIELD(__LINE__)), +#include +#undef _S +}; + +const char * +__get_errname (int errnum) +{ + int mapped = ERR_MAP (errnum); + if (mapped < 0 || mapped >= array_length (_sys_errnameidx) + || (mapped > 0 && _sys_errnameidx[mapped] == 0)) + return NULL; + return _sys_errname.str + _sys_errnameidx[mapped]; +} diff --git a/sysdeps/mach/hurd/errname.c b/sysdeps/mach/hurd/errname.c new file mode 100644 index 0000000000..09ddb49478 --- /dev/null +++ b/sysdeps/mach/hurd/errname.c @@ -0,0 +1,21 @@ +/* Copyright (C) 1998-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 + +#define ERR_MAP(value) err_get_code (value) +#include