From mboxrd@z Thu Jan  1 00:00:00 1970
From: Andrew Cooper <andrew.cooper3@citrix.com>
Subject: Re: [PATCH for-xen-4.5 v4 02/18] x86/boot: fix reloc.S
	build dependencies
Date: Fri, 17 Oct 2014 15:56:58 +0100
Message-ID: <54412E3A.6020005@citrix.com>
References: <1413555132-22138-1-git-send-email-daniel.kiper@oracle.com>
	<1413555132-22138-3-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.bemta5.messagelabs.com ([195.245.231.135])
	by lists.xen.org with esmtp (Exim 4.72)
	(envelope-from <Andrew.Cooper3@citrix.com>) id 1Xf8xp-0007JP-94
	for xen-devel@lists.xenproject.org; Fri, 17 Oct 2014 14:57:09 +0000
In-Reply-To: <1413555132-22138-3-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: jgross@suse.com, keir@xen.org, ian.campbell@citrix.com, stefano.stabellini@eu.citrix.com, ross.philipson@citrix.com, roy.franz@linaro.org, ning.sun@intel.com, jbeulich@suse.com, qiaowei.ren@intel.com, richard.l.maliszewski@intel.com, gang.wei@intel.com, fu.wei@linaro.org
List-Id: xen-devel@lists.xenproject.org

On 17/10/14 15:11, Daniel Kiper wrote:
> reloc.S is not rebuild if header included
> in reloc.c is updated. Fix this issue.
>
> Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
> ---
>  xen/arch/x86/boot/Makefile   |    6 +++++-
>  xen/arch/x86/boot/build32.mk |    3 ++-
>  2 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/xen/arch/x86/boot/Makefile b/xen/arch/x86/boot/Makefile
> index 13f4a66..3cab36a 100644
> --- a/xen/arch/x86/boot/Makefile
> +++ b/xen/arch/x86/boot/Makefile
> @@ -1,8 +1,12 @@
>  obj-bin-y += head.o
>  
> +RELOC_DEPS = $(BASEDIR)/include/asm-x86/config.h $(BASEDIR)/include/xen/multiboot.h

What is wrong with the normal gcc method of using "-MMD -MF" ?  It would
avoid duplicating the list of includes in the Makefile.

~Andrew

> +
> +export RELOC_DEPS
> +
>  head.o: reloc.S
>  
>  %.S: %.c
>  	$(MAKE) -f build32.mk $@
>  
> -reloc.S: head.S
> +reloc.S: $(RELOC_DEPS)
> diff --git a/xen/arch/x86/boot/build32.mk b/xen/arch/x86/boot/build32.mk
> index a36f620..809f296 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_DEPS)
> +
>  .PRECIOUS: %.bin %.lnk