From patchwork Thu May 4 16:16:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 13231381 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 BB425C77B7C for ; Thu, 4 May 2023 16:16:36 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.529839.824699 (Exim 4.92) (envelope-from ) id 1pubcz-0005qw-Jp; Thu, 04 May 2023 16:16:21 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 529839.824699; Thu, 04 May 2023 16:16:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pubcz-0005qp-H0; Thu, 04 May 2023 16:16:21 +0000 Received: by outflank-mailman (input) for mailman id 529839; Thu, 04 May 2023 16:16:20 +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 1pubcy-0005qj-1t for xen-devel@lists.xenproject.org; Thu, 04 May 2023 16:16:20 +0000 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2061e.outbound.protection.outlook.com [2a01:111:f400:7e1a::61e]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id ff74922b-ea96-11ed-8611-37d641c3527e; Thu, 04 May 2023 18:16:17 +0200 (CEST) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by AM0PR04MB6868.eurprd04.prod.outlook.com (2603:10a6:208:18c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6363.26; Thu, 4 May 2023 16:16:15 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::52b2:f58:e19:56ae]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::52b2:f58:e19:56ae%2]) with mapi id 15.20.6363.022; Thu, 4 May 2023 16:16:15 +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: ff74922b-ea96-11ed-8611-37d641c3527e ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fAPZt5EH1bG/JD1PnkOnmqHz5Bm+krvubRyDUOZujf5iertOEbV/yRHRYrw11JQz3xag1Ksh0ZYUYsGIym1GsilgQg7ZoO+GY0gZa6OPEAGD8/33aOgfD2M7ZYJi3X2qtfFPdOxxDU5reCdlxv7Ez7I8QwrH0jUngUwc2TLkO99KHmJYNXoNY0d7PHAOh10dXyXWfHaCzh/5OddAj4MJApZvnyTWZ+14SBpFVS8cLeSkbBToZckG26e24bzuknV/8fQs6ROkJhMTOG89LLQnpsTHjtrni2uy6yqHHmhsrD7WasLEmulFks5Hf926VIpOMSwY0Ouw932KTr/0nKT7yQ== 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=XShP+I010xYQHT+tjQ/t6tTbyUcOlkO/Qe5OKDnivA0=; b=jeYMry1EH9lkAX9Z5SgWbby6ko5SSBRl33BTGZKb0PtySXR7qXZpNT8a6niPJOsbq23dIFwy2Pu/GYd1fH/WTASO3AK+H26nDh9RpGVfVsTqYoRCsEwxWkoDBYic2/30wlOWDTGUcS1Ty2OdQ0UdrMRjP+F6OjyAiEYEUVxk7+K7vsFzV8mVXrm1JE0q/sW2EibTalklpNj8Uym6Lnq40ispg6b4T21Wo/2RXQpguO3CQVrnib2dH4EbvVHKpj1uj2UOk96kMvhgzs+Tf+YeAdwIZZBuwnn3OX0PNE0PZNgcAd+3rQhJC/UPpVpAUCme5z9UDDvPp1CJYAWs9DN/iQ== 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=XShP+I010xYQHT+tjQ/t6tTbyUcOlkO/Qe5OKDnivA0=; b=lzcg3IWpJg/9wzZ3pZugaXML+3og185wg/vNrd0XX5IzuPm0Bl0Hf2rwRSCDQqtsN5dJZBCYe0KEi2wML58WYo+xE2m6SSiJjo7fHdlNqJpBelMbKb5k7p6mRisaprqD17t1rqFFEGJCGqyezRYwiShSuAx/dpaYr1aX5clUwlBTA2YElZYVqlO7UadBYGaSQn4jix+GHHHsXeVmt/0U34GKZzTTtQg4u7r0EVGRAjL6ZBmxDKrga9e8g2jEXXRF36gUtY4w+AuAsbCs0l83HkGiGV/Q68FyeUrpx7tE04u1gGCxbl38wCrDtVI2iDXD69XBvDwkWvhJ0/9brHnMDw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <95467f2c-09ed-d34f-feef-5cd55c60f628@suse.com> Date: Thu, 4 May 2023 18:16:13 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.10.1 Content-Language: en-US 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 , Anthony Perard From: Jan Beulich Subject: [PATCH] build: shorten macro references X-ClientProxiedBy: FR3P281CA0117.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a3::8) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB6560:EE_|AM0PR04MB6868:EE_ X-MS-Office365-Filtering-Correlation-Id: c9ae8391-1c8a-490f-f2e5-08db4cbae2a1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: z6DzkKvn/98KRYaJl7lCZMBlQ3F2I9Qi0Dlnhy0A6lSH6J7DhsIbTEzZQ9HCYdzKQcWiPEBjSK8idWpnYUERh/0X2fFy2xeGrwJuZyR3aYDZ5YtX6Odoy49TS7P/AX5vpbfEFx2jiRoBOr0bjO8V188FE72aLMN1+dNA2sD6k7bJTgv5UYnbzcDMRg28PC9/1j6WHcIo941wnrjHXr8CP/giGgNIm266v7VLEN1OpGXXD69CNcBD4VCe3BaK4bae/dbdkiOEsJYBp5yi+QUVDbT9lH3gnTVpM2uOgzy2bz0Gsgl3hR0jIJr2hZ0QElBwozg1PN2enO/F2Ggk9sTd7p6NMDSCDymQGS0n35gJNrTrq5Z4nYAn9FGDRdb1lU1f88sk35MXCux6O6z0Sv0mBaFhT+TLd7ucnchHAdfjPPVmpZm04khjrIK35qnUaDt/UoKtNqtjY5RWAAeBerO4Jx77d5WWuA+Kb7hMZO67LsaFVR/Mdtmr9ZPIfHDRYvGVhlg1IcnWn2WULDHC9kQwHXPoO2IBmb3IUyNon1GkMSZ5Ibr2lR3o9XK029bHXwpDnR/BCaCX3bfvru4UcJz7+1/zuv0jRKW410DIuqKclZxlGDQbGez/IAD/i5lRPKToNiTmywVE0rk1/tXYefwEaw== 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)(376002)(136003)(346002)(396003)(366004)(39860400002)(451199021)(2616005)(6486002)(26005)(41300700001)(86362001)(36756003)(316002)(4326008)(6916009)(66476007)(66556008)(66946007)(31696002)(478600001)(2906002)(38100700002)(31686004)(186003)(5660300002)(54906003)(7416002)(8936002)(8676002)(6506007)(6512007)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?rrobsrFy8xwLSWTjXHe9l7jrv8+l?= =?utf-8?q?p3T34254Tj0tYXpMkksyE1G5uCsDFMlrEXeq4ey9UDcKjNVGoP6aE1c6qkEIrmJYl?= =?utf-8?q?Q13+1YmGUcAAz9wqPlPa6cG59YMPu+HfmWcRYMYl2ECNdB+erkaTpefo9yLlN7gkY?= =?utf-8?q?sGqyjhTM15Q/xc6s/RYH5m5uiDNQRIKrkOmUoL6pX1+ZXBKkIyXkGnC11OJoodnpH?= =?utf-8?q?zt1m1glJiawm3hU43T/XnNlEE6fN72r2R2QaIzEJGiRjctTo9twt1JIpzgSPAWubK?= =?utf-8?q?mjVK2ekt/f93SIzwaFezP7dqZ3sc9UZiPvWj/yhJQn8HZVLeVZrv7Wy9gXaiSSEUn?= =?utf-8?q?6nxQHn8jeR5VwNLwSjyRlKLEGWuhcdy4sE/jfzEI/LmzeM2Mx3xusAPBC5w9IVpy0?= =?utf-8?q?DuqAbudvlCFfzHzorppbeg3N2nC4oieDP4r3kd+wwGUn1Y6sWZLSDh016tSVVeNQ/?= =?utf-8?q?UrDN7bF3RY6G1pMSiBCVSGsnF7vFJuwEEnLlykxj8Y8+sqpNcY9SSw5pPIB+f16zh?= =?utf-8?q?PnZEFU139rvWzNhLG9US7Z9L2/n1RbWlF6XeHpwnAu2MWihnUBUlMaCGBTbycr6LE?= =?utf-8?q?kX0jjeOgG9BajCJNWGEr6QYiCYwBGDTJRXoo9Tjb433PdEe7qqEH44IlOFKNNBWU9?= =?utf-8?q?Xh8KSFoajlroXhATSbzsRHe4mCjBMHESDR0QiSR/QH+I0i73xeQmUTMfdVkxRvoA5?= =?utf-8?q?c0ST3z72cZ0oVQm+2PqVhFunvH597SBEgLioKN2fz3nYrXKKPclRzBaBWU4a7a6UW?= =?utf-8?q?5tGRf02D2EXPoJuZ8uexQEJr34zT5XyeC7d3QWVua4WMSqn6DTnPFxoN7esee3sVA?= =?utf-8?q?X1Zs5RJYXtkYcL5mVTohAPd1yd4GoUsKSFJtnO2vMa1fZ9MNsGICyLF/IHsrFwsCv?= =?utf-8?q?EOfAykgcWo5nf5tKtzDzpw44pIEP6/mxU/FTv8kPhL7o+HRH4Mao9u1QFOTbSf7kh?= =?utf-8?q?Cdrvn1pqnLg96eg38ugo6T7mxqXK/ElMkZD/+tPrsbBxdHEb8g7Uiyp86mTXw8zEz?= =?utf-8?q?s/ATD3m7rf5mOLeP3X8FtV4Rmb/ECBZI04ZpWCJ1rr0xscaTnTe039ayulRYRcHDR?= =?utf-8?q?uiWTikdgX4r8sE1okwmy6dmkqLwKsMTUi/rkntokhNJteKn3htiKJBneKxYkyaJAQ?= =?utf-8?q?HyHnEuNxhUl5taEx7TxIjMYwCGaVkStS8+uabdW2nuk7n4ffulJrBObPhACyvTQTP?= =?utf-8?q?AEVhSnh51NAUw0DtWAxuvuPuKX7XWCIbklpP3rf1lR75xNMkJ1fDCBjodICtKgo0N?= =?utf-8?q?84XRGGOJoup4HX5x4BtaiTXM5KaoMLghTF02DalC22Sr9Y8Z266iTjQdyvF8mWkfx?= =?utf-8?q?hsZDQIv08CE05837Z6yLlVs4Z5HTIcv4fwb0Xsk/918e3EH+ycCW4TuD4Tx86WHlb?= =?utf-8?q?thBbHxI8j3/bXQSEtRqArIaU4EvX0QZ+7ijX0jBd1DHXbnfz3mc8JrYRFpPXHario?= =?utf-8?q?NzXM16/jnUmIwzDsTjFu9bJHwU2XfZb2iXloL00AjTaGm94dwoenhxcVA3Aps6FJl?= =?utf-8?q?VEABrZnAzfkd?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: c9ae8391-1c8a-490f-f2e5-08db4cbae2a1 X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2023 16:16:15.5234 (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: MdqUSzeXNVT569WwvUHoZxxMFjEk8BPau19nyl3Whln5glGFvgJWspIdGZAR67DoELwUE3iak1eYAVcxCfNPfQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6868 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 , although ... Reviewed-by: Bertrand Marquis --- 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