Do not special-case native architecture in mkchecker.py.

From: Bastian Blank <waldi@debian.org>
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

2 files changed, 4 insertions, 13 deletions

diff --git a/tools/include/xen-foreign/Makefile b/tools/include/xen-foreign/Makefile
index 411f043b77..adcbcff58a 100644
--- a/tools/include/xen-foreign/Makefile
+++ b/tools/include/xen-foreign/Makefile
@@ -18,7 +18,6 @@ clean:
 	rm -f checker checker.c
 	rm -f *.pyc *.o *~
 
-ifeq ($(CROSS_COMPILE)$(XEN_TARGET_ARCH),$(XEN_COMPILE_ARCH))
 checker: checker.c $(headers)
 	$(HOSTCC) $(HOSTCFLAGS) -o $@ $<
 
@@ -26,10 +25,6 @@ check-headers: checker
 	./checker > tmp.size
 	diff -u $(ROOT)/foreign/reference.size tmp.size
 	rm tmp.size
-else
-check-headers:
-	@echo "cross build: skipping check"
-endif
 
 x86_32.h: $(MKHEADER_PY) $(ROOT)/arch-x86/xen-x86_32.h $(ROOT)/arch-x86/xen.h $(ROOT)/xen.h
 	python $< $* $@ $(filter %.h,$^)
@@ -41,4 +36,4 @@ ia64.h: $(MKHEADER_PY) $(ROOT)/arch-ia64.h $(ROOT)/xen.h
 	python $< $* $@ $(filter %.h,$^)
 
 checker.c: $(MKCHECKER_PY)
-	python $< $(XEN_TARGET_ARCH) $@ $(architectures)
+	python $< $@ $(architectures)
diff --git a/xen/include/public/foreign/mkchecker.py b/xen/include/public/foreign/mkchecker.py
index 9da1e2b1d1..98f8c2396b 100644
--- a/xen/include/public/foreign/mkchecker.py
+++ b/xen/include/public/foreign/mkchecker.py
@@ -4,9 +4,8 @@ import sys;
 from structs import structs;
 
 # command line arguments
-arch    = sys.argv[1];
-outfile = sys.argv[2];
-archs   = sys.argv[3:];
+outfile = sys.argv[1];
+archs   = sys.argv[2:];
 
 f = open(outfile, "w");
 f.write('''
@@ -38,10 +37,7 @@ f.write('\tprintf("\\n");');
 for struct in structs:
     f.write('\tprintf("%%-25s |", "%s");\n' % struct);
     for a in archs:
-        if a == arch:
-            s = struct; # native
-        else:
-            s = struct + "_" + a;
+        s = struct + "_" + a;
         f.write('#ifdef %s_has_no_%s\n' % (a, struct));
         f.write('\tprintf("%8s", "-");\n');
         f.write("#else\n");