From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qk1-x741.google.com (mail-qk1-x741.google.com [IPv6:2607:f8b0:4864:20::741]) by sourceware.org (Postfix) with ESMTPS id 8517E3857C71 for ; Mon, 14 Dec 2020 13:39:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 8517E3857C71 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=acm.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=nathanmsidwell@gmail.com Received: by mail-qk1-x741.google.com with SMTP id u5so2522798qkf.0 for ; Mon, 14 Dec 2020 05:39:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=9Ga4x0IQ4tMVopIwVdOr4cu44K2I1iF18jokWvOXam8=; b=c8YUfAcIuu4BhVGaIbSz2k+H5LAO551d20AMPzVnzPYkAMA9ImQoZI41iYN6qd6EFJ uzPqhhx0imuFHcKcbBwcPRRLF7xmP3C4IEO7354KOxoDp/IZAdnO6EG//Rb2L46ylWQX voDH6P1uRc9jU+pXZoeVVWjpdP/E0mE/YjGdFXFSw7kP52Az0JyjW1S0WYw3nrkXPePI wUJi+wAtOOQLxSj0RwP+NdRdtYYxpAw59LxvqPzq1+oos38eJW/vUfMF4+ur4zvsVTgK 64qWAebqMRlQPcphSheAz8bgv13/koLEnzl60hT5WbK+sDlr/tmxocvR6t5pn8u9ISxp Wc1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:cc:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=9Ga4x0IQ4tMVopIwVdOr4cu44K2I1iF18jokWvOXam8=; b=sXpaC2ZhBL1ravNd4FnxIqLdPWL48lmZdp3zKO6P4UQPrFAYlFLymOxW2sarjnUBix JiNR4hUWD6d6nfqoHhe0rvS7ldylPXSAWn5ogOpZ+LjXDth6XEAQlN8TO8Txa6uWl07E 4y8Qzezio/tfxvZUVM2bEXoRt6Ql+vy4eEmQULp+N3nKTy/f3GMirYL9dwXzUpNsfHH3 iNHZZySpTHXJ3UIyQbwpXnnN1ixoksP9rIF91St9kQWdSnfYkGFsnM1cwFuxA1LUCpU1 A/eKcLTI9fRKuvOdzzrIZgj5yLo6YncC277SezrEjqVTgU3Tf+vORconLLtiH4RhHTyw NpMQ== X-Gm-Message-State: AOAM5337tn5JIRwZCdfwLCScZYHyy8UkmaeCqNbsTOHYF7UQvBczxBpg 7dSN4usPPBwkL8HqXRXtI9g= X-Google-Smtp-Source: ABdhPJxAusirfEzcqWbPQn/w8Ac92FYqmJ9doDdRxRS6kr9JB3HYt897PBejbWG/HbUVeFS+q0TA4g== X-Received: by 2002:a37:9fc6:: with SMTP id i189mr10307932qke.41.1607953188846; Mon, 14 Dec 2020 05:39:48 -0800 (PST) Received: from ?IPv6:2620:10d:c0a8:1102:dd49:df09:c3cb:75b0? ([2620:10d:c091:480::1:1493]) by smtp.googlemail.com with ESMTPSA id o9sm14079809qte.35.2020.12.14.05.39.47 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 14 Dec 2020 05:39:47 -0800 (PST) Sender: Nathan Sidwell Subject: Re: [PATCH v2] aix: Fixinclude updates [PR98208] To: Ilya Leoshkevich , gcc-patches@gcc.gnu.org References: <836afc8a-ef00-b93e-50ce-b3342e000720@acm.org> <20201214121919.800917-1-iii@linux.ibm.com> From: Nathan Sidwell Message-ID: <1aaeb298-5aab-305a-fa39-e10936c00315@acm.org> Date: Mon, 14 Dec 2020 08:39:46 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: <20201214121919.800917-1-iii@linux.ibm.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-10.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, 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: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Dec 2020 13:39:50 -0000 On 12/14/20 7:19 AM, Ilya Leoshkevich wrote: > On Fri, 2020-12-11 at 07:51 -0500, Nathan Sidwell wrote: >> >> I'm pretty sure this is wrong. I think the test_text in >> inclhack.def >> should be a pre-fixed string that the testsuite presumably checks is >> converted. > > You're right; I've added your change from the Bugzilla and updated the > expectation. Does the following look better? Yes thanks. I don;t really understand why the base/sys/types.h change is needed, (surely there are other types.h fixincs?) But if this makes the tests pass, so be it! nathan > > After 92648faa1cb2 ("aix: Fixinclude") make check-fixincludes began to > fail (at least on gcc121 machine). Fix by updating fixincludes/tests > and rerunning genfixes. > > Co-developed-by: Nathan Sidwell > > fixincludes/ChangeLog: > > 2020-12-11 Ilya Leoshkevich > > * fixincl.x: Rerun genfixes. > * inclhack.def(aix_physadr_t): Change test_text to something > that needs to be replaced. > * tests/base/sys/types.h(aix_physadr_t): Add expectation. > --- > fixincludes/fixincl.x | 4 ++-- > fixincludes/inclhack.def | 2 +- > fixincludes/tests/base/sys/types.h | 5 +++++ > 3 files changed, 8 insertions(+), 3 deletions(-) > > diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x > index 21439652bce..cc17edfba0b 100644 > --- a/fixincludes/fixincl.x > +++ b/fixincludes/fixincl.x > @@ -2,11 +2,11 @@ > * > * DO NOT EDIT THIS FILE (fixincl.x) > * > - * It has been AutoGen-ed October 21, 2020 at 10:43:22 AM by AutoGen 5.18.16 > + * It has been AutoGen-ed December 9, 2020 at 11:16:08 AM by AutoGen 5.18.16 > * From the definitions inclhack.def > * and the template file fixincl > */ > -/* DO NOT SVN-MERGE THIS FILE, EITHER Wed Oct 21 10:43:22 EDT 2020 > +/* DO NOT SVN-MERGE THIS FILE, EITHER Wed Dec 9 11:16:08 EST 2020 > * > * You must regenerate it. Use the ./genfixes script. > * > diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def > index 80c9adfb07c..3a4cfe06542 100644 > --- a/fixincludes/inclhack.def > +++ b/fixincludes/inclhack.def > @@ -731,7 +731,7 @@ fix = { > select = "typedef[ \t]*struct[ \t]*([{][^}]*[}][ \t]*\\*[ \t]*physadr_t;)"; > c_fix = format; > c_fix_arg = "typedef struct __physadr_s %1"; > - test_text = "typedef struct __physadr_s {"; > + test_text = "typedef struct { random stuff } * physadr_t;"; > }; > > /* > diff --git a/fixincludes/tests/base/sys/types.h b/fixincludes/tests/base/sys/types.h > index 683b5e93ecd..7340e76b175 100644 > --- a/fixincludes/tests/base/sys/types.h > +++ b/fixincludes/tests/base/sys/types.h > @@ -9,6 +9,11 @@ > > > > +#if defined( AIX_PHYSADR_T_CHECK ) > +typedef struct __physadr_s { random stuff } * physadr_t; > +#endif /* AIX_PHYSADR_T_CHECK */ > + > + > #if defined( GNU_TYPES_CHECK ) > #if !defined(_GCC_PTRDIFF_T) > #define _GCC_PTRDIFF_T > -- Nathan Sidwell