remove dups in x86 and x86_64 variables

Currently the Xen build uses x86 and x86_64 variables as well as
CONFIG_X86 and CONFIG_X86_64. This just removes the duplication. The
CONFIG_ variables are now managed by Kconfig but existed previously so
this duplication existed prior to the Kconfig migration.

Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Feng Wu <feng.wu@intel.com>
$(CONFIG_X86_64) -> y in x86 makefiles.
$(CONFIG_X86_64) -> $(CONFIG_X86) in non-x86 makefiles.

Signed-off-by: Jan Beulich <jbeulich@suse.com>

diff --git a/xen/Rules.mk b/xen/Rules.mk
index bdd8ccf5fa9c63e5a2be1b04d172005c7a636d17..8bd109825e6284c33a06951819d8fc904ea699c0 100644 (file)
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -45,7 +45,7 @@ ALL_OBJS-y               += $(BASEDIR)/common/built_in.o
 ALL_OBJS-y               += $(BASEDIR)/drivers/built_in.o
 ALL_OBJS-y               += $(BASEDIR)/xsm/built_in.o
 ALL_OBJS-y               += $(BASEDIR)/arch/$(TARGET_ARCH)/built_in.o
-ALL_OBJS-$(x86)          += $(BASEDIR)/crypto/built_in.o
+ALL_OBJS-$(CONFIG_X86)   += $(BASEDIR)/crypto/built_in.o
 
 CFLAGS += -nostdinc -fno-builtin -fno-common
 CFLAGS += -Werror -Wredundant-decls -Wno-pointer-arith

diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
index d4e507a06f0a2044e154e5bf6d854e2828a83dc1..8e6e9019da5be273ec3fc426eac53f1179f215ac 100644 (file)
--- a/xen/arch/x86/Makefile
+++ b/xen/arch/x86/Makefile
@@ -4,8 +4,7 @@ subdir-y += genapic
 subdir-y += hvm
 subdir-y += mm
 subdir-y += oprofile
-
-subdir-$(x86_64) += x86_64
+subdir-y += x86_64
 
 obj-bin-y += alternative.init.o
 obj-y += apic.o
@@ -67,8 +66,8 @@ obj-$(crash_debug) += gdbstub.o
 
 x86_emulate.o: x86_emulate/x86_emulate.c x86_emulate/x86_emulate.h
 
-efi-$(x86_64) := $(shell if [ ! -r $(BASEDIR)/include/xen/compile.h -o \
-                                -O $(BASEDIR)/include/xen/compile.h ]; then \
+efi-y := $(shell if [ ! -r $(BASEDIR)/include/xen/compile.h -o \
+                      -O $(BASEDIR)/include/xen/compile.h ]; then \
                          echo '$(TARGET).efi'; fi)
 
 $(TARGET): $(TARGET)-syms $(efi-y) boot/mkelf32

diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
index 4ca69a1650500e87567321962079ce5848cf91b4..b76a7547a32521728def69e10f8cac596bdb3b3b 100644 (file)
--- a/xen/arch/x86/Rules.mk
+++ b/xen/arch/x86/Rules.mk
@@ -22,10 +22,6 @@ $(call as-insn-check,CFLAGS,CC,".equ \"x\"$$(comma)1", \
                      -U__OBJECT_LABEL__ -DHAVE_GAS_QUOTED_SYM \
                      '-D__OBJECT_LABEL__=$(subst $(BASEDIR)/,,$(CURDIR))/$$@')
 
-x86 := y
-x86_32 := n
-x86_64 := y
-
 shadow-paging ?= y
 bigmem        ?= n
 

diff --git a/xen/arch/x86/efi/Makefile b/xen/arch/x86/efi/Makefile
index 1daa7ac777db4ebc3a8a48f8b4b9d6daf4c225cc..50994306009649ee78462fb34ddc538ed44f1f64 100644 (file)
--- a/xen/arch/x86/efi/Makefile
+++ b/xen/arch/x86/efi/Makefile
@@ -4,7 +4,7 @@ obj-y += stub.o
 
 create = test -e $(1) || touch -t 199901010000 $(1)
 
-efi := $(filter y,$(x86_64)$(shell rm -f disabled))
+efi := y$(shell rm -f disabled)
 efi := $(if $(efi),$(shell $(CC) $(filter-out $(CFLAGS-y) .%.d,$(CFLAGS)) -c check.c 2>disabled && echo y))
 efi := $(if $(efi),$(shell $(LD) -mi386pep --subsystem=10 -o check.efi check.o 2>disabled && echo y))
 efi := $(if $(efi),$(shell rm disabled)y,$(shell $(call create,boot.init.o); $(call create,runtime.o)))

diff --git a/xen/arch/x86/mm/Makefile b/xen/arch/x86/mm/Makefile
index aeccdfc0342fe921e4fc6e1135e2193135e705d9..9804c3a6f492280f6d943dca26e24f576b77c9e2 100644 (file)
--- a/xen/arch/x86/mm/Makefile
+++ b/xen/arch/x86/mm/Makefile
@@ -6,9 +6,9 @@ obj-y += p2m.o p2m-pt.o p2m-ept.o p2m-pod.o
 obj-y += altp2m.o
 obj-y += guest_walk_2.o
 obj-y += guest_walk_3.o
-obj-$(x86_64) += guest_walk_4.o
-obj-$(x86_64) += mem_paging.o
-obj-$(x86_64) += mem_sharing.o
+obj-y += guest_walk_4.o
+obj-y += mem_paging.o
+obj-y += mem_sharing.o
 
 guest_walk_%.o: guest_walk.c Makefile
        $(CC) $(CFLAGS) -DGUEST_PAGING_LEVELS=$* -c $< -o $@

diff --git a/xen/arch/x86/mm/hap/Makefile b/xen/arch/x86/mm/hap/Makefile
index 68f2bb575dfd98465ea368f352b6f79e3dfff568..b6299f3effa1e75a7be5aa8941b876eb2ca07dc2 100644 (file)
--- a/xen/arch/x86/mm/hap/Makefile
+++ b/xen/arch/x86/mm/hap/Makefile
@@ -1,7 +1,7 @@
 obj-y += hap.o
 obj-y += guest_walk_2level.o
 obj-y += guest_walk_3level.o
-obj-$(x86_64) += guest_walk_4level.o
+obj-y += guest_walk_4level.o
 obj-y += nested_hap.o
 obj-y += nested_ept.o
 

diff --git a/xen/common/Makefile b/xen/common/Makefile
index 8ab15badf6f7b411a50902604130acbdc080e5e7..9f8b214edf234ba566ef2074516827879d866a74 100644 (file)
--- a/xen/common/Makefile
+++ b/xen/common/Makefile
@@ -65,7 +65,7 @@ obj-$(xenoprof)    += xenoprof.o
 
 obj-$(CONFIG_COMPAT) += $(addprefix compat/,domain.o kernel.o memory.o multicall.o tmem_xen.o xlat.o)
 
-subdir-$(x86_64) += hvm
+subdir-$(CONFIG_X86) += hvm
 
 subdir-$(coverage) += gcov
 

diff --git a/xen/drivers/acpi/Makefile b/xen/drivers/acpi/Makefile
index 3bb626e578d264f8851f07e6fbb17dabb5145889..d8a42995a6d6e20c4e193ce9e37a18aa29068d92 100644 (file)
--- a/xen/drivers/acpi/Makefile
+++ b/xen/drivers/acpi/Makefile
@@ -1,11 +1,11 @@
 subdir-y += tables
 subdir-y += utilities
-subdir-$(x86) += apei
+subdir-$(CONFIG_X86) += apei
 
 obj-bin-y += tables.init.o
 obj-$(HAS_NUMA) += numa.o
 obj-y += osl.o
 obj-y += pmstat.o
 
-obj-$(x86) += hwregs.o
-obj-$(x86) += reboot.o
+obj-$(CONFIG_X86) += hwregs.o
+obj-$(CONFIG_X86) += reboot.o

diff --git a/xen/drivers/passthrough/Makefile b/xen/drivers/passthrough/Makefile
index a6657c5c091e8e27799e8bd6a3015aab08aed735..ca84e36a3712a9d5589c9865c0ebba8249f95a5d 100644 (file)
--- a/xen/drivers/passthrough/Makefile
+++ b/xen/drivers/passthrough/Makefile
@@ -1,9 +1,9 @@
-subdir-$(x86) += vtd
-subdir-$(x86) += amd
-subdir-$(x86_64) += x86
+subdir-$(CONFIG_X86) += vtd
+subdir-$(CONFIG_X86) += amd
+subdir-$(CONFIG_X86) += x86
 subdir-$(arm) += arm
 
 obj-y += iommu.o
-obj-$(x86) += io.o
+obj-$(CONFIG_X86) += io.o
 obj-$(CONFIG_HAS_PCI) += pci.o
 obj-$(CONFIG_HAS_DEVICE_TREE) += device_tree.o

diff --git a/xen/drivers/passthrough/vtd/Makefile b/xen/drivers/passthrough/vtd/Makefile
index 56d015394548afa0d8fc952453dbe12808f9c1e2..f302653858a046c285f8bdb6a1bca2d6b32ddbde 100644 (file)
--- a/xen/drivers/passthrough/vtd/Makefile
+++ b/xen/drivers/passthrough/vtd/Makefile
@@ -1,4 +1,4 @@
-subdir-$(x86) += x86
+subdir-$(CONFIG_X86) += x86
 
 obj-y += iommu.o
 obj-y += dmar.o