ia64/xen-unstable

changeset 10517:85958f34f183

[IA64] Remove kludge in Makefile to build asm-xsi-offsets.h

Add missing include files in HDRS

Signed-off-by: Tristan Gingold <tristan.gingold@bull.net>
author awilliam@xenbuild.aw
date Mon Jun 26 14:41:54 2006 -0600 (2006-06-26)
parents 7c9692adcca7
children e97e31e26bd5
files xen/arch/ia64/Makefile xen/arch/ia64/Rules.mk xen/arch/ia64/xen/domain.c xen/arch/ia64/xen/faults.c xen/arch/ia64/xen/hyperprivop.S xen/arch/ia64/xen/xenasm.S xen/include/asm-ia64/offsets.h
line diff
     1.1 --- a/xen/arch/ia64/Makefile	Mon Jun 26 14:34:18 2006 -0600
     1.2 +++ b/xen/arch/ia64/Makefile	Mon Jun 26 14:41:54 2006 -0600
     1.3 @@ -21,9 +21,12 @@ subdir-y += linux-xen
     1.4  	$(NM) -n $(TARGET)-syms | grep -v '\( [aUw] \)\|\(__crc_\)\|\( \$[adt]\)'\
     1.5  		 > $(BASEDIR)/System.map
     1.6  
     1.7 +# Headers do not depend on auto-generated header, but object files do.
     1.8  HDRS    := $(subst $(BASEDIR)/include/asm-ia64/asm-xsi-offsets.h,,$(HDRS))
     1.9 -asm-offsets.s: asm-offsets.c $(BASEDIR)/include/asm-ia64/.offsets.h.stamp $(BASEDIR)/include/asm-ia64/asm-xsi-offsets.h
    1.10 -	$(CC) $(CFLAGS) -S -o $@ $<
    1.11 +$(ALL_OBJS): $(BASEDIR)/include/asm-ia64/asm-xsi-offsets.h
    1.12 +
    1.13 +asm-offsets.s: asm-offsets.c $(BASEDIR)/include/asm-ia64/.offsets.h.stamp
    1.14 +	$(CC) $(CFLAGS) -DGENERATE_ASM_OFFSETS -DIA64_TASK_SIZE=0 -S -o $@ $<
    1.15  
    1.16  asm-xsi-offsets.s: asm-xsi-offsets.c $(HDRS)
    1.17  	$(CC) $(CFLAGS) -S -o $@ $<
    1.18 @@ -63,14 +66,6 @@ asm-xsi-offsets.s: asm-xsi-offsets.c $(H
    1.19  	 || ln -s ../../../include/asm-x86/hvm/vioapic.h $(BASEDIR)/include/asm-ia64/hvm/vioapic.h
    1.20  	[ -e $(BASEDIR)/arch/ia64/vmx/hvm_vioapic.c ] \
    1.21  	 || ln -s ../../../arch/x86/hvm/vioapic.c $(BASEDIR)/arch/ia64/vmx/hvm_vioapic.c
    1.22 -# Solve circular reference on asm-offsets.h
    1.23 -	[ -f $(BASEDIR)/include/asm-ia64/asm-offsets.h ] \
    1.24 -	 || echo "#define IA64_TASK_SIZE 0" > $(BASEDIR)/include/asm-ia64/asm-offsets.h
    1.25 -	[ -f $(BASEDIR)/include/asm-ia64/asm-xsi-offsets.h ] \
    1.26 -	 || touch $(BASEDIR)/include/asm-ia64/asm-xsi-offsets.h
    1.27 -#Bad hack. Force asm-offsets.h out-of-date
    1.28 -	 sleep 1
    1.29 -	 touch $@
    1.30  
    1.31  # I'm sure a Makefile wizard would know a better way to do this
    1.32  xen.lds.s: xen/xen.lds.S
     2.1 --- a/xen/arch/ia64/Rules.mk	Mon Jun 26 14:34:18 2006 -0600
     2.2 +++ b/xen/arch/ia64/Rules.mk	Mon Jun 26 14:41:54 2006 -0600
     2.3 @@ -44,3 +44,16 @@ CFLAGS	+= -Wa,--fatal-warnings -Werror -
     2.4  endif
     2.5  
     2.6  LDFLAGS := -g
     2.7 +
     2.8 +# Additionnal IA64 include dirs.
     2.9 +HDRS += $(wildcard $(BASEDIR)/include/asm-ia64/linux-null/asm/*.h)
    2.10 +HDRS += $(wildcard $(BASEDIR)/include/asm-ia64/linux-null/asm/sn/*.h)
    2.11 +HDRS += $(wildcard $(BASEDIR)/include/asm-ia64/linux-null/linux/*.h)
    2.12 +HDRS += $(wildcard $(BASEDIR)/include/asm-ia64/linux-xen/asm/*.h)
    2.13 +HDRS += $(wildcard $(BASEDIR)/include/asm-ia64/linux-xen/asm/sn/*.h)
    2.14 +HDRS += $(wildcard $(BASEDIR)/include/asm-ia64/linux-xen/linux/*.h)
    2.15 +HDRS += $(wildcard $(BASEDIR)/include/asm-ia64/linux/*.h)
    2.16 +HDRS += $(wildcard $(BASEDIR)/include/asm-ia64/linux/asm-generic/*.h)
    2.17 +HDRS += $(wildcard $(BASEDIR)/include/asm-ia64/linux/asm/*.h)
    2.18 +HDRS += $(wildcard $(BASEDIR)/include/asm-ia64/linux/byteorder/*.h)
    2.19 +HDRS += $(wildcard $(BASEDIR)/include/asm-ia64/hvm/*.h)
     3.1 --- a/xen/arch/ia64/xen/domain.c	Mon Jun 26 14:34:18 2006 -0600
     3.2 +++ b/xen/arch/ia64/xen/domain.c	Mon Jun 26 14:41:54 2006 -0600
     3.3 @@ -24,6 +24,7 @@
     3.4  #include <xen/softirq.h>
     3.5  #include <xen/mm.h>
     3.6  #include <xen/iocap.h>
     3.7 +#include <asm/asm-xsi-offsets.h>
     3.8  #include <asm/ptrace.h>
     3.9  #include <asm/system.h>
    3.10  #include <asm/io.h>
     4.1 --- a/xen/arch/ia64/xen/faults.c	Mon Jun 26 14:34:18 2006 -0600
     4.2 +++ b/xen/arch/ia64/xen/faults.c	Mon Jun 26 14:41:54 2006 -0600
     4.3 @@ -26,6 +26,7 @@
     4.4  #include <asm/vhpt.h>
     4.5  #include <asm/debugger.h>
     4.6  #include <asm/fpswa.h>
     4.7 +#include <asm/asm-xsi-offsets.h>
     4.8  
     4.9  extern void die_if_kernel(char *str, struct pt_regs *regs, long err);
    4.10  /* FIXME: where these declarations shold be there ? */
     5.1 --- a/xen/arch/ia64/xen/hyperprivop.S	Mon Jun 26 14:34:18 2006 -0600
     5.2 +++ b/xen/arch/ia64/xen/hyperprivop.S	Mon Jun 26 14:41:54 2006 -0600
     5.3 @@ -13,6 +13,7 @@
     5.4  #include <asm/processor.h>
     5.5  #include <asm/system.h>
     5.6  #include <asm/debugger.h>
     5.7 +#include <asm/asm-xsi-offsets.h>
     5.8  #include <public/arch-ia64.h>
     5.9  
    5.10  
     6.1 --- a/xen/arch/ia64/xen/xenasm.S	Mon Jun 26 14:34:18 2006 -0600
     6.2 +++ b/xen/arch/ia64/xen/xenasm.S	Mon Jun 26 14:41:54 2006 -0600
     6.3 @@ -10,6 +10,7 @@
     6.4  #include <asm/processor.h>
     6.5  #include <asm/pgtable.h>
     6.6  #include <asm/vhpt.h>
     6.7 +#include <asm/asm-xsi-offsets.h>
     6.8  #include <public/arch-ia64.h>
     6.9  	
    6.10  // Change rr7 to the passed value while ensuring
     7.1 --- a/xen/include/asm-ia64/offsets.h	Mon Jun 26 14:34:18 2006 -0600
     7.2 +++ b/xen/include/asm-ia64/offsets.h	Mon Jun 26 14:41:54 2006 -0600
     7.3 @@ -2,7 +2,8 @@
     7.4  #ifndef __IA64_OFFSETS_H
     7.5  #define __IA64_OFFSETS_H
     7.6  
     7.7 +#ifndef GENERATE_ASM_OFFSETS
     7.8  #include <asm/asm-offsets.h>
     7.9 -#include <asm/asm-xsi-offsets.h>
    7.10 +#endif
    7.11  
    7.12  #endif /* __IA64_OFFSETS_H */