From mboxrd@z Thu Jan  1 00:00:00 1970
From: Andrew Cooper <andrew.cooper3@citrix.com>
Subject: Re: [PATCH v2] x86/boot: fix reloc.S build dependencies
Date: Wed, 22 Oct 2014 10:56:01 +0100
Message-ID: <54477F31.4020002@citrix.com>
References: <1413925748-10087-1-git-send-email-daniel.kiper@oracle.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
Received: from mail6.bemta3.messagelabs.com ([195.245.230.39])
	by lists.xen.org with esmtp (Exim 4.72)
	(envelope-from <Andrew.Cooper3@citrix.com>) id 1XgseO-00082O-JG
	for xen-devel@lists.xenproject.org; Wed, 22 Oct 2014 09:56:16 +0000
In-Reply-To: <1413925748-10087-1-git-send-email-daniel.kiper@oracle.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Daniel Kiper <daniel.kiper@oracle.com>, xen-devel@lists.xenproject.org
Cc: keir@xen.org, jbeulich@suse.com
List-Id: xen-devel@lists.xenproject.org

On 21/10/14 22:09, Daniel Kiper wrote:
> reloc.S is not rebuild if header included
> in reloc.c is updated. Fix this issue.
>
> Additionally, remove reloc.S build dependency
> on head.S because anything from reloc.S does
> not depend on head.S.
>
> Add reloc.c dependency to reloc.o build rule for consistency.
>
> Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>

Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>

> ---
> v2 - suggestions/fixes:
>    - do not use export and pass variable to make command line directly
>      (suggested by Jan Beulich),
>    - improve commit message
>      (suggested by Jan Beulich).
> ---
>  xen/arch/x86/boot/Makefile   |    8 ++++----
>  xen/arch/x86/boot/build32.mk |    3 ++-
>  2 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/xen/arch/x86/boot/Makefile b/xen/arch/x86/boot/Makefile
> index 13f4a66..5fdb5ae 100644
> --- a/xen/arch/x86/boot/Makefile
> +++ b/xen/arch/x86/boot/Makefile
> @@ -1,8 +1,8 @@
>  obj-bin-y += head.o
>  
> -head.o: reloc.S
> +RELOC_DEPS = $(BASEDIR)/include/asm-x86/config.h $(BASEDIR)/include/xen/multiboot.h
>  
> -%.S: %.c
> -	$(MAKE) -f build32.mk $@
> +head.o: reloc.S
>  
> -reloc.S: head.S
> +reloc.S: reloc.c $(RELOC_DEPS)
> +	$(MAKE) -f build32.mk $@ RELOC_DEPS="$(RELOC_DEPS)"
> diff --git a/xen/arch/x86/boot/build32.mk b/xen/arch/x86/boot/build32.mk
> index a36f620..c208249 100644
> --- a/xen/arch/x86/boot/build32.mk
> +++ b/xen/arch/x86/boot/build32.mk
> @@ -30,5 +30,6 @@ CFLAGS := $(filter-out -flto,$(CFLAGS))
>  			esac; \
>  		done
>  
> -reloc.o: $(BASEDIR)/include/asm-x86/config.h
> +reloc.o: reloc.c $(RELOC_DEPS)
> +
>  .PRECIOUS: %.bin %.lnk