aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@citrix.com>2013-02-22 08:57:40 +0000
committerIan Campbell <ian.campbell@citrix.com>2013-02-22 12:14:50 +0000
commit0d6e920c68ff0271bfd4ac154683d0573dd3ab39 (patch)
treee6694728364823ba177b0ef705720e1809d63c1a
parenta0d110801d701c43e7b8c73dbd6b2444a10a7cdb (diff)
downloadxen-0d6e920c68ff0271bfd4ac154683d0573dd3ab39.tar.gz
xen-0d6e920c68ff0271bfd4ac154683d0573dd3ab39.tar.bz2
xen-0d6e920c68ff0271bfd4ac154683d0573dd3ab39.zip
tools: s/arm/arm32/ in foreign header checks.
Also define __arm__ARM32 as required. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
-rw-r--r--.gitignore2
-rw-r--r--tools/include/xen-foreign/Makefile4
-rw-r--r--tools/include/xen-foreign/mkheader.py6
-rw-r--r--tools/include/xen-foreign/reference.size2
4 files changed, 9 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index ce6eeb3868..3834e4b8bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -366,7 +366,7 @@ tools/include/xen-foreign/checker.c
tools/include/xen-foreign/structs.pyc
tools/include/xen-foreign/x86_32.h
tools/include/xen-foreign/x86_64.h
-tools/include/xen-foreign/arm.h
+tools/include/xen-foreign/arm32.h
.git
tools/misc/xen-hptool
diff --git a/tools/include/xen-foreign/Makefile b/tools/include/xen-foreign/Makefile
index cfaf790d45..5bc2d46b3e 100644
--- a/tools/include/xen-foreign/Makefile
+++ b/tools/include/xen-foreign/Makefile
@@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk
ROOT = $(XEN_ROOT)/xen/include/public
-architectures := arm x86_32 x86_64
+architectures := arm32 x86_32 x86_64
headers := $(patsubst %, %.h, $(architectures))
.PHONY: all clean check-headers
@@ -22,7 +22,7 @@ check-headers: checker
diff -u reference.size tmp.size
rm tmp.size
-arm.h: mkheader.py structs.py $(ROOT)/arch-arm.h
+arm32.h: mkheader.py structs.py $(ROOT)/arch-arm.h
$(PYTHON) $< $* $@ $(filter %.h,$^)
x86_32.h: mkheader.py structs.py $(ROOT)/arch-x86/xen-x86_32.h $(ROOT)/arch-x86/xen.h $(ROOT)/xen.h
diff --git a/tools/include/xen-foreign/mkheader.py b/tools/include/xen-foreign/mkheader.py
index d189b076e8..eee28f3094 100644
--- a/tools/include/xen-foreign/mkheader.py
+++ b/tools/include/xen-foreign/mkheader.py
@@ -17,11 +17,15 @@ header = {};
footer = {};
#arm
-inttypes["arm"] = {
+inttypes["arm32"] = {
"unsigned long" : "uint32_t",
"long" : "uint32_t",
"xen_pfn_t" : "uint64_t",
};
+header["arm32"] = """
+#define __arm___ARM32 1
+""";
+
# x86_32
inttypes["x86_32"] = {
diff --git a/tools/include/xen-foreign/reference.size b/tools/include/xen-foreign/reference.size
index a2cbfd60f3..9f1bfac0c3 100644
--- a/tools/include/xen-foreign/reference.size
+++ b/tools/include/xen-foreign/reference.size
@@ -1,5 +1,5 @@
-structs | arm x86_32 x86_64
+structs | arm32 x86_32 x86_64
start_info | - 1112 1168
trap_info | - 8 16