From patchwork Tue Jan 24 09:55:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinath Parvathaneni X-Patchwork-Id: 47623 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2060208wrn; Tue, 24 Jan 2023 01:56:18 -0800 (PST) X-Google-Smtp-Source: AMrXdXuhrb256+3tpTHR56LRvDx6xgsHNnrWrkwz5ChM8dHGBkEd5rUIuqQlVCYNb5Y60a1QqIbU X-Received: by 2002:aa7:cd86:0:b0:499:27e8:94a3 with SMTP id x6-20020aa7cd86000000b0049927e894a3mr30174388edv.13.1674554177795; Tue, 24 Jan 2023 01:56:17 -0800 (PST) Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id w25-20020aa7d299000000b004855f09023csi2694069edq.231.2023.01.24.01.56.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Jan 2023 01:56:17 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="xJu9Z3O/"; arc=fail (signature failed); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 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 A95F3385840D for ; Tue, 24 Jan 2023 09:56:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A95F3385840D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1674554176; bh=5iMVZLgTBeHxGROo2oo2I3CEnVXlKb0/e+iUoq24Xks=; h=To:CC:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=xJu9Z3O/waVTaB4W7zV3iFM4lDel3JvwK7pVrNTOs/4F0+rd0mk17RR1AO3P8I9pB NSz4eyKn2/paIbr3UTsWxD3E2n3Wwc72ClRcEcZiTpsL82lpZFHU9cmJGdHHj8fFSw 0fAxRuTiKygl9Uqs3Ck4RGEAbaYlfrNb6Y5ANU08= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2084.outbound.protection.outlook.com [40.107.249.84]) by sourceware.org (Postfix) with ESMTPS id 4880A3858D28 for ; Tue, 24 Jan 2023 09:55:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4880A3858D28 Received: from DU2PR04CA0207.eurprd04.prod.outlook.com (2603:10a6:10:28d::32) by AS8PR08MB6485.eurprd08.prod.outlook.com (2603:10a6:20b:318::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33; Tue, 24 Jan 2023 09:55:16 +0000 Received: from DBAEUR03FT064.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:28d:cafe::84) by DU2PR04CA0207.outlook.office365.com (2603:10a6:10:28d::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33 via Frontend Transport; Tue, 24 Jan 2023 09:55:16 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; pr=C Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DBAEUR03FT064.mail.protection.outlook.com (100.127.143.3) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6023.16 via Frontend Transport; Tue, 24 Jan 2023 09:55:16 +0000 Received: ("Tessian outbound 0d7b2ab0f13d:v132"); Tue, 24 Jan 2023 09:55:16 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: bbab48b091988a0d X-CR-MTA-TID: 64aa7808 Received: from 8d5bb1356436.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 9D5F5F4A-48A1-4395-A157-0C9AA763873F.1; Tue, 24 Jan 2023 09:55:09 +0000 Received: from EUR03-AM7-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 8d5bb1356436.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 24 Jan 2023 09:55:09 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LguCBfZ0hLcP96lJPpeqDjb7r4hQ4xI8XyGBwAFW8ZLmeNVjF30txFy+uoQ23xaec1IcBGzpDkK3Vumw0JeLw07ELZo/PFFHc7DcxWbvYArQCoQ5smV2ZOUwbLwguVeGYB5zPypRAKuHz1wHstpIQxy5xECckdR9MHyrvk9uTSAPrfGVVrw847hmLsTTy2C51jH8wThgDwUlZFjFaqlyBli9kYwhRVAVYiLnop2Efs8lDmL0T2xqfXnwGEiXhJv3lACrUqr7qptSKX1smwJhcM55aqsBMdLUF7GCOx9+gdmh75RquobRMpNhuZHPt24y3MPFmdhYCUWMhckVQlK1RA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=5iMVZLgTBeHxGROo2oo2I3CEnVXlKb0/e+iUoq24Xks=; b=T0/ihRjGVKQpIcjv9s1p/z+PvUqQYfQaJwXVlb3j0gmZnCwFlHqVpA0T5fdXdMW+rTrdC6AMr5mW6kkbwblQ8FOoRJ0mFXMAGJYqkABhhkIHjMKKf02eHikf+OFqT4uTCRnCbjzKFZ5/oI6/yBHIyOt7M9Q6mn86bQ9FUhDd8EWzkHMWvgUO0vPTAd9Mdoampp+A3D124CWCjZV0ztSfbaw+V9uPJzcsxCrWubjsu+6QZWqtG+tZ/LW3dMvLWdbJZlSxznhJ1PPDC9DQm1FWYTnNrhpnwVNVl2z0TTKBH31PmUA/KKRHnACwtr0/GigTWyrVtMDCbPVHIg1PDtGIkQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=gcc.gnu.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none Received: from DU2PR04CA0301.eurprd04.prod.outlook.com (2603:10a6:10:2b5::6) by VI1PR08MB10102.eurprd08.prod.outlook.com (2603:10a6:800:1cf::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33; Tue, 24 Jan 2023 09:55:02 +0000 Received: from DBAEUR03FT050.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:2b5:cafe::59) by DU2PR04CA0301.outlook.office365.com (2603:10a6:10:2b5::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33 via Frontend Transport; Tue, 24 Jan 2023 09:55:02 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; pr=C Received: from nebula.arm.com (40.67.248.234) by DBAEUR03FT050.mail.protection.outlook.com (100.127.142.250) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6023.16 via Frontend Transport; Tue, 24 Jan 2023 09:55:02 +0000 Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Tue, 24 Jan 2023 09:55:00 +0000 Received: from e120703.arm.com (10.2.81.20) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16 via Frontend Transport; Tue, 24 Jan 2023 09:55:00 +0000 MIME-Version: 1.0 To: CC: , , Subject: [PATCH][GCC] arm: Fix inclusion of arm-mlib.h header more than once (pr108505). Date: Tue, 24 Jan 2023 09:55:00 +0000 Message-ID: <0848d46d-cf28-4b97-bdb8-fda36ee53fea@AZ-NEU-EX04.Arm.com> X-EOPAttributedMessage: 1 X-MS-TrafficTypeDiagnostic: DBAEUR03FT050:EE_|VI1PR08MB10102:EE_|DBAEUR03FT064:EE_|AS8PR08MB6485:EE_ X-MS-Office365-Filtering-Correlation-Id: ca2d4702-0fea-4e1e-c533-08dafdf11832 x-checkrecipientrouted: true NoDisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: G7mFC9n5HwU27D+Cji1+Ufynr7yfg7/kTw0WKAlH/BHPLM4En5Sw1y//keHUJDpK8wnGK1uNjEXQKNpIdRAdyUj9zT8Wkrw9/NoT8mHxvs7eFkeAX7X0yAVLDTr+W4tCyCnd/59HO+cNZhBHYckrnzsDYXW/TLfm2WfaebZ7cQYJ0SlDnRDHgaSJiWX+k3gx+AHrxvTFgKHNBq0p+s3fJ/+UinYt/R7ejlzYDDnnwwEf1VX9tbLhHbslbPVDaOGmGoM/vqLED/3Lll59eOo8+yY4k9EwBdxCKCfQrRgc70ocfD2M8JY2yKwqtm5DCY2rkFmIOoLgVdE3SKLidFE5JDiRqWWX52B2c08RJI4mszE1bU88YD4AaL2OZLdw5FSKj8n2YCtabHDi3SGE7Og09karjBwnEfU5KrACPxT4PUXJH5M00qfGu+o4AKx1j8fiumBh8hfHS1GLZRMteZdywd+Nvn3Y/4SFHTDVMfAd9fClR/mAySsVYnwYyMhrHOpFM0LLW6RgU1adhoj9sSM9PFFFsTQtsAQIQDikMUDCZ9zz51KVQLU7wXLWpi7wOOC0APinYYO5fSmALr+5Kv+RQ5tPn3Eb6FGbPy2yvWMolFNa9L1FjO15UNVZwmtgOEK0QT1I42AkZLdTNXPMPSSrtDrYz6xNJi8JsQCnE/huKV3/eWY+Mv1zg5C1elJaEttUVSOVaTDJGJrTMvvptdxTBRoKyzVP1QsQ6nnbLjpJu+hcAENuMBlBCm7gbWrkuM9R X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:nebula.arm.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230022)(4636009)(39860400002)(346002)(376002)(396003)(136003)(451199015)(40470700004)(46966006)(36840700001)(31686004)(70206006)(6916009)(8676002)(4326008)(70586007)(426003)(47076005)(44832011)(235185007)(8936002)(5660300002)(26005)(186003)(41300700001)(33964004)(2906002)(36860700001)(86362001)(82740400003)(81166007)(31696002)(82310400005)(316002)(54906003)(336012)(478600001)(40460700003)(356005)(40480700001)(36900700001); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB10102 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DBAEUR03FT064.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 435bccf3-36a3-465d-4605-08dafdf10fe2 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bSkUJYThcH/r4zmJcArtVzBQ0koiQNPKwfPbAnSL0Fqy7cqhgrgJc4TquG58/cmDAkJwG8+47yu9JPBhhvicDCGRnPlMgSykEf6CFll8SYGxEYGpbOeO8duzyOP3m8jbwDOiWv8lIai8mk8qnJunU3n/ZuoCB2pNq4OzgedCsR30rjl5zj9gPdQPRMQMWpOJMeOi3TMLl1VDbHnRa9pKDQf7Pc3Khp3pjJZUPrLFWjvDjZ64iz6iJomLun6ZHLJ3mWUzAHoSIF+QTbO2+uMCrv+PN9TfZci5TuflBAUUVH2CCC40IdKLRZaLbwdcWZ6QYsdOuF/HFGPTlR7qVPAqolpZOBBiMhHBR/QUekfYFOBGizkBG2HlpbsUubGXqmxKmZGGm+cRplgElWoRh9whOmVPYfvKxGzdtI4SKJqyc2nbR+om4e2XzLdIep1z+8i1fmA2iQrLj2qDV/te7YodWKlis8SMIyZJVKPxvvv0ogua7thkIIraTLOnHWoa/dUmUWKtpALXTvU2/pgcO1xCUryCOMXJeBUJRkxHialOVaEXHB45tEaS3qhfrDUU+XHFmg45Bcw7pefYLgap9g1ThFG/KEhUNIEV/ydE2VStTRN+mSEF4ttXWpdNbe2Zdle170lRgGHnQuuOuIt9n7gI2J/4A25IpJAzx5wC65yaUvS2A8mdTqpNaH0buJDa8+2GnnxjDBgqWS/EFa2DcO1D0w== X-Forefront-Antispam-Report: CIP:63.35.35.123; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:64aa7808-outbound-1.mta.getcheckrecipient.com; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; CAT:NONE; SFS:(13230022)(4636009)(346002)(396003)(39860400002)(376002)(136003)(451199015)(40470700004)(36840700001)(46966006)(41300700001)(235185007)(8936002)(5660300002)(316002)(6916009)(70586007)(81166007)(70206006)(4326008)(186003)(44832011)(2906002)(82740400003)(8676002)(26005)(33964004)(478600001)(86362001)(336012)(31696002)(36860700001)(40480700001)(426003)(54906003)(47076005)(31686004)(40460700003)(82310400005); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 09:55:16.1272 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ca2d4702-0fea-4e1e-c533-08dafdf11832 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: DBAEUR03FT064.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6485 X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FORGED_SPF_HELO, GIT_PATCH_0, KAM_DMARC_NONE, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_NONE, TXREP, UNPARSEABLE_RELAY 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: Srinath Parvathaneni via Gcc-patches From: Srinath Parvathaneni Reply-To: Srinath Parvathaneni Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755897321751091182?= X-GMAIL-MSGID: =?utf-8?q?1755897321751091182?= Hello, The patch fixes the build issue for arm-none-eabi target configured with --with-multilib-list=aprofile,rmprofile, in which case the header file arm/arm-mlib.h is being included more than once and the toolchain build is failing (PR108505). Regression tested on arm-none-eabi target and found no regressions. Ok for master? Regards, Srinath. gcc/ChangeLog: 2023-01-24 Srinath Parvathaneni PR target/108505 * config.gcc (tm_file): Move the variable out of loop. ############### Attachment also inlined for ease of reply ############### diff --git a/gcc/config.gcc b/gcc/config.gcc index 771bd35e803b47e79c0a62eab8f4845e9bbf96ef..d828223c16d3076da0ab6582dfaf59ad657ea438 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -4350,7 +4350,6 @@ case "${target}" in case ${arm_multilib} in aprofile|rmprofile) tmake_profile_file="arm/t-multilib" - tm_file="$tm_file arm/arm-mlib.h" ;; @*) ml=`echo "X$arm_multilib" | sed '1s,^X@,,'` @@ -4389,6 +4388,7 @@ case "${target}" in # through to the multilib selector with_float="soft" tmake_file="${tmake_file} ${tmake_profile_file}" + tm_file="$tm_file arm/arm-mlib.h" TM_MULTILIB_CONFIG="$with_multilib_list" fi fi diff --git a/gcc/config.gcc b/gcc/config.gcc index 771bd35e803b47e79c0a62eab8f4845e9bbf96ef..d828223c16d3076da0ab6582dfaf59ad657ea438 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -4350,7 +4350,6 @@ case "${target}" in case ${arm_multilib} in aprofile|rmprofile) tmake_profile_file="arm/t-multilib" - tm_file="$tm_file arm/arm-mlib.h" ;; @*) ml=`echo "X$arm_multilib" | sed '1s,^X@,,'` @@ -4389,6 +4388,7 @@ case "${target}" in # through to the multilib selector with_float="soft" tmake_file="${tmake_file} ${tmake_profile_file}" + tm_file="$tm_file arm/arm-mlib.h" TM_MULTILIB_CONFIG="$with_multilib_list" fi fi