From: "Clément Léger" <cleger@rivosinc.com>
To: kvm@vger.kernel.org, kvm-riscv@lists.infradead.org
Cc: "Clément Léger" <cleger@rivosinc.com>,
"Andrew Jones" <ajones@ventanamicro.com>,
"Anup Patel" <apatel@ventanamicro.com>,
"Atish Patra" <atishp@rivosinc.com>,
"Andrew Jones" <andrew.jones@linux.dev>
Subject: [kvm-unit-tests PATCH v6 1/5] kbuild: allow multiple asm-offsets file to be generated
Date: Fri, 10 Jan 2025 12:12:40 +0100 [thread overview]
Message-ID: <20250110111247.2963146-2-cleger@rivosinc.com> (raw)
In-Reply-To: <20250110111247.2963146-1-cleger@rivosinc.com>
In order to allow multiple asm-offsets files to generated the include
guard need to be different between these file. Add a asm_offset_name
makefile macro to obtain an uppercase name matching the original asm
offsets file.
Signed-off-by: Clément Léger <cleger@rivosinc.com>
Reviewed-by: Andrew Jones <andrew.jones@linux.dev>
---
scripts/asm-offsets.mak | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/scripts/asm-offsets.mak b/scripts/asm-offsets.mak
index 7b64162d..a5fdbf5d 100644
--- a/scripts/asm-offsets.mak
+++ b/scripts/asm-offsets.mak
@@ -15,10 +15,14 @@ define sed-y
s:->::; p;}'
endef
+define asm_offset_name
+ $(shell echo $(notdir $(1)) | tr [:lower:]- [:upper:]_)
+endef
+
define make_asm_offsets
(set -e; \
- echo "#ifndef __ASM_OFFSETS_H__"; \
- echo "#define __ASM_OFFSETS_H__"; \
+ echo "#ifndef __$(strip $(asm_offset_name))_H__"; \
+ echo "#define __$(strip $(asm_offset_name))_H__"; \
echo "/*"; \
echo " * Generated file. DO NOT MODIFY."; \
echo " *"; \
@@ -29,12 +33,16 @@ define make_asm_offsets
echo "#endif" ) > $@
endef
-$(asm-offsets:.h=.s): $(asm-offsets:.h=.c)
- $(CC) $(CFLAGS) -fverbose-asm -S -o $@ $<
+define gen_asm_offsets_rules
+$(1).s: $(1).c
+ $(CC) $(CFLAGS) -fverbose-asm -S -o $$@ $$<
+
+$(1).h: $(1).s
+ $$(call make_asm_offsets,$(1))
+ cp -f $$@ lib/generated/
+endef
-$(asm-offsets): $(asm-offsets:.h=.s)
- $(call make_asm_offsets)
- cp -f $(asm-offsets) lib/generated/
+$(foreach o,$(asm-offsets),$(eval $(call gen_asm_offsets_rules, $(o:.h=))))
OBJDIRS += lib/generated
--
2.47.1
next prev parent reply other threads:[~2025-01-10 11:13 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-10 11:12 [kvm-unit-tests PATCH v6 0/5] riscv: add SBI SSE extension tests Clément Léger
2025-01-10 11:12 ` Clément Léger [this message]
2025-01-10 11:12 ` [kvm-unit-tests PATCH v6 2/5] riscv: use asm-offsets to generate SBI_EXT_HSM values Clément Léger
2025-01-15 11:53 ` Andrew Jones
2025-01-10 11:12 ` [kvm-unit-tests PATCH v6 3/5] riscv: Add "-deps" handling for tests Clément Léger
2025-01-10 11:12 ` [kvm-unit-tests PATCH v6 4/5] riscv: lib: Add SBI SSE extension definitions Clément Léger
2025-01-15 12:06 ` Andrew Jones
2025-01-10 11:12 ` [kvm-unit-tests PATCH v6 5/5] riscv: sbi: Add SSE extension tests Clément Léger
2025-01-15 13:12 ` Andrew Jones
2025-01-13 14:11 ` [kvm-unit-tests PATCH v6 0/5] riscv: add SBI " Andrew Jones
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=20250110111247.2963146-2-cleger@rivosinc.com \
--to=cleger@rivosinc.com \
--cc=ajones@ventanamicro.com \
--cc=andrew.jones@linux.dev \
--cc=apatel@ventanamicro.com \
--cc=atishp@rivosinc.com \
--cc=kvm-riscv@lists.infradead.org \
--cc=kvm@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox