From: Andrew Cooper <andrew.cooper3@citrix.com>
To: Daniel Kiper <daniel.kiper@oracle.com>, xen-devel@lists.xenproject.org
Cc: keir@xen.org, jbeulich@suse.com
Subject: Re: [PATCH v2] x86/boot: fix reloc.S build dependencies
Date: Wed, 22 Oct 2014 10:56:01 +0100 [thread overview]
Message-ID: <54477F31.4020002@citrix.com> (raw)
In-Reply-To: <1413925748-10087-1-git-send-email-daniel.kiper@oracle.com>
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
prev parent reply other threads:[~2014-10-22 9:56 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-21 21:09 [PATCH v2] x86/boot: fix reloc.S build dependencies Daniel Kiper
2014-10-21 21:09 ` [PATCH v2] x86/boot: use constant in head.S instead of hardcoded value Daniel Kiper
2014-10-22 9:56 ` Andrew Cooper
2014-10-21 21:09 ` [PATCH] x86/boot/reloc: add memory to clobber list Daniel Kiper
2014-10-22 9:58 ` Andrew Cooper
2014-10-22 9:56 ` Andrew Cooper [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=54477F31.4020002@citrix.com \
--to=andrew.cooper3@citrix.com \
--cc=daniel.kiper@oracle.com \
--cc=jbeulich@suse.com \
--cc=keir@xen.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.