[Xen-changelog] [xen-unstable] Do not special-case native architecture in mkchecker.py.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1201438990 0
# Node ID f605f35bd6ba7ce71e7c8ab2220dc66b0f2fe748
# Parent  240d78e0bb0baced6a0cec1288c80b3624ab0ea2
Do not special-case native architecture in mkchecker.py.
From: Bastian Blank <waldi@xxxxxxxxxx>
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 tools/include/xen-foreign/Makefile      |    7 +------
 xen/include/public/foreign/mkchecker.py |   10 +++-------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff -r 240d78e0bb0b -r f605f35bd6ba tools/include/xen-foreign/Makefile
--- a/tools/include/xen-foreign/Makefile        Sun Jan 27 12:59:30 2008 +0000
+++ b/tools/include/xen-foreign/Makefile        Sun Jan 27 13:03:10 2008 +0000
@@ -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
        python $< $* $@ $(filter %.h,$^)
 
 checker.c: $(MKCHECKER_PY)
-       python $< $(XEN_TARGET_ARCH) $@ $(architectures)
+       python $< $@ $(architectures)
diff -r 240d78e0bb0b -r f605f35bd6ba xen/include/public/foreign/mkchecker.py
--- a/xen/include/public/foreign/mkchecker.py   Sun Jan 27 12:59:30 2008 +0000
+++ b/xen/include/public/foreign/mkchecker.py   Sun Jan 27 13:03:10 2008 +0000
@@ -4,9 +4,8 @@ from structs import structs;
 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 @@ for struct in structs:
 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");

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog