From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23435 invoked by alias); 28 Jun 2013 08:42:20 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 23367 invoked by uid 89); 28 Jun 2013 08:42:19 -0000 X-Spam-SWARE-Status: No, score=-4.6 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL autolearn=ham version=3.3.1 Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Fri, 28 Jun 2013 08:42:18 +0000 Received: from svr-orw-fem-01.mgc.mentorg.com ([147.34.98.93]) by relay1.mentorg.com with esmtp id 1UsUG0-0007RI-GP from Yao_Qi@mentor.com ; Fri, 28 Jun 2013 01:42:16 -0700 Received: from SVR-ORW-FEM-05.mgc.mentorg.com ([147.34.97.43]) by svr-orw-fem-01.mgc.mentorg.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Fri, 28 Jun 2013 01:42:16 -0700 Received: from qiyao.dyndns.org (147.34.91.1) by svr-orw-fem-05.mgc.mentorg.com (147.34.97.43) with Microsoft SMTP Server id 14.2.247.3; Fri, 28 Jun 2013 01:42:15 -0700 Message-ID: <51CD4C4A.9030605@codesourcery.com> Date: Fri, 28 Jun 2013 08:49:00 -0000 From: Yao Qi User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130110 Thunderbird/17.0.2 MIME-Version: 1.0 To: Pedro Alves CC: Subject: Re: [PATCH 1/9] Reimport gnulib from scratch. References: <20130627185200.6625.10526.stgit@brno.lan> <20130627185207.6625.27448.stgit@brno.lan> In-Reply-To: <20130627185207.6625.27448.stgit@brno.lan> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit X-SW-Source: 2013-06/txt/msg00868.txt.bz2 On 06/28/2013 02:52 AM, Pedro Alves wrote: > I tried moving aside gnulib/import/, and re-running the our > gnulib/update-gnulib.sh script, and surprisingly, I get a different > result compared to what's in the tree. This is with pristine FSF > autoconf and FSF automake, at the versions required by > update-gnulib.sh. However, if I just run the update-gnulib.sh scripts > against the_existing_ tree, then nothing changes... I suspect > gnulib-tool's merge logic might be preserving some things by design. > I think we should put this in regardless, as a "get rid of cruft that > might have accumulated over gnulib updates". onceonly.m4 seems to fit > in that category. Pedro, I tried to run update-gnulib.sh to import module unistd, and the result looks right to me. Don't know why we need to reimport gnulib here. Here are my steps, 1. cd to and check out commit. 8d5bd1402003bd0153984b138735adf537d960b0, which is required by update-gnulib.sh 2. Modify update-gnulib.sh to add unistd into IMPORTED_GNULIB_MODULES, 3. Run 'bash update-gnulib.sh '. Here is the diff of aclocal.m4, for the reference sake. $ git diff aclocal.m4 diff --git a/gdb/gnulib/aclocal.m4 b/gdb/gnulib/aclocal.m4 index fb99505..d983131 100644 --- a/gdb/gnulib/aclocal.m4 +++ b/gdb/gnulib/aclocal.m4 @@ -1048,11 +1048,15 @@ m4_include([import/m4/memchr.m4]) m4_include([import/m4/memmem.m4]) m4_include([import/m4/mmap-anon.m4]) m4_include([import/m4/multiarch.m4]) +m4_include([import/m4/off_t.m4]) m4_include([import/m4/onceonly.m4]) +m4_include([import/m4/ssize_t.m4]) m4_include([import/m4/stdbool.m4]) m4_include([import/m4/stddef_h.m4]) m4_include([import/m4/stdint.m4]) m4_include([import/m4/string_h.m4]) +m4_include([import/m4/sys_types_h.m4]) +m4_include([import/m4/unistd_h.m4]) m4_include([import/m4/warn-on-use.m4]) m4_include([import/m4/wchar_h.m4]) m4_include([import/m4/wchar_t.m4]) -- Yao (齐尧)