From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by sourceware.org (Postfix) with ESMTPS id AB9D33857C46 for ; Thu, 16 Jul 2020 14:57:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org AB9D33857C46 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=palves.net Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=alves.ped@gmail.com Received: by mail-wr1-f68.google.com with SMTP id f18so7431406wrs.0 for ; Thu, 16 Jul 2020 07:57:04 -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:cc:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=lDgckqZG46cf3+P8B0hvnWmRxr5s5HWzj3wh0HwsBKQ=; b=MJW+Sf040bCDxifiHiteJN9qTGWQVYSFRkL3u9eFcttdSissNDcVqFJZEImWiw1+ga VH2EscJ4kzBNeGzZKdY7iLLl/5QHTllSU1b5QMQbXPSjZK0dGyZs0L8Fa+DDf9nGZs8G E5GOXU924CD/m3rHs502mno5pot4AIoIPfavrhHzY/9IPhi1uXDCad8aIqm1fcqZ8yrT 2QZdVEr78/oaCAOOlpyhYRfNg4fgb51Ozz4E13IGnVpV6KmVSARg8WDIZW5L0cem7FWL +38AuCE/q2BBsX9I7uDYadhZ66d91OmUCDscXG/NJcf3F8gWAkbCddAAQjQy+Ki6/M/r nwUw== X-Gm-Message-State: AOAM532BhyCEBvPsGzSpzDDjY4R/qO+D2ohK9zpzAKKFdcqbKETo1GKc 5rpOyv2sxhxp1/C57IUB8rh82wWwnvY= X-Google-Smtp-Source: ABdhPJwS25HR7uUhNbS9md3n16gXMLocDR2Cgl7L9GtoL5VUd2ZU5jHuvkCO9INuGS9OlYdojA40FQ== X-Received: by 2002:a5d:4984:: with SMTP id r4mr5341639wrq.215.1594911422750; Thu, 16 Jul 2020 07:57:02 -0700 (PDT) Received: from ?IPv6:2001:8a0:f91a:c400:56ee:75ff:fe8d:232b? ([2001:8a0:f91a:c400:56ee:75ff:fe8d:232b]) by smtp.gmail.com with ESMTPSA id w14sm9528331wrt.55.2020.07.16.07.57.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 16 Jul 2020 07:57:01 -0700 (PDT) Subject: Re: [PATCH] Update gnulib to current trunk To: Christian Biesinger References: <20200630184349.4009048-1-cbiesinger@google.com> <83h7upwxjl.fsf@gnu.org> <2d285f8f-57be-2d4f-ce7f-57afe65c6898@palves.net> Cc: Eli Zaretskii , gdb-patches From: Pedro Alves Message-ID: <791b00ea-60f3-3e3f-8d67-dd017b46ad57@palves.net> Date: Thu, 16 Jul 2020 15:56:58 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.2.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, 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: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jul 2020 14:57:06 -0000 On 7/6/20 7:19 PM, Christian Biesinger wrote: > Fair enough. This is the module diff: > > --- /tmp/old 2020-07-06 13:04:17.837482577 -0500 > +++ /tmp/new 2020-07-06 13:02:48.636984706 -0500 > @@ -1,9 +1,12 @@ > +Module list with included dependencies (indented): > absolute-header > alloca > alloca-opt > arpa_inet > assure > at-internal > + attribute > + btowc I wonder whether "btowc" potentially conflicts with the logic in gdb/gdb_wchar.h . We should keep an eye out for that. > builtin-expect > c99 > canonicalize-lgpl > @@ -13,12 +16,12 @@ > close > closedir > count-one-bits > + ctype > d-ino > d-type > dirent > dirfd > dirname-lgpl > - dosname > double-slash-root > dup > dup2 > @@ -52,8 +55,8 @@ > getdtablesize > getlogin_r > getprogname > + getrandom > gettext-h > - gettimeofday > glob > glob-h > hard-locale > @@ -62,6 +65,7 @@ > intprops > inttypes > inttypes-incomplete > + isblank > isnand-nolibm > isnanl-nolibm > largefile > @@ -69,7 +73,6 @@ > limits-h > localcharset > locale > - localtime-buffer > lock > lstat > malloc-posix > @@ -78,11 +81,13 @@ > mbrtowc > mbsinit > mbsrtowcs > + mbtowc > memchr > memmem > memmem-simple > mempcpy > memrchr > + minmax > mkdir > mkdtemp > mkostemp > @@ -132,13 +137,14 @@ > strerror-override > strerror_r-posix > string > + strnlen > strnlen1 > strstr > strstr-simple > strtok_r > + sys_random > sys_socket > sys_stat > - sys_time > sys_types > sys_uio > tempname > @@ -156,5 +162,7 @@ > windows-once > windows-recmutex > windows-rwlock > + wmemchr > + wmempcpy > xalloc-oversized > > It seems what is getting removed is: > - dosname (deprecated module and we don't use dosname.h) > - gettimeofday (it looks like we use this in remote-fileio.c) > - localtime-buffer (looks like basically an implementation detail) > - sys_time (looks like GDB specifically did *not* want this per > comments in gdbsupport/gdb_sys_time.h) > > So: > - For gettimeofday, the fixes in > https://www.gnu.org/software/gnulib/manual/html_node/gettimeofday.html#gettimeofday > don't look that important for gdb, but we could include the module. > Let me know if you want me to. I guess it doesn't hurt to explicitly include it. Might as well do it, since we use the function and have been using the module thus far. > > - For sys_time, we could perhaps replace the #undef in gdb_sys_time.h > with an #error. Let me know. I suspect this gnulib commit is what caused gettimeofday and sys_time to drop for us: commit 78f55d5374d6ff9b8460c48a42e924bf69775cd7 Author: Paul Eggert AuthorDate: Sun May 31 20:15:25 2020 -0700 tempname: merge from glibc and coreutils ... * modules/tempname (Depends-on): Remove gettimeofday, sys_time. Add getentropy, libc-config. As we can see from your diff: > sys_stat > - sys_time > sys_types > sys_uio > tempname tempname is a dependency of sys_stat. Another option would be to just get rid of gdb_sys_time.h, i.e., revert all or most of: commit 438e1e427e8393de73d22617abe4d8eba0270e72 Author: Pedro Alves AuthorDate: Mon Aug 24 18:50:55 2015 +0100 Prepare for gnulib update But I'd be fine with just leaving this alone for now, in case gnulib brings back the dependency. It's also the easiest thing to do (i.e., do nothing). Thanks, Pedro Alves