From patchwork Mon May 8 12:58:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 13234505 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 16FB4C77B7F for ; Mon, 8 May 2023 12:58:32 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.531542.827294 (Exim 4.92) (envelope-from ) id 1pw0RR-000230-VU; Mon, 08 May 2023 12:58:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 531542.827294; Mon, 08 May 2023 12:58:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pw0RR-00022t-Sx; Mon, 08 May 2023 12:58:13 +0000 Received: by outflank-mailman (input) for mailman id 531542; Mon, 08 May 2023 12:58:12 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pw0RQ-00022e-Oi for xen-devel@lists.xenproject.org; Mon, 08 May 2023 12:58:12 +0000 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on060f.outbound.protection.outlook.com [2a01:111:f400:fe0c::60f]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id fbe7fe27-ed9f-11ed-8611-37d641c3527e; Mon, 08 May 2023 14:58:10 +0200 (CEST) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by AS8PR04MB8674.eurprd04.prod.outlook.com (2603:10a6:20b:429::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6363.32; Mon, 8 May 2023 12:58:08 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::8e41:82b6:a27f:2e0c]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::8e41:82b6:a27f:2e0c%4]) with mapi id 15.20.6363.031; Mon, 8 May 2023 12:58:08 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: fbe7fe27-ed9f-11ed-8611-37d641c3527e ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AgoIzciQBZD2QD6lfkwZoZWIIe0fFDaUwyz7kDDe1GAeAyNXTGRk4sVONe/kzjP7WkLwmDY4Sguao5ZCNtUEAtiJr4xKoRjIilpGB1h1hy6B/0lqQthp72gdSyflS0MBykDFH12TGXrzN1yZHtkg3MRnW55d6aY5AWWJEcX7cZh8mSUtsu4xN4CieXr+lG9ZmYnE7qnmHwHcTTvpjxGUFEuqTjVIzbbbKeISs+oJHxu4qSDVPWZRoKxdTjjbVquxRIOXV042sU09RCynsrhtfokXQHHYYvQk293CFZWLsiYEBXWcLCbDuqm2v0xC/G4rimKmcpVrSj9kOzC2WFpAHQ== 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=fglwV5hSyATtXnFfIAt/M+iOmywYI9rQMwaKbY12iBs=; b=li2L7Mrs3Zt3e0BJZw4puX2LA9M2pt9gpW0CgKMhKsAfF7h6mknONhKorQlhew/w3f3ZnKtbzbax5rJ7wZnWF6NeLzjbECb2F3rQqP2ecifU5RfwgOTULvUPptaEa6XRAsh/fN+M6/sWWT0zb84224kCkGHY2ayrGzAApQbRZH4eFFnKw5GLN+EYqsiLhmGBtgG0rhhDJ+dSUUVollBqb6hYse8BtG/iPH4jwNTjilY7LMd1sMUvLTTAjwg1yeWO3VtZ+Lt+RheVeo280TYp6jTmVmmhmwOqBM/fdVq3wgTe6eozLLQ7C1CbHPu43G6Ix56Tf7rxK3CQ58+bhieCjA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fglwV5hSyATtXnFfIAt/M+iOmywYI9rQMwaKbY12iBs=; b=EqZCbrQu5RlTIcHiurZkKOwHqWTgRb07ab3GPerxUnbSDOb+OvtVWUuh960C8mYQasEfYSvC0+zdVMPGGHLFqzL/DBoM6pNwkmDbqnXbq+fb9pNPBR7kXF6XEFLNAIac86ZwnnOaxCZbptMPR6JTQ9lWNxy3ngV8sLWQUfyto4vl80OdLm5W78COojIlCdr0bLElPda3tGgpB3/QT4Oz2heKDbRkYxBCAi3oGNvzGPnErXxoZjNaQO9EV84O9Z0Cbwfne1tNKO+mm0wCgwEcRLSNYQRQpDgl8vvcGpjF9rbOuNADUQ7r4XUkrMd1PjJ2Q7AYl7OEGcxMqY8XvWdSTw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: Date: Mon, 8 May 2023 14:58:07 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.10.1 Subject: [PATCH v2 1/2] build: shorten macro references Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Julien Grall , Stefano Stabellini , Volodymyr Babchuk , Bertrand Marquis , Bobby Eshleman , Alistair Francis , Connor Davis References: In-Reply-To: X-ClientProxiedBy: FR0P281CA0004.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:15::9) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB6560:EE_|AS8PR04MB8674:EE_ X-MS-Office365-Filtering-Correlation-Id: 86563cf3-bae1-4a0b-5659-08db4fc3df4d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pLKH/3zYOnjIB3eINaldLzjZfjqiwG91OAFqByml+dq3liBo73mCuo7gxHtI3SmqIsH6Fl2kgJjpVVv6enO26MBY4YarPiG4NV4lcwWJsKdtG3BPbSJUUruTnVC3Tb8J3ZP3FsY1b72iywh90gB6sCqWRb7yv/QbcXw+vxzJCd/jp5pTTmlphtI2oVfRKXqSIpssJjfVFYXmOjux4iez0P907IiT9QauOK/EcKSVLM3VC47LwtOmjiawj4Q7VjULjl8u2A7AcP1TDVmmPu7KzyQoiGDfZjTGElsgzkN1rBjMan/lebzxTDmhtew7x1URCLSz7389KCsOgXJ8btRT25ODT2+t+6rHeK3YLmH56b0rVx4GBDx1PYzm8Xi1vRUcoMGguSF/n0obzUyrzoonoZUFk7Yi4AeFGA1vSZqRPjqbTpnYls9GeOHgISXFM027oJYVRtcLn8uGX2yw3kJec5CjdIT5tPNSPraxEy9XcwvlESCbWrv/qSoG7aVaiLgKB/1451KW1TM72frM4XdcmrZSu7Tm1U2XmaHo6ziHgnawPOCuZIOqYMZq6Z3+ae7AUElqVupcLt9SU8zD2JzKAyjM//MhMKiCwaMB9USjOMJHA5FkYilOizrNxtms1s0gZI2Iu+doYT6UTAs08uKEDQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6560.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(136003)(376002)(346002)(396003)(366004)(39860400002)(451199021)(31686004)(54906003)(2906002)(8936002)(8676002)(316002)(478600001)(6916009)(4326008)(66476007)(5660300002)(66556008)(41300700001)(7416002)(66946007)(6486002)(6512007)(26005)(6506007)(186003)(36756003)(2616005)(38100700002)(86362001)(31696002)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?oQ8GLg/9xYjjkeGviXULRt+VGf7r?= =?utf-8?q?67Ogt819yFbj3dHqVwlXYcC1S0+WOPy+AdtUX7TTqUqvUfmZyDwhaU3X899yqzk65?= =?utf-8?q?eRbHn7lvZkxqYf/vq3jQx8l2BvnZCCvJaku4P9coEJCIG8atMovrhlpTdaiLe1yQk?= =?utf-8?q?1B07N5orPawWBxIXxXoUlSsDaLnicSZlSrYwaUmUHTlFzEloPo0g/wyTESOuyG9xR?= =?utf-8?q?bsax8Jue5NIOAYBJLyAlD/bcnL1erdRv1fnvzwvMzyF/IhEuJ9aJasOe2754NJj/O?= =?utf-8?q?+7HJHoNXK3PAG9W6As+f159bd54bcINz5aIubbH3qVC8zyCL1DpzF6dEzsn06Se5D?= =?utf-8?q?uN/3rCA8eOPJeSrhurZgMq7Pg75KtXbkIqlAXZy6cughJM0k59ruK8UJmx+EvYZai?= =?utf-8?q?Zf9OK+ehbZyiKcGPJbmtHKJeoSySka8r32OIcX0Ihv789qZZOjE/Mrlvf2LBVfYwg?= =?utf-8?q?M+c1Wf/062QP4fmVCLjRd7yhv4FVU/CWMuNvMQPeSUaqlCGj5NxbftdhN/lgPkwY9?= =?utf-8?q?WqjO/sHdri++qBIKpjFSFwuq5Vo2RKKThmWg8MhszsLQcRpiA2M9mYL95ZphHfaIz?= =?utf-8?q?PCzm3QVbl5aP/bT+PqiVEsvH/ovIygHcnl9pfuRvWAhzSMG6DPIlVT7mXFCZPtZl6?= =?utf-8?q?JLrNPouzvMRbH1BJ95ebVJk5dV4fmMTUQUjjgPj5YPZ7nff3OUOfX0TqHPEMX0SU6?= =?utf-8?q?Xyx8FaUPEi5b5Y03qzwdb8m8Y6ZJPu7x22woGIctnw3v4OVrjafsQK6cDl0UQh2Mz?= =?utf-8?q?TMHcy6V6Q69GLokXSqveAfNcaFhpPvU1O/yzrlojZFs5AIhDAyS/HsIvv6TYykb4y?= =?utf-8?q?MH70dhIIB2Y150SSiTSfNRmNzdhFOFdsjAvYYVA4+t5QcL4t9Zyld3CWw0YABb1Ma?= =?utf-8?q?YrgfBiFUALgClKuuIF2VqZqDyspPcbc26Qh1bMP/nF6N7bfscIntCiLhbWlyVm+In?= =?utf-8?q?kv0Pcw5BSEgMQxfundEzzrvbvlGW4E96hoaFIABmFMCzBTqgUhB64WjCkkql2Y3i6?= =?utf-8?q?4wbxR3ZBmnCgxyfs0+XrqcrTUdDjpIuj5q7GUKZ9D5Wi29vA41TRx2X+hBOcvS01k?= =?utf-8?q?59bfg9bxzV1BdhCLuB7xY86aiqI1RR7yf/6oiJ99V3EQJvM1finvoyG77WFugW47j?= =?utf-8?q?pUBJxyM9jzLfHF9ZecMAltBYRgj8bmryrRt1fZCjz5xTyjALCe5tzbJ0rCCfoPzi7?= =?utf-8?q?OtTXXu6o9EWMsUHzt0IfHzLq7XQ9ST+Iw2muOJVHu5oVLYvd5h0LZcTg+oWCo2kor?= =?utf-8?q?/tz3Ptimiov/o3wnXbgESmNQMAfEoEsAQR0Y6bF5TjCNCJxeIazugyqMEuIrHBCro?= =?utf-8?q?S5T32+p4Gx8hWAuRip1MWgR5p1BPjWtZ95H8lXlM1KWSZnvIucRk9P4mbPgFgiG9Q?= =?utf-8?q?EN+x83o28sUiPE3Im1/0jYEN7X4dKK8p+3op6H8QKoV6cz40kgvDxNxXvWloNGX96?= =?utf-8?q?mFehcR1LiY0SE+x7vwkkj7nHGhRakkESkwcq89dSML1rzrhHr4mKgl4+ccmfAI3ku?= =?utf-8?q?KRlfmGmEttP0?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 86563cf3-bae1-4a0b-5659-08db4fc3df4d X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 May 2023 12:58:08.7816 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: IhxlAmTa2/E1NFyj36HhP3C8r8ha9giQVFN8vzFiQnVubcU5cHl9NCVKrtBElBYaE+RGoR9iyBiReCZXRaZGAw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8674 Presumably by copy-and-paste we've accumulated a number of instances of $(@D)/$(@F), which really is nothing else than $@. The split form only needs using when we want to e.g. insert a leading . at the beginning of the file name portion of the full name. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Reviewed-by: Bertrand Marquis Acked-by: Alistair Francis --- v2: Insert blanks after ">". --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -104,9 +104,9 @@ $(TARGET)-syms: $(objtree)/prelink.o $(o $(MAKE) $(build)=$(@D) $(@D)/.$(@F).1.o $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< $(build_id_linker) \ $(@D)/.$(@F).1.o -o $@ - $(NM) -pa --format=sysv $(@D)/$(@F) \ + $(NM) -pa --format=sysv $@ \ | $(objtree)/tools/symbols --all-symbols --xensyms --sysv --sort \ - >$(@D)/$(@F).map + > $@.map rm -f $(@D)/.$(@F).[0-9]* .PHONY: include --- a/xen/arch/riscv/Makefile +++ b/xen/arch/riscv/Makefile @@ -10,9 +10,9 @@ $(TARGET): $(TARGET)-syms $(TARGET)-syms: $(objtree)/prelink.o $(obj)/xen.lds $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< $(build_id_linker) -o $@ - $(NM) -pa --format=sysv $(@D)/$(@F) \ + $(NM) -pa --format=sysv $@ \ | $(objtree)/tools/symbols --all-symbols --xensyms --sysv --sort \ - >$(@D)/$(@F).map + > $@.map $(obj)/xen.lds: $(src)/xen.lds.S FORCE $(call if_changed_dep,cpp_lds_S) --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -150,9 +150,9 @@ $(TARGET)-syms: $(objtree)/prelink.o $(o $(MAKE) $(build)=$(@D) $(@D)/.$(@F).1.o $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< $(build_id_linker) \ $(orphan-handling-y) $(@D)/.$(@F).1.o -o $@ - $(NM) -pa --format=sysv $(@D)/$(@F) \ + $(NM) -pa --format=sysv $@ \ | $(objtree)/tools/symbols --all-symbols --xensyms --sysv --sort \ - >$(@D)/$(@F).map + > $@.map rm -f $(@D)/.$(@F).[0-9]* $(@D)/..$(@F).[0-9]* ifeq ($(CONFIG_XEN_IBT),y) $(SHELL) $(srctree)/tools/check-endbr.sh $@ @@ -224,8 +224,9 @@ endif $(MAKE) $(build)=$(@D) .$(@F).1r.o .$(@F).1s.o $(LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T $(obj)/efi.lds -N $< \ $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o $(orphan-handling-y) $(note_file_option) -o $@ - $(NM) -pa --format=sysv $(@D)/$(@F) \ - | $(objtree)/tools/symbols --all-symbols --xensyms --sysv --sort >$(@D)/$(@F).map + $(NM) -pa --format=sysv $@ \ + | $(objtree)/tools/symbols --all-symbols --xensyms --sysv --sort \ + > $@.map ifeq ($(CONFIG_DEBUG_INFO),y) $(if $(filter --strip-debug,$(EFI_LDFLAGS)),:$(space))$(OBJCOPY) -O elf64-x86-64 $@ $@.elf endif From patchwork Mon May 8 12:58:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 13234506 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AD544C77B73 for ; Mon, 8 May 2023 12:59:14 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.531547.827305 (Exim 4.92) (envelope-from ) id 1pw0S6-0002aa-BY; Mon, 08 May 2023 12:58:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 531547.827305; Mon, 08 May 2023 12:58:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pw0S6-0002aT-6v; Mon, 08 May 2023 12:58:54 +0000 Received: by outflank-mailman (input) for mailman id 531547; Mon, 08 May 2023 12:58:53 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pw0S5-0002aJ-4r for xen-devel@lists.xenproject.org; Mon, 08 May 2023 12:58:53 +0000 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on0622.outbound.protection.outlook.com [2a01:111:f400:fe0c::622]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 1437805a-eda0-11ed-8611-37d641c3527e; Mon, 08 May 2023 14:58:51 +0200 (CEST) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by AS8PR04MB8674.eurprd04.prod.outlook.com (2603:10a6:20b:429::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6363.32; Mon, 8 May 2023 12:58:49 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::8e41:82b6:a27f:2e0c]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::8e41:82b6:a27f:2e0c%4]) with mapi id 15.20.6363.031; Mon, 8 May 2023 12:58:49 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 1437805a-eda0-11ed-8611-37d641c3527e ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lqWCsZ3wiHEq++gmGNGyHg3Vhmx0W7jmgW0yyPO2i7+uf/UQT2O4dQo4YpsDZ5hVNpexIYKY780zIAsjXcr9qRO2F6Z4XCcRHLWbcuwAjPwfm2KPp8RdaPKAsIxWn4oEtR7K1qRgXqEfYxaAoAo463xk8N2+2QEUg1eQ8REoRnO2uMV0sOzUdl6StiBy1mGtHPnvpw9+UmHaNOVWV//Vthj4I15tng3G5/SE7zuYEYVOk9cVYRGdTF9CqahG9cIuX/2BjRBnhcX3njR4RyvYo8IRKbrlfFo+OBq5qktAFtrh6yXeNOnxrZgwo36tI8u38yo6kfev/5ok8XD4CiU7Yw== 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=bHHkwJRRJgd96xEOMAOZhq2iePtG+6G1NYpCQL/zg1U=; b=kIpnEUTTqWCEgkJZWBta46WAgUEk2hAXj78hfhnn/Rs0fCeLY5kyiIfEwqNx0FQcaEudWIGI6b26Y9Nef/y8KZ47rKIL23kFa+mDY6ypTXU4m84bVrSzXNPJcihmFwSdasDL0YdP3Krw5VribuoyfChU/+7G/X0Yz0pUarWt3ny/lI69MSDBtPWJ9yMruo3+VSDzKj59grs97voQeEM9qV2IuKNh0ADHcmwKV55+XHJqcm8UY2gcKt+jVfdKT6p2ZAcBU4Y2iKqL13qmFGbMl3Xu53gqTKlh8a9WYiM5B5zSOMyU69IPVcYiB2BqVttoUptpld1d88qz3Xpk8V9dlw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bHHkwJRRJgd96xEOMAOZhq2iePtG+6G1NYpCQL/zg1U=; b=5zgk+P+vClAQrjKkL+zGFmZMjg+N0Y87gBYJ4nEBNLPKD/W/m3F7t683lncQVOw/z5h7rcJLACtUe6WkXQeQvEt9utJ8DHBCncQx6jBSYrrxMaiCSOL8xKi4JkfCVEEfu9zY+NYDtX52YMUDw0Gp3ei3tHjj2lXOTe0XObNSTdAb4V+Pvpj5+AIHONHSxWPkjsL/3nOHzskr0S2+EvorLpfJpKKlW1iynUSQTqFT/ReFc4sKqOpj+cTeLgd0I/BGSoj1Kdqb1a4H8F/MJfOxHzwHexXBY8uMr0/aBk1a/JpAJ6Gt3BU8hixmSr1OET1WdyDgKqX0EONnwRsseueJIA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <9bc7544b-659f-4c09-f54d-647641483605@suse.com> Date: Mon, 8 May 2023 14:58:47 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.10.1 Subject: [PATCH v2 2/2] build: use $(dot-target) Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Julien Grall , Stefano Stabellini , Volodymyr Babchuk , Bertrand Marquis References: In-Reply-To: X-ClientProxiedBy: FR3P281CA0179.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a0::16) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB6560:EE_|AS8PR04MB8674:EE_ X-MS-Office365-Filtering-Correlation-Id: cb520c61-304b-4e10-e692-08db4fc3f796 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +qcLVVbR2tPQvT/Hwjz1Tf79eKVRjPm75hAUbw2M9KbIVeViFSRSuL2kj3xsGGAesHdxJurjZd/rItXUqgB2FBrxy6/LcaY4unMxwEjVqCAaGDa+2L5UXOOZGkyoBfFVlHcEHl1WauJLBA9ZTXYsQUMRGBrmcQqA73j2nlc2RZSfuhlJ8o4dkCm64Hadv2MQdvGZ65dUEl5QaRIPSfBVhyKYJVE4IvqY8GOSqgHOxn/HFFUHsRa/lunvp1kh8BSWkN25O0XOpSReZMdlXua0LaMELicgYjnHPosDj/UEghmk0eEWuUB9ARH4N+Vs121KRgrsbNzdIQFdv2u1dGq9mbC23K43b/yFdtz+ewmjQiLsHwIMVB1cqfoFpIUYYz46LKZuB7R11RvtNmodIsHgQm/0fG7AdwUv4Ee/DHcuDJAPyEV27wgvz9EZkrOmPPvTwnQ2mWMygw38TyQJGxmK+TW/8ZIvM9UMv4V+g+YBQyF40b4KkI5NRObQmAsGt5lBryy4Vxoy4zRoYYcVF8GRBwd+W9vVtvZMGbN0NBtJUz4ytyGV8NTAFFpWpjHiz2vYDrxhNwuXO+Ufmzdo3uDkqW/h0llGFzkTUhoO2m+11btDg/NEX75sWpiAuTzJic0IUAr9Gy5d3lP6KWUPdjQ1oQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6560.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(136003)(376002)(346002)(396003)(366004)(39860400002)(451199021)(31686004)(54906003)(2906002)(8936002)(8676002)(316002)(478600001)(6916009)(4326008)(66476007)(5660300002)(66556008)(41300700001)(66946007)(6486002)(6512007)(26005)(6506007)(186003)(36756003)(2616005)(38100700002)(86362001)(31696002)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?V4/9EBYSiVfkTqhl9E4yi2bAaH2/?= =?utf-8?q?m/ELoQ9HRdcL/v09/8c8grbWPPOOO/8SpPLIwqnL5IARMlwDrrdkWLx48k2tbcZ9j?= =?utf-8?q?2AyJXIhy8LtBosoqZRYzs22fssQ/6kLy7vxJ2iXR4/azMfoVwOG6vuOPhxtqYuqXD?= =?utf-8?q?o2Vc29m6lrMmXf0aXNEWfpIb53uYMT5AAoeLWvRD+SmaBr5QulIpILgwp245LumJB?= =?utf-8?q?yBFn/fgEG3aS+Fh5aKYCIaVqc+79QqQoqEfzAOhOArgctFSfstxnc++BFSGfHPLiv?= =?utf-8?q?CsbIc0qIO1lLwUkkK7G5ECk43VzS69NeshKAcEbfGNzI2lgfxQBz4UIlGSdchTssX?= =?utf-8?q?hmbFjZ21uXG1Nlq8d7MlcLMKryoQrAztQpZXJztwKZyOWPkDSznORw7fn28YR7F9V?= =?utf-8?q?1FR3y2HEIx33F5OezsGhSK5PLin6vHk/oxbJfEWLpWsjJPFGmucUwwVXa5FvgG2DZ?= =?utf-8?q?8rqH49pxVnBk3FeMPZXYvw7C2ccQ0fOpohFEtGqYAnXG9wd6qjtt41rQMDx7S3xnD?= =?utf-8?q?6LgADhciQlfRg0cs7KunjYK8Q9F/f9pzQtUu8qUAhcUt251f9TMqaaxcxCvu9fFGu?= =?utf-8?q?s/1LBVhvoH+6O3PufIWvzDXFFafdZxVPpH4E1mwQPmp4UAFK0rhMiIrlkecTbOaUP?= =?utf-8?q?ppjHHBCrp1epOcIKaNMIImSeOgCFzgKl+p2zfi5ZVUyJp4oNzaH+OM0v595jwTx8M?= =?utf-8?q?GqD2XtebEuqD0baFXnDxFLfRCcliYGZGJjhldcNppU4+duEHiu90kO7NHszth8sxE?= =?utf-8?q?qWiAv6NURTjnSlIdrUhAe9en/KSJ9YScJcx9XlYCNlcKE4kBYyVJrlqRV1U4YKEYz?= =?utf-8?q?O3sj/UIh+kGfVIfJR0UU2fLy00zCv75Z6wHwvB+Vjpbf8qmIWYBSTum8NgZZZ6CgO?= =?utf-8?q?FhlFxqiI6epztIRDyO9WEOTqU0mZNdjMgTCf49PuTK0SVAd0WBXfARS1zq0j6znPX?= =?utf-8?q?6syo0ICj6NOc1W0Ar29V9PRbc2X2FuiWynBgtVv2SrjqvqxQKWQK+iwn5DxzFBWM0?= =?utf-8?q?JOyJf+pAMnxL3ZEfbTs8YKDMjCifVyStGGPViZ7FGInnHNWSemj7g8bDG1GeKGtOR?= =?utf-8?q?HvG9pNqLpV08gOnhG71usTiJfCipGfSGZhpRo1ADLplJXu6EoVzvzx9r281niwiJa?= =?utf-8?q?6sMTlbcvVeqwO5ANHNQLMjUGRqOQod8EhKEZsSS4KhGhboFvQD2JCjbNbLAhO38L0?= =?utf-8?q?GshjFZT9L6OPahQueFLUCShaoR+ao2T7UeIE4BxjHX7vIdA7qgJ6GV2IRKsWGU3Kk?= =?utf-8?q?+lxGBYIT4xJE4Sc066TXq6FiJJ3p8bbaTU7Y5NufQIyJDb5vNwPTxd2/JO58+69ih?= =?utf-8?q?Ee5HGvzU9JLhCIh+XrWI+BWGpW6TVY1uteJNRVwEj7cmNqEpQSOvBi046OfuM80I8?= =?utf-8?q?0h3iLDOcqcKUdOADWUHMgITkU9FMALRLHwZBRm9exCYLum81TpqJc5Bz7yQ5I+F3W?= =?utf-8?q?D8CKVhtnE5FQTuF4KZgo8cWfVXCN9lP2Y1H8tzlWAmgtCdi03JQU5F+2T5miaiaDt?= =?utf-8?q?/hVFXK6/oBnS?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: cb520c61-304b-4e10-e692-08db4fc3f796 X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 May 2023 12:58:49.5245 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Wjonmp//N/rTjPMR8ZsH+G6Ut/Uy+D2Kkb0m4ymSAXwbMdK1KYaEEHTFQquZG0OrYCOhle7zwkYwDD5nc0FLgw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8674 While slightly longer, I agree with Andrew that using it helps readability. Where touching them anyway, also wrap some overly long lines. Suggested-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Bertrand Marquis --- v2: New. --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -93,17 +93,19 @@ endif $(TARGET)-syms: $(objtree)/prelink.o $(obj)/xen.lds $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< \ - $(objtree)/common/symbols-dummy.o -o $(@D)/.$(@F).0 - $(NM) -pa --format=sysv $(@D)/.$(@F).0 \ - | $(objtree)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).0.S - $(MAKE) $(build)=$(@D) $(@D)/.$(@F).0.o + $(objtree)/common/symbols-dummy.o -o $(dot-target).0 + $(NM) -pa --format=sysv $(dot-target).0 \ + | $(objtree)/tools/symbols $(all_symbols) --sysv --sort \ + > $(dot-target).0.S + $(MAKE) $(build)=$(@D) $(dot-target).0.o $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< \ - $(@D)/.$(@F).0.o -o $(@D)/.$(@F).1 - $(NM) -pa --format=sysv $(@D)/.$(@F).1 \ - | $(objtree)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).1.S - $(MAKE) $(build)=$(@D) $(@D)/.$(@F).1.o + $(dot-target).0.o -o $(dot-target).1 + $(NM) -pa --format=sysv $(dot-target).1 \ + | $(objtree)/tools/symbols $(all_symbols) --sysv --sort \ + > $(dot-target).1.S + $(MAKE) $(build)=$(@D) $(dot-target).1.o $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< $(build_id_linker) \ - $(@D)/.$(@F).1.o -o $@ + $(dot-target).1.o -o $@ $(NM) -pa --format=sysv $@ \ | $(objtree)/tools/symbols --all-symbols --xensyms --sysv --sort \ > $@.map --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -123,7 +123,7 @@ syms-warn-dup-$(CONFIG_ENFORCE_UNIQUE_SY orphan-handling-$(call ld-option,--orphan-handling=warn) += --orphan-handling=warn -$(TARGET): TMP = $(@D)/.$(@F).elf32 +$(TARGET): TMP = $(dot-target).elf32 $(TARGET): $(TARGET)-syms $(efi-y) $(obj)/boot/mkelf32 $(obj)/boot/mkelf32 $(notes_phdrs) $(TARGET)-syms $(TMP) $(XEN_IMG_OFFSET) \ `$(NM) $(TARGET)-syms | sed -ne 's/^\([^ ]*\) . __2M_rwdata_end$$/0x\1/p'` @@ -137,23 +137,23 @@ CFLAGS-$(XEN_BUILD_EFI) += -DXEN_BUILD_E $(TARGET)-syms: $(objtree)/prelink.o $(obj)/xen.lds $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< $(build_id_linker) \ - $(objtree)/common/symbols-dummy.o -o $(@D)/.$(@F).0 - $(NM) -pa --format=sysv $(@D)/.$(@F).0 \ + $(objtree)/common/symbols-dummy.o -o $(dot-target).0 + $(NM) -pa --format=sysv $(dot-target).0 \ | $(objtree)/tools/symbols $(all_symbols) --sysv --sort \ - >$(@D)/.$(@F).0.S - $(MAKE) $(build)=$(@D) $(@D)/.$(@F).0.o + > $(dot-target).0.S + $(MAKE) $(build)=$(@D) $(dot-target).0.o $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< $(build_id_linker) \ - $(@D)/.$(@F).0.o -o $(@D)/.$(@F).1 - $(NM) -pa --format=sysv $(@D)/.$(@F).1 \ + $(dot-target).0.o -o $(dot-target).1 + $(NM) -pa --format=sysv $(dot-target).1 \ | $(objtree)/tools/symbols $(all_symbols) --sysv --sort $(syms-warn-dup-y) \ - >$(@D)/.$(@F).1.S - $(MAKE) $(build)=$(@D) $(@D)/.$(@F).1.o + > $(dot-target).1.S + $(MAKE) $(build)=$(@D) $(dot-target).1.o $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< $(build_id_linker) \ - $(orphan-handling-y) $(@D)/.$(@F).1.o -o $@ + $(orphan-handling-y) $(dot-target).1.o -o $@ $(NM) -pa --format=sysv $@ \ | $(objtree)/tools/symbols --all-symbols --xensyms --sysv --sort \ > $@.map - rm -f $(@D)/.$(@F).[0-9]* $(@D)/..$(@F).[0-9]* + rm -f $(dot-target).[0-9]* $(@D)/..$(@F).[0-9]* ifeq ($(CONFIG_XEN_IBT),y) $(SHELL) $(srctree)/tools/check-endbr.sh $@ endif @@ -210,27 +210,34 @@ ifeq ($(CONFIG_DEBUG_INFO),y) endif $(foreach base, $(VIRT_BASE) $(ALT_BASE), \ $(LD) $(call EFI_LDFLAGS,$(base)) -T $(obj)/efi.lds -N $< $(relocs-dummy) \ - $(objtree)/common/symbols-dummy.o $(note_file_option) -o $(@D)/.$(@F).$(base).0 &&) : - $(MKRELOC) $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).0) >$(@D)/.$(@F).0r.S - $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).0 \ - | $(objtree)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).0s.S + $(objtree)/common/symbols-dummy.o $(note_file_option) \ + -o $(dot-target).$(base).0 &&) : + $(MKRELOC) $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(dot-target).$(base).0) \ + > $(dot-target).0r.S + $(NM) -pa --format=sysv $(dot-target).$(VIRT_BASE).0 \ + | $(objtree)/tools/symbols $(all_symbols) --sysv --sort \ + > $(dot-target).0s.S $(MAKE) $(build)=$(@D) .$(@F).0r.o .$(@F).0s.o $(foreach base, $(VIRT_BASE) $(ALT_BASE), \ $(LD) $(call EFI_LDFLAGS,$(base)) -T $(obj)/efi.lds -N $< \ - $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o $(note_file_option) -o $(@D)/.$(@F).$(base).1 &&) : - $(MKRELOC) $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).1) >$(@D)/.$(@F).1r.S - $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).1 \ - | $(objtree)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).1s.S + $(dot-target).0r.o $(dot-target).0s.o $(note_file_option) \ + -o $(dot-target).$(base).1 &&) : + $(MKRELOC) $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(dot-target).$(base).1) \ + > $(dot-target).1r.S + $(NM) -pa --format=sysv $(dot-target).$(VIRT_BASE).1 \ + | $(objtree)/tools/symbols $(all_symbols) --sysv --sort \ + > $(dot-target).1s.S $(MAKE) $(build)=$(@D) .$(@F).1r.o .$(@F).1s.o $(LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T $(obj)/efi.lds -N $< \ - $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o $(orphan-handling-y) $(note_file_option) -o $@ + $(dot-target).1r.o $(dot-target).1s.o $(orphan-handling-y) \ + $(note_file_option) -o $@ $(NM) -pa --format=sysv $@ \ | $(objtree)/tools/symbols --all-symbols --xensyms --sysv --sort \ > $@.map ifeq ($(CONFIG_DEBUG_INFO),y) $(if $(filter --strip-debug,$(EFI_LDFLAGS)),:$(space))$(OBJCOPY) -O elf64-x86-64 $@ $@.elf endif - rm -f $(@D)/.$(@F).[0-9]* $(@D)/..$(@F).[0-9]* + rm -f $(dot-target).[0-9]* $(@D)/..$(@F).[0-9]* ifeq ($(CONFIG_XEN_IBT),y) $(SHELL) $(srctree)/tools/check-endbr.sh $@ endif