build: Rename obj-perarch to obj-perbits

As part of adding ARM support, we'll want to have something else named arch in
the build system.  obj-perbits is a better name anyway for what this actually
does.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

diff --git a/build/common.mk b/build/common.mk
index f81b2dab12f1175d0335cf06bbc9472fe29b6df1..90c216960c9c73c1f4c2e46669d1d3cec33af2bb 100644 (file)
--- a/build/common.mk
+++ b/build/common.mk
@@ -40,7 +40,7 @@ COMMON_CFLAGS-x86_64 := -m64
 defcfg-pv    := $(ROOT)/config/default-pv.cfg.in
 defcfg-hvm   := $(ROOT)/config/default-hvm.cfg.in
 
-obj-perarch :=
+obj-perbits :=
 obj-perenv  :=
 include $(ROOT)/build/files.mk
 
@@ -57,9 +57,9 @@ link-$(1) := $(ROOT)/arch/x86/link-$(1).lds
 
 LDFLAGS_$(1) := -T $$(link-$(1)) -nostdlib $(LDFLAGS-y)
 
-# Needs to pick up test-provided obj-perenv and obj-perarch
+# Needs to pick up test-provided obj-perenv and obj-perbits
 DEPS-$(1) = \
-       $$(obj-perarch:%.o=%-$($(1)_arch).o) \
+       $$(obj-perbits:%.o=%-$($(1)_arch).o) \
        $$(obj-$(1):%.o=%-$(1).o) $$(obj-perenv:%.o=%-$(1).o)
 
 # Generate .lds with appropriate flags

diff --git a/build/files.mk b/build/files.mk
index af31c65961f8f20e11338dd49c5e7885b062d09a..97ce7951f8c52105f94e4cdfc5d3411ce4ae719f 100644 (file)
--- a/build/files.mk
+++ b/build/files.mk
@@ -1,22 +1,22 @@
 # Files compiled and linked for different architectures and environments
 #
-# obj-perarch  get compiled once per architecture
+# obj-perbits  get compiled once per bitness
 # obj-perenv   get get compiled once for each environment
 # obj-$(env)   are objects unique to a specific environment
 
-obj-perarch += $(ROOT)/common/console.o
-obj-perarch += $(ROOT)/common/exlog.o
-obj-perarch += $(ROOT)/common/extable.o
-obj-perarch += $(ROOT)/common/grant_table.o
-obj-perarch += $(ROOT)/common/heapsort.o
-obj-perarch += $(ROOT)/common/lib.o
-obj-perarch += $(ROOT)/common/libc/stdio.o
-obj-perarch += $(ROOT)/common/libc/string.o
-obj-perarch += $(ROOT)/common/libc/vsnprintf.o
-obj-perarch += $(ROOT)/common/report.o
-obj-perarch += $(ROOT)/common/setup.o
-obj-perarch += $(ROOT)/common/xenbus.o
-obj-perarch += $(ROOT)/common/weak-defaults.o
+obj-perbits += $(ROOT)/common/console.o
+obj-perbits += $(ROOT)/common/exlog.o
+obj-perbits += $(ROOT)/common/extable.o
+obj-perbits += $(ROOT)/common/grant_table.o
+obj-perbits += $(ROOT)/common/heapsort.o
+obj-perbits += $(ROOT)/common/lib.o
+obj-perbits += $(ROOT)/common/libc/stdio.o
+obj-perbits += $(ROOT)/common/libc/string.o
+obj-perbits += $(ROOT)/common/libc/vsnprintf.o
+obj-perbits += $(ROOT)/common/report.o
+obj-perbits += $(ROOT)/common/setup.o
+obj-perbits += $(ROOT)/common/xenbus.o
+obj-perbits += $(ROOT)/common/weak-defaults.o
 
 obj-perenv += $(ROOT)/arch/x86/decode.o
 obj-perenv += $(ROOT)/arch/x86/desc.o