Signed-off-by: Anthony PERARD <[email protected]>
---
Notes:
v2:
- new patch
xen/Makefile | 3 +--
xen/build.mk | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/xen/Makefile b/xen/Makefile
index 78d176f04e..bc639a1f80 100644
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -234,7 +234,7 @@ include scripts/Kbuild.include
# we need XEN_TARGET_ARCH to generate the proper config
include $(XEN_ROOT)/Config.mk
-# Set ARCH/SUBARCH appropriately.
+# Set ARCH/SRCARCH appropriately.
ARCH := $(XEN_TARGET_ARCH)
SRCARCH := $(shell echo $(ARCH) | \
@@ -242,7 +242,6 @@ SRCARCH := $(shell echo $(ARCH) | \
-e 's/riscv.*/riscv/g')
export ARCH SRCARCH
-export TARGET_SUBARCH := $(XEN_TARGET_ARCH)
export TARGET_ARCH := $(shell echo $(XEN_TARGET_ARCH) | \
sed -e 's/x86.*/x86/' -e s'/arm\(32\|64\)/arm/g' \
-e s'/riscv.*/riscv/g')
diff --git a/xen/build.mk b/xen/build.mk
index 30d74d4772..7e33e710fd 100644
--- a/xen/build.mk
+++ b/xen/build.mk
@@ -41,7 +41,7 @@ include/xen/compile.h: include/xen/compile.h.in .banner FORCE
targets += include/xen/compile.h
-include $(wildcard .asm-offsets.s.d)
-asm-offsets.s: arch/$(TARGET_ARCH)/$(TARGET_SUBARCH)/asm-offsets.c
+asm-offsets.s: arch/$(TARGET_ARCH)/$(ARCH)/asm-offsets.c
$(CC) $(call cpp_flags,$(c_flags)) -S -g0 -o [email protected] -MQ $@ $<
$(call move-if-changed,[email protected],$@)
--
Anthony PERARD
