[v2,2/2] build: use $(dot-target)

Message ID	9bc7544b-659f-4c09-f54d-647641483605@suse.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <xen-devel-bounces@lists.xenproject.org> Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" <xen-devel-bounces@lists.xenproject.org> 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 <jbeulich@suse.com> To: "xen-devel@lists.xenproject.org" <xen-devel@lists.xenproject.org> Cc: Andrew Cooper <andrew.cooper3@citrix.com>, Wei Liu <wl@xen.org>, =?utf-8?q?Roger_Pau_Monn=C3=A9?= <roger.pau@citrix.com>, Julien Grall <julien@xen.org>, Stefano Stabellini <sstabellini@kernel.org>, Volodymyr Babchuk <volodymyr_babchuk@epam.com>, Bertrand Marquis <bertrand.marquis@arm.com> References: <a261b10b-25e4-3374-d6c4-05b307619d81@suse.com> In-Reply-To: <a261b10b-25e4-3374-d6c4-05b307619d81@suse.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit MIME-Version: 1.0
Series	build: improve macro references \| expand [v2,0/2] build: improve macro references [v2,1/2] build: shorten macro references [v2,2/2] build: use $(dot-target)

Message ID

9bc7544b-659f-4c09-f54d-647641483605@suse.com (mailing list archive)

State

New, archived

Headers

Errors-To: xen-devel-bounces@lists.xenproject.org
Precedence: list
Sender: "Xen-devel" <xen-devel-bounces@lists.xenproject.org>
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 <jbeulich@suse.com>
To: "xen-devel@lists.xenproject.org" <xen-devel@lists.xenproject.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>, Wei Liu <wl@xen.org>,
	=?utf-8?q?Roger_Pau_Monn=C3=A9?= <roger.pau@citrix.com>,
 Julien Grall <julien@xen.org>, Stefano Stabellini <sstabellini@kernel.org>,
 Volodymyr Babchuk <volodymyr_babchuk@epam.com>,
 Bertrand Marquis <bertrand.marquis@arm.com>
References: <a261b10b-25e4-3374-d6c4-05b307619d81@suse.com>
In-Reply-To: <a261b10b-25e4-3374-d6c4-05b307619d81@suse.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
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

Series

build: improve macro references | expand

Commit Message

Jan Beulich May 8, 2023, 12:58 p.m. UTC

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 <andrew.cooper3@citrix.com>
Signed-off-by: Jan Beulich <jbeulich@suse.com>
---
v2: New.

Comments

Jan Beulich June 1, 2023, 10:52 a.m. UTC | #1

On 08.05.2023 14:58, Jan Beulich wrote:
> 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 <andrew.cooper3@citrix.com>
> Signed-off-by: Jan Beulich <jbeulich@suse.com>

I didn't expect this was controversial, so - any chance of an ack or two?

Thanks, Jan

> --- 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
> 
>

Bertrand Marquis June 1, 2023, noon UTC | #2

Hi Jan,

> On 1 Jun 2023, at 12:52, Jan Beulich <jbeulich@suse.com> wrote:
> 
> On 08.05.2023 14:58, Jan Beulich wrote:
>> 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 <andrew.cooper3@citrix.com>
>> Signed-off-by: Jan Beulich <jbeulich@suse.com>
> 
> I didn't expect this was controversial, so - any chance of an ack or two?
> 
> Thanks, Jan

Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>

Cheers
Bertrand

> 
>> --- 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
>> 
>> 
>

--- 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

[v2,2/2] build: use $(dot-target)

Commit Message

Comments

Patch