From: Marc Hartmayer <mhartmay@linux.ibm.com>
To: <kvm@vger.kernel.org>
Cc: Janosch Frank <frankja@linux.ibm.com>,
David Hildenbrand <david@redhat.com>,
Claudio Imbrenda <imbrenda@linux.ibm.com>,
Nina Schoetterl-Glausch <nsg@linux.ibm.com>,
Nico Boehr <nrb@linux.ibm.com>, Thomas Huth <thuth@redhat.com>
Subject: [kvm-unit-tests PATCH v3 3/7] s390x/Makefile: fix `*.gbin` target dependencies
Date: Tue, 7 Mar 2023 10:10:47 +0100 [thread overview]
Message-ID: <20230307091051.13945-4-mhartmay@linux.ibm.com> (raw)
In-Reply-To: <20230307091051.13945-1-mhartmay@linux.ibm.com>
If the linker scripts change, then the .gbin binaries must be rebuilt.
While at it, replace `$(SRCDIR)/s390x/snippets` with `$(SNIPPET_DIR)`
for these Makefile rules.
Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Reviewed-by: Janosch Frank <frankja@linux.ibm.com>
---
s390x/Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/s390x/Makefile b/s390x/Makefile
index 660ff06f1e7c..71e6563bbb61 100644
--- a/s390x/Makefile
+++ b/s390x/Makefile
@@ -135,13 +135,13 @@ $(SNIPPET_DIR)/asm/%.o: $(SNIPPET_DIR)/asm/%.S $(asm-offsets)
$(SNIPPET_DIR)/c/%.o: $(SNIPPET_DIR)/c/%.c $(asm-offsets)
$(CC) $(CFLAGS) -c -nostdlib -o $@ $<
-$(SNIPPET_DIR)/asm/%.gbin: $(SNIPPET_DIR)/asm/%.o
- $(CC) $(LDFLAGS) -o $@ -T $(SRCDIR)/s390x/snippets/asm/flat.lds $<
+$(SNIPPET_DIR)/asm/%.gbin: $(SNIPPET_DIR)/asm/%.o $(SNIPPET_DIR)/asm/flat.lds
+ $(CC) $(LDFLAGS) -o $@ -T $(SNIPPET_DIR)/asm/flat.lds $<
$(OBJCOPY) -O binary -j ".rodata" -j ".lowcore" -j ".text" -j ".data" -j ".bss" --set-section-flags .bss=alloc,load,contents $@ $@
truncate -s '%4096' $@
-$(SNIPPET_DIR)/c/%.gbin: $(SNIPPET_DIR)/c/%.o $(snippet_lib) $(FLATLIBS)
- $(CC) $(LDFLAGS) -o $@ -T $(SRCDIR)/s390x/snippets/c/flat.lds $< $(snippet_lib) $(FLATLIBS)
+$(SNIPPET_DIR)/c/%.gbin: $(SNIPPET_DIR)/c/%.o $(snippet_lib) $(FLATLIBS) $(SNIPPET_DIR)/c/flat.lds
+ $(CC) $(LDFLAGS) -o $@ -T $(SNIPPET_DIR)/c/flat.lds $< $(snippet_lib) $(FLATLIBS)
$(OBJCOPY) -O binary -j ".rodata" -j ".lowcore" -j ".text" -j ".data" -j ".bss" --set-section-flags .bss=alloc,load,contents $@ $@
truncate -s '%4096' $@
--
2.34.1
next prev parent reply other threads:[~2023-03-07 9:11 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-07 9:10 [kvm-unit-tests PATCH v3 0/7] Some cleanup patches Marc Hartmayer
2023-03-07 9:10 ` [kvm-unit-tests PATCH v3 1/7] .gitignore: ignore `s390x/comm.key` file Marc Hartmayer
2023-03-07 9:10 ` [kvm-unit-tests PATCH v3 2/7] s390x/Makefile: simplify `%.hdr` target rules Marc Hartmayer
2023-03-07 9:10 ` Marc Hartmayer [this message]
2023-03-07 9:10 ` [kvm-unit-tests PATCH v3 4/7] s390x/Makefile: refactor CPPFLAGS Marc Hartmayer
2023-03-07 9:10 ` [kvm-unit-tests PATCH v3 5/7] s390x: use preprocessor for linker script generation Marc Hartmayer
2023-03-08 15:19 ` Claudio Imbrenda
2023-03-08 21:32 ` Nina Schoetterl-Glausch
2023-03-07 9:10 ` [kvm-unit-tests PATCH v3 6/7] s390x: define a macro for the stack frame size Marc Hartmayer
2023-03-08 15:12 ` Claudio Imbrenda
2023-03-08 21:46 ` Nina Schoetterl-Glausch
2023-03-31 7:30 ` Nico Boehr
2023-03-31 8:03 ` Marc Hartmayer
2023-03-31 8:27 ` [kvm-unit-tests PATCH v4] s390x/Makefile: refactor CPPFLAGS Marc Hartmayer
2023-03-31 9:36 ` Nico Boehr
2023-03-31 9:59 ` Marc Hartmayer
2023-03-31 9:47 ` Nico Boehr
2023-03-07 9:10 ` [kvm-unit-tests PATCH v3 7/7] lib/linux/const.h: test for `__ASSEMBLER__` as well Marc Hartmayer
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=20230307091051.13945-4-mhartmay@linux.ibm.com \
--to=mhartmay@linux.ibm.com \
--cc=david@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=imbrenda@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=nrb@linux.ibm.com \
--cc=nsg@linux.ibm.com \
--cc=thuth@redhat.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox