# HG changeset patch
# User gingold@virtu10
# Node ID 141df21ba43114ee0d68e7253c282e1a12fab373
# Parent  ac796efcbbc690f1bd85e7e07bcd3f6d374830c0
Remove kludge to build asm-xsi-offsets.h
Add missing include files in HDRS

Signed-off-by: Tristan Gingold <tristan.gingold@xxxxxxxx>

diff -r ac796efcbbc6 -r 141df21ba431 xen/arch/ia64/Makefile
--- a/xen/arch/ia64/Makefile	Mon Jun 26 14:28:29 2006 +0200
+++ b/xen/arch/ia64/Makefile	Mon Jun 26 15:19:00 2006 +0200
@@ -21,9 +21,12 @@ subdir-y += linux-xen
 	$(NM) -n $(TARGET)-syms | grep -v '\( [aUw] \)\|\(__crc_\)\|\( \$[adt]\)'\
 		 > $(BASEDIR)/System.map
 
+# Headers do not depend on auto-generated header, but object files do.
 HDRS    := $(subst $(BASEDIR)/include/asm-ia64/asm-xsi-offsets.h,,$(HDRS))
-asm-offsets.s: asm-offsets.c $(BASEDIR)/include/asm-ia64/.offsets.h.stamp $(BASEDIR)/include/asm-ia64/asm-xsi-offsets.h
-	$(CC) $(CFLAGS) -S -o $@ $<
+$(ALL_OBJS): $(BASEDIR)/include/asm-ia64/asm-xsi-offsets.h
+
+asm-offsets.s: asm-offsets.c $(BASEDIR)/include/asm-ia64/.offsets.h.stamp
+	$(CC) $(CFLAGS) -DGENERATE_ASM_OFFSETS -DIA64_TASK_SIZE=0 -S -o $@ $<
 
 asm-xsi-offsets.s: asm-xsi-offsets.c $(HDRS)
 	$(CC) $(CFLAGS) -S -o $@ $<
@@ -63,14 +66,6 @@ asm-xsi-offsets.s: asm-xsi-offsets.c $(H
 	 || ln -s ../../../include/asm-x86/hvm/vioapic.h $(BASEDIR)/include/asm-ia64/hvm/vioapic.h
 	[ -e $(BASEDIR)/arch/ia64/vmx/hvm_vioapic.c ] \
 	 || ln -s ../../../arch/x86/hvm/vioapic.c $(BASEDIR)/arch/ia64/vmx/hvm_vioapic.c
-# Solve circular reference on asm-offsets.h
-	[ -f $(BASEDIR)/include/asm-ia64/asm-offsets.h ] \
-	 || echo "#define IA64_TASK_SIZE 0" > $(BASEDIR)/include/asm-ia64/asm-offsets.h
-	[ -f $(BASEDIR)/include/asm-ia64/asm-xsi-offsets.h ] \
-	 || touch $(BASEDIR)/include/asm-ia64/asm-xsi-offsets.h
-#Bad hack. Force asm-offsets.h out-of-date
-	 sleep 1
-	 touch $@
 
 # I'm sure a Makefile wizard would know a better way to do this
 xen.lds.s: xen/xen.lds.S
diff -r ac796efcbbc6 -r 141df21ba431 xen/arch/ia64/Rules.mk
--- a/xen/arch/ia64/Rules.mk	Mon Jun 26 14:28:29 2006 +0200
+++ b/xen/arch/ia64/Rules.mk	Mon Jun 26 15:19:00 2006 +0200
@@ -44,3 +44,16 @@ endif
 endif
 
 LDFLAGS := -g
+
+# Additionnal IA64 include dirs.
+HDRS += $(wildcard $(BASEDIR)/include/asm-ia64/linux-null/asm/*.h)
+HDRS += $(wildcard $(BASEDIR)/include/asm-ia64/linux-null/asm/sn/*.h)
+HDRS += $(wildcard $(BASEDIR)/include/asm-ia64/linux-null/linux/*.h)
+HDRS += $(wildcard $(BASEDIR)/include/asm-ia64/linux-xen/asm/*.h)
+HDRS += $(wildcard $(BASEDIR)/include/asm-ia64/linux-xen/asm/sn/*.h)
+HDRS += $(wildcard $(BASEDIR)/include/asm-ia64/linux-xen/linux/*.h)
+HDRS += $(wildcard $(BASEDIR)/include/asm-ia64/linux/*.h)
+HDRS += $(wildcard $(BASEDIR)/include/asm-ia64/linux/asm-generic/*.h)
+HDRS += $(wildcard $(BASEDIR)/include/asm-ia64/linux/asm/*.h)
+HDRS += $(wildcard $(BASEDIR)/include/asm-ia64/linux/byteorder/*.h)
+HDRS += $(wildcard $(BASEDIR)/include/asm-ia64/hvm/*.h)
diff -r ac796efcbbc6 -r 141df21ba431 xen/arch/ia64/xen/domain.c
--- a/xen/arch/ia64/xen/domain.c	Mon Jun 26 14:28:29 2006 +0200
+++ b/xen/arch/ia64/xen/domain.c	Mon Jun 26 15:19:00 2006 +0200
@@ -24,6 +24,7 @@
 #include <xen/softirq.h>
 #include <xen/mm.h>
 #include <xen/iocap.h>
+#include <asm/asm-xsi-offsets.h>
 #include <asm/ptrace.h>
 #include <asm/system.h>
 #include <asm/io.h>
diff -r ac796efcbbc6 -r 141df21ba431 xen/arch/ia64/xen/faults.c
--- a/xen/arch/ia64/xen/faults.c	Mon Jun 26 14:28:29 2006 +0200
+++ b/xen/arch/ia64/xen/faults.c	Mon Jun 26 15:19:00 2006 +0200
@@ -26,6 +26,7 @@
 #include <asm/vhpt.h>
 #include <asm/debugger.h>
 #include <asm/fpswa.h>
+#include <asm/asm-xsi-offsets.h>
 
 extern void die_if_kernel(char *str, struct pt_regs *regs, long err);
 /* FIXME: where these declarations shold be there ? */
diff -r ac796efcbbc6 -r 141df21ba431 xen/arch/ia64/xen/hyperprivop.S
--- a/xen/arch/ia64/xen/hyperprivop.S	Mon Jun 26 14:28:29 2006 +0200
+++ b/xen/arch/ia64/xen/hyperprivop.S	Mon Jun 26 15:19:00 2006 +0200
@@ -13,6 +13,7 @@
 #include <asm/processor.h>
 #include <asm/system.h>
 #include <asm/debugger.h>
+#include <asm/asm-xsi-offsets.h>
 #include <public/arch-ia64.h>
 
 
diff -r ac796efcbbc6 -r 141df21ba431 xen/arch/ia64/xen/xenasm.S
--- a/xen/arch/ia64/xen/xenasm.S	Mon Jun 26 14:28:29 2006 +0200
+++ b/xen/arch/ia64/xen/xenasm.S	Mon Jun 26 15:19:00 2006 +0200
@@ -10,6 +10,7 @@
 #include <asm/processor.h>
 #include <asm/pgtable.h>
 #include <asm/vhpt.h>
+#include <asm/asm-xsi-offsets.h>
 #include <public/arch-ia64.h>
 	
 // Change rr7 to the passed value while ensuring
diff -r ac796efcbbc6 -r 141df21ba431 xen/include/asm-ia64/offsets.h
--- a/xen/include/asm-ia64/offsets.h	Mon Jun 26 14:28:29 2006 +0200
+++ b/xen/include/asm-ia64/offsets.h	Mon Jun 26 15:19:00 2006 +0200
@@ -2,7 +2,8 @@
 #ifndef __IA64_OFFSETS_H
 #define __IA64_OFFSETS_H
 
+#ifndef GENERATE_ASM_OFFSETS
 #include <asm/asm-offsets.h>
-#include <asm/asm-xsi-offsets.h>
+#endif
 
 #endif /* __IA64_OFFSETS_H */