From patchwork Thu Aug 17 06:14:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kewen.Lin" X-Patchwork-Id: 135848 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b82d:0:b0:3f2:4152:657d with SMTP id z13csp490126vqi; Wed, 16 Aug 2023 23:15:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHGnTat9EeHtALKSfyjgVul97rOpS7QBC5XfBU+wHMn3TuCsoqaO7DnYlLj/SXZWt+1NT4L X-Received: by 2002:a05:6402:1655:b0:523:1901:d19c with SMTP id s21-20020a056402165500b005231901d19cmr3669007edx.24.1692252951093; Wed, 16 Aug 2023 23:15:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692252951; cv=none; d=google.com; s=arc-20160816; b=lnX64+OHi/8MXsMZle//4DMQ9vFmAAFW+sQT9jCS5+d6GzJwCnTSFH+Q0C7BnfkLfL ioZJn/YQLgc0ntjrHAL53zdFibixtDONz5aW+47xMQqMzeF7J5vYWEpQUiMP0HsmpbEy LMs68ZgyAdF48RToemOqoXXeoCUYv979s4cXds/5taQwIiL43yrl4W96P6HmG6l1CgdP FYLJXC529CylXYcdO6tu/u8fioMIGzm8ko8ETuN/99MKU6M3R0n668HYyyEhB+Ifnj25 GWsL3FAevq+sh7+frkmk6pE6nN9rYI4gdIFcWanFOuR5N2mv18vfFj1ncs4mFUG0h1zd d4hA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:subject:cc:to:content-language:user-agent :mime-version:date:message-id:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=Agw3qGMhbt8M9cusJW475cEM56FPy8rmjtjRXuy2JGE=; fh=igBTPjHNdy5qHek4vewG2hwX+gxODq9WIce1cDBLf4Y=; b=1DIzSfYwwQCATxyxxG/g5ltqb+T7WeGsvThDHhvUwTdx9Ri5c15N/cp5XpHdxgmhvn 0riv4lOaZ0bWcEw5e7A15RqCEzl7NOPGFQV4ArJKLp4nEy60aDKfy5TRb8kJi11pKvSi 6ce/UDcf6jtl30MFW26GJx9AaS9d4/QYcjwi2r0dxfgtzKvB50tCp+CSWRAT1AY974ec pY2F1wn3cpB00sCqNw/DPiGO2Ez+qrneg+QfnKuwD5bsyQW7z5M3evzHX/aNtvf8zQnV tyw1CGFPG7GEbHQihcRLTxyHUuy03MOodZA/T4URjvD3tXopU6oH0wU1LkSYS/c4eCHr SR7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=Wq8NZ8G6; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id ca10-20020aa7cd6a000000b005234b299bf4si12797351edb.311.2023.08.16.23.15.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Aug 2023 23:15:51 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=Wq8NZ8G6; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7C010385C414 for ; Thu, 17 Aug 2023 06:15:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7C010385C414 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1692252949; bh=Agw3qGMhbt8M9cusJW475cEM56FPy8rmjtjRXuy2JGE=; h=Date:To:Cc:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=Wq8NZ8G6CbDW5HRqufTL0RXIvi0EQAVUohoIc1ylfTdtSVxQcw7KRuiPGJl9O3nq9 rGMmyPhsaH63De7GXy54v3qWkRRVsQPc7QfSXvL94b6QQK9G0/XQkCNaNC49nbWZdn 97BsN5yfP97qHPYYypnn4G6aNGcIfV0TDKHF7s78= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by sourceware.org (Postfix) with ESMTPS id 511143858D28 for ; Thu, 17 Aug 2023 06:15:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 511143858D28 Received: from pps.filterd (m0353724.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 37H6E9H9020891; Thu, 17 Aug 2023 06:15:02 GMT Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3she3mr0av-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 17 Aug 2023 06:15:02 +0000 Received: from m0353724.ppops.net (m0353724.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 37H6ENaI021583; Thu, 17 Aug 2023 06:15:02 GMT Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3she3mr0aj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 17 Aug 2023 06:15:02 +0000 Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 37H5qJdp001082; Thu, 17 Aug 2023 06:15:01 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3semsym138-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 17 Aug 2023 06:15:01 +0000 Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 37H6ExM022479416 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 17 Aug 2023 06:14:59 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6A71E20049; Thu, 17 Aug 2023 06:14:59 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1969C20040; Thu, 17 Aug 2023 06:14:58 +0000 (GMT) Received: from [9.197.250.153] (unknown [9.197.250.153]) by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 17 Aug 2023 06:14:57 +0000 (GMT) Message-ID: <1683e0df-6d4f-6da9-1330-1cc1fb0144e0@linux.ibm.com> Date: Thu, 17 Aug 2023 14:14:56 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 Content-Language: en-US To: GCC Patches Cc: Richard Biener , Richard Sandiford Subject: [PATCH] Makefile.in: Make TM_P_H depend on $(TREE_H) [PR111021] X-TM-AS-GCONF: 00 X-Proofpoint-GUID: m2DX0J08Kf-0c8u8VmMgPybgR4T5CA3P X-Proofpoint-ORIG-GUID: 2PIu9o6--UfpSOmEnGm1nWePD397Z8hT X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.601,FMLib:17.11.176.26 definitions=2023-08-17_03,2023-08-15_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=874 priorityscore=1501 adultscore=0 clxscore=1015 mlxscore=0 suspectscore=0 lowpriorityscore=0 phishscore=0 spamscore=0 malwarescore=0 impostorscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2308170052 X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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-Patchwork-Original-From: "Kewen.Lin via Gcc-patches" From: "Kewen.Lin" Reply-To: "Kewen.Lin" Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1774455829921951603 X-GMAIL-MSGID: 1774455829921951603 Hi, As PR111021 shows, the below ${port}-protos.h include tree.h for code_helper and tree_code: arm/arm-protos.h:#include "tree.h" cris/cris-protos.h:#include "tree.h" (H-P removed this in r14-3218) microblaze/microblaze-protos.h:#include "tree.h" rl78/rl78-protos.h:#include "tree.h" stormy16/stormy16-protos.h:#include "tree.h" , when compiling build/gencondmd.cc, the include hierarchy makes it depend on tm_p.h -> ${port}-protos.h -> tree.h, which further includes (depends on) some files that are generated during the building, such as: all-tree.def, tree-check.h and so on. The previous commit r14-3215 should already force build/gencondmd.cc to depend on ${TREE_H}, so the reported build failure should be gone. But for a long term maintenance, especially one day some build/xxx.cc requires tm_p.h but not recog.h, the ${TREE_H} dependence could be missed and a build failure will show up. So this patch is to make TM_P_H depend on $(TREE_H), any new build/xxx.cc depending on tm_p.h will be able to consider ${TREE_H}. It's tested with cross-builds for the affected ports with steps: 1) dropped the fix r14-3215; 2) reproduced the build failure with serial build; 3) applied this patch, serially built and verified all passed; 4) added back r14-3215, serially built and verified all passed; Also bootstrapped and regtested on x86_64-redhat-linux and powerpc64{,le}-linux-gnu. Is it ok for trunk? BR, Kewen ----- PR bootstrap/111021 gcc/ChangeLog: * Makefile.in (TM_P_H): Add $(TREE_H) as dependence. --- gcc/Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.39.1 diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 9dddb65b45d..b85c967951b 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -893,7 +893,8 @@ OPTIONS_C_EXTRA = $(PRETTY_PRINT_H) BCONFIG_H = bconfig.h $(build_xm_file_list) CONFIG_H = config.h $(host_xm_file_list) TCONFIG_H = tconfig.h $(xm_file_list) -TM_P_H = tm_p.h $(tm_p_file_list) +# Some $(target)-protos.h depends on tree.h +TM_P_H = tm_p.h $(tm_p_file_list) $(TREE_H) TM_D_H = tm_d.h $(tm_d_file_list) GTM_H = tm.h $(tm_file_list) insn-constants.h TM_H = $(GTM_H) insn-flags.h $(OPTIONS_H)