diff options
Diffstat (limited to '0006-build-remove-TARGET_ARCH-a-duplicate-of-SRCARCH.patch')
| -rw-r--r-- | 0006-build-remove-TARGET_ARCH-a-duplicate-of-SRCARCH.patch | 123 |
1 files changed, 0 insertions, 123 deletions
diff --git a/0006-build-remove-TARGET_ARCH-a-duplicate-of-SRCARCH.patch b/0006-build-remove-TARGET_ARCH-a-duplicate-of-SRCARCH.patch deleted file mode 100644 index 9eef37a..0000000 --- a/0006-build-remove-TARGET_ARCH-a-duplicate-of-SRCARCH.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 36e84ea02e1e8dce8f3a4e9351ab1c72dec3c11e Mon Sep 17 00:00:00 2001 -From: Anthony PERARD <anthony.perard@citrix.com> -Date: Wed, 5 Jul 2023 08:29:49 +0200 -Subject: [PATCH 06/55] build: remove TARGET_ARCH, a duplicate of SRCARCH - -The same command is used to generate the value of both $(TARGET_ARCH) -and $(SRCARCH), as $(ARCH) is an alias for $(XEN_TARGET_ARCH). - -Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> -Reviewed-by: Jan Beulich <jbeulich@suse.com> -(cherry picked from commit ac27b3beb9b7b423d5563768de890c7594c21b4e) ---- - xen/Makefile | 20 ++++++++------------ - xen/Rules.mk | 2 +- - xen/build.mk | 6 +++--- - 3 files changed, 12 insertions(+), 16 deletions(-) - -diff --git a/xen/Makefile b/xen/Makefile -index 6e89bcf348..1a3b9a081f 100644 ---- a/xen/Makefile -+++ b/xen/Makefile -@@ -242,10 +242,6 @@ SRCARCH := $(shell echo $(ARCH) | \ - -e 's/riscv.*/riscv/g') - export ARCH SRCARCH - --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') -- - export CONFIG_SHELL := $(SHELL) - export CC CXX LD NM OBJCOPY OBJDUMP ADDR2LINE - export YACC = $(if $(BISON),$(BISON),bison) -@@ -262,7 +258,7 @@ export XEN_TREEWIDE_CFLAGS := $(CFLAGS) - ifneq ($(shell $(CC) --version 2>&1 | head -n 1 | grep clang),) - CLANG_FLAGS := - --ifeq ($(TARGET_ARCH),x86) -+ifeq ($(SRCARCH),x86) - # The tests to select whether the integrated assembler is usable need to happen - # before testing any assembler features, or else the result of the tests would - # be stale if the integrated assembler is not used. -@@ -430,22 +426,22 @@ endif - - ifdef building_out_of_srctree - CFLAGS += -I$(objtree)/include -- CFLAGS += -I$(objtree)/arch/$(TARGET_ARCH)/include -+ CFLAGS += -I$(objtree)/arch/$(SRCARCH)/include - endif - CFLAGS += -I$(srctree)/include --CFLAGS += -I$(srctree)/arch/$(TARGET_ARCH)/include -+CFLAGS += -I$(srctree)/arch/$(SRCARCH)/include - - # Note that link order matters! - ALL_OBJS-y := common/built_in.o - ALL_OBJS-y += drivers/built_in.o - ALL_OBJS-y += lib/built_in.o - ALL_OBJS-y += xsm/built_in.o --ALL_OBJS-y += arch/$(TARGET_ARCH)/built_in.o -+ALL_OBJS-y += arch/$(SRCARCH)/built_in.o - ALL_OBJS-$(CONFIG_CRYPTO) += crypto/built_in.o - - ALL_LIBS-y := lib/lib.a - --include $(srctree)/arch/$(TARGET_ARCH)/arch.mk -+include $(srctree)/arch/$(SRCARCH)/arch.mk - - # define new variables to avoid the ones defined in Config.mk - export XEN_CFLAGS := $(CFLAGS) -@@ -587,11 +583,11 @@ $(TARGET): outputmakefile FORCE - $(Q)$(MAKE) $(build)=tools - $(Q)$(MAKE) $(build)=. include/xen/compile.h - $(Q)$(MAKE) $(build)=include all -- $(Q)$(MAKE) $(build)=arch/$(TARGET_ARCH) include -- $(Q)$(MAKE) $(build)=. arch/$(TARGET_ARCH)/include/asm/asm-offsets.h -+ $(Q)$(MAKE) $(build)=arch/$(SRCARCH) include -+ $(Q)$(MAKE) $(build)=. arch/$(SRCARCH)/include/asm/asm-offsets.h - $(Q)$(MAKE) $(build)=. MKRELOC=$(MKRELOC) 'ALL_OBJS=$(ALL_OBJS-y)' 'ALL_LIBS=$(ALL_LIBS-y)' $@ - --SUBDIRS = xsm arch/$(TARGET_ARCH) common drivers lib test -+SUBDIRS = xsm arch/$(SRCARCH) common drivers lib test - define all_sources - ( find include -type f -name '*.h' -print; \ - find $(SUBDIRS) -type f -name '*.[chS]' -print ) -diff --git a/xen/Rules.mk b/xen/Rules.mk -index 59072ae8df..8af3dd7277 100644 ---- a/xen/Rules.mk -+++ b/xen/Rules.mk -@@ -180,7 +180,7 @@ cpp_flags = $(filter-out -Wa$(comma)% -flto,$(1)) - c_flags = -MMD -MP -MF $(depfile) $(XEN_CFLAGS) - a_flags = -MMD -MP -MF $(depfile) $(XEN_AFLAGS) - --include $(srctree)/arch/$(TARGET_ARCH)/Rules.mk -+include $(srctree)/arch/$(SRCARCH)/Rules.mk - - c_flags += $(_c_flags) - a_flags += $(_c_flags) -diff --git a/xen/build.mk b/xen/build.mk -index d049d3a53a..9ecb104f1e 100644 ---- a/xen/build.mk -+++ b/xen/build.mk -@@ -41,11 +41,11 @@ 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)/$(ARCH)/asm-offsets.c -+asm-offsets.s: arch/$(SRCARCH)/$(ARCH)/asm-offsets.c - $(CC) $(call cpp_flags,$(c_flags)) -S -g0 -o $@.new -MQ $@ $< - $(call move-if-changed,$@.new,$@) - --arch/$(TARGET_ARCH)/include/asm/asm-offsets.h: asm-offsets.s -+arch/$(SRCARCH)/include/asm/asm-offsets.h: asm-offsets.s - @(set -e; \ - echo "/*"; \ - echo " * DO NOT MODIFY."; \ -@@ -87,4 +87,4 @@ endif - targets += prelink.o - - $(TARGET): prelink.o FORCE -- $(Q)$(MAKE) $(build)=arch/$(TARGET_ARCH) $@ -+ $(Q)$(MAKE) $(build)=arch/$(SRCARCH) $@ --- -2.42.0 - |