From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qv1-xf29.google.com (mail-qv1-xf29.google.com [IPv6:2607:f8b0:4864:20::f29]) by sourceware.org (Postfix) with ESMTPS id BEAE43858004 for ; Mon, 31 May 2021 19:42:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org BEAE43858004 Received: by mail-qv1-xf29.google.com with SMTP id v18so5996066qvx.10 for ; Mon, 31 May 2021 12:42:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=4lNklChdmEXZWa4fx9LS/GOAvL1OU+fmaVpdSeczIDk=; b=Nr0c8BXk50eGMUz2sjU6F+nnHS2N3jVn5ayS/YUJsZ/aUqB6RQdnJMLgXnCJz/ppYP 0Wy7EFT5K0vn8aQm52Pn0ElYXGcrhx7PS+XoZcSkwfDy/XJJXcBtV9qBThjgsMFJ1Fyz oAYo3/BYyVanVR5wAqonN3Mb9Y6vlgCplXMMRHDmwSxLfCe8zD/0bPkl7lfH2OYApy4S wB93lbd4D8R1gg06DgvovsoeQuoKCOLf1RP5Xy3a9jUO4Y3g0t9XDSBV9XLtv/04tBDb 0BblqPKrWYip9eCTGk49iBRsM9whgUIn4O+uUYrmEXLGaet/4A/DYZuy/5D6VY0GfT5B +MtA== X-Gm-Message-State: AOAM531CRFfZkqxfJ8Hab0airXK4tLPojTKsnXlQMY3wb84xORBbFycv Ml5FaZtza28ALQM5cDozQOGw9/K976yjZA== X-Google-Smtp-Source: ABdhPJwSdya8ouq1d9DPBUI+v8sSRmSXpaSsd59Gwai7sCzcRv8ltH/ctv0BOYy3btG3EBhLqTQeCw== X-Received: by 2002:a05:6214:212f:: with SMTP id r15mr18690917qvc.11.1622490149725; Mon, 31 May 2021 12:42:29 -0700 (PDT) Received: from [192.168.1.4] ([177.194.59.218]) by smtp.gmail.com with ESMTPSA id w4sm9352153qki.57.2021.05.31.12.42.28 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 31 May 2021 12:42:29 -0700 (PDT) Subject: Re: [PATCH v2 01/16] stdio-common: Remove _IO_vfwscanf To: Florian Weimer , libc-alpha@sourceware.org References: <09aaf7bc489ed6504ed591f0453e21c49204e849.1622469908.git.fweimer@redhat.com> From: Adhemerval Zanella Message-ID: <4756e3ab-b364-7644-b93a-e3d361441425@linaro.org> Date: Mon, 31 May 2021 16:42:27 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <09aaf7bc489ed6504ed591f0453e21c49204e849.1622469908.git.fweimer@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, NICE_REPLY_A, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: Mon, 31 May 2021 19:42:32 -0000 On 31/05/2021 11:11, Florian Weimer via Libc-alpha wrote: > The symbol has never been exported, so no compatibility symbol is > needed. Removing this file prevents ld from creation an exported > symbol in case GLIBC_2_0 expands to a symbol version which > does not have a local: *; directive in the symbol version map file. LGTM, thanks. Reviewed-by: Adhemerval Zanella > --- > libio/libio.h | 2 -- > stdio-common/Makefile | 2 +- > stdio-common/iovfwscanf.c | 38 --------------------- > sysdeps/ieee754/ldbl-128ibm-compat/Makefile | 1 - > 4 files changed, 1 insertion(+), 42 deletions(-) > delete mode 100644 stdio-common/iovfwscanf.c > > diff --git a/libio/libio.h b/libio/libio.h > index 511b39457f..98d526dec7 100644 > --- a/libio/libio.h > +++ b/libio/libio.h > @@ -254,8 +254,6 @@ weak_extern (_IO_stdin_used); > __result = _IO_fwide (__fp, __result); \ > __result; }) > > -extern int _IO_vfwscanf (FILE * __restrict, const wchar_t * __restrict, > - __gnuc_va_list, int *__restrict); > extern __ssize_t _IO_wpadn (FILE *, wint_t, __ssize_t); > extern void _IO_free_wbackup_area (FILE *) __THROW; > Ok. > diff --git a/stdio-common/Makefile b/stdio-common/Makefile > index b2458ba4a6..f87796a8ce 100644 > --- a/stdio-common/Makefile > +++ b/stdio-common/Makefile > @@ -40,7 +40,7 @@ routines := \ > isoc99_scanf isoc99_vscanf isoc99_fscanf isoc99_vfscanf isoc99_sscanf \ > isoc99_vsscanf \ > psiginfo gentempfd \ > - vfscanf-internal vfwscanf-internal iovfscanf iovfwscanf \ > + vfscanf-internal vfwscanf-internal iovfscanf \ > vfprintf-internal vfwprintf-internal > > aux := errlist siglist printf-parsemb printf-parsewc fxprintf Ok. > diff --git a/stdio-common/iovfwscanf.c b/stdio-common/iovfwscanf.c > deleted file mode 100644 > index 56b6b3b0d5..0000000000 > --- a/stdio-common/iovfwscanf.c > +++ /dev/null > @@ -1,38 +0,0 @@ > -/* Implementation and symbols for _IO_vfwscanf. > - Copyright (C) 1991-2021 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 > - > -/* This function is provided for ports older than GLIBC 2.29 because > - external callers could theoretically exist. Newer ports do not need, > - since it is not part of the API. */ > -#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_29) > - > -int > -attribute_compat_text_section > -__IO_vfwscanf (FILE *fp, const wchar_t *format, va_list ap, int *errp) > -{ > - int rv = __vfwscanf_internal (fp, format, ap, 0); > - if (__glibc_unlikely (errp != 0)) > - *errp = (rv == -1); > - return rv; > -} > -compat_symbol (libc, __IO_vfwscanf, _IO_vfwscanf, GLIBC_2_0); > - > -#endif Ok. > diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile > index 7b42746c34..67d476383a 100644 > --- a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile > +++ b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile > @@ -325,7 +325,6 @@ ldbl-ibm128-files := $(objpfx)test-%-ibm128^ \ > $(objpfx)iovsscanf^ \ > $(objpfx)iovswscanf^ \ > $(objpfx)iovfscanf^ \ > - $(objpfx)iovfwscanf^ \ > $(objpfx)mpn2ldbl^ \ > $(objpfx)ldbl2mpn^ \ > $(objpfx)strtold_nan^ \ > Ok.