ia64/xen-unstable

changeset 9359:cdd11b936a26

Merged.
author emellor@leeni.uk.xensource.com
date Tue Mar 21 11:42:08 2006 +0100 (2006-03-21)
parents a6c078552735 156505f40a8a
children 47a55b3b7b39 92b5fa5e8397
files
line diff
     1.1 --- a/.hgignore	Tue Mar 21 11:39:09 2006 +0100
     1.2 +++ b/.hgignore	Tue Mar 21 11:42:08 2006 +0100
     1.3 @@ -13,6 +13,7 @@
     1.4  .*\.flc$
     1.5  .*\.orig$
     1.6  .*\.rej$
     1.7 +.*/a\.out$
     1.8  ^[^/]*\.bz2$
     1.9  ^TAGS$
    1.10  ^dist/.*$
     2.1 --- a/xen/arch/ia64/Makefile	Tue Mar 21 11:39:09 2006 +0100
     2.2 +++ b/xen/arch/ia64/Makefile	Tue Mar 21 11:42:08 2006 +0100
     2.3 @@ -1,63 +1,23 @@
     2.4  include $(BASEDIR)/Rules.mk
     2.5  
     2.6 -VPATH = xen vmx linux linux-xen
     2.7 -
     2.8 -OBJS = xensetup.o setup.o time.o irq.o process.o smp.o \
     2.9 -	xenmisc.o acpi.o hypercall.o \
    2.10 -	machvec.o dom0_ops.o domain.o hpsimserial.o pcdp.o \
    2.11 -	idle0_task.o pal.o hpsim.o efi.o efi_stub.o ivt.o mm_contig.o \
    2.12 -	xenmem.o sal.o cmdline.o mm_init.o tlb.o smpboot.o \
    2.13 -	extable.o linuxextable.o sort.o xenirq.o xentime.o \
    2.14 -	regionreg.o entry.o unaligned.o privop.o vcpu.o \
    2.15 -	irq_ia64.o irq_lsapic.o vhpt.o xenasm.o hyperprivop.o dom_fw.o \
    2.16 -	sn_console.o # ia64_ksyms.o 
    2.17 -
    2.18 -OBJS += vmx_init.o vmx_virt.o vmx_vcpu.o vmx_process.o vmx_vsa.o vmx_ivt.o\
    2.19 -	vmx_phy_mode.o vmx_utility.o vmx_interrupt.o vmx_entry.o vmmu.o \
    2.20 -	vtlb.o mmio.o vlsapic.o vmx_hypercall.o mm.o vmx_support.o \
    2.21 -	pal_emul.o vmx_irq_ia64.o hvm_vioapic.o
    2.22 -
    2.23 -# lib files from xen/arch/ia64/linux/ (linux/arch/ia64/lib)
    2.24 -OBJS +=	bitop.o clear_page.o flush.o copy_page_mck.o			\
    2.25 -	memset.o strlen.o memcpy_mck.o 					\
    2.26 -	__divsi3.o __udivsi3.o __modsi3.o __umodsi3.o			\
    2.27 -	__divdi3.o __udivdi3.o __moddi3.o __umoddi3.o
    2.28 +subdir-y += xen
    2.29 +subdir-y += vmx
    2.30 +subdir-y += linux
    2.31 +subdir-y += linux-xen
    2.32  
    2.33 -ifeq ($(crash_debug),y)
    2.34 -OBJS += gdbstub.o
    2.35 -endif
    2.36 -
    2.37 -# xen stack unwinder
    2.38 -# unwind_decoder.c is included in unwind.c
    2.39 -OBJS += unwind.o
    2.40 -#unwind.o: CFLAGS += -DUNW_DEBUG=4
    2.41 -
    2.42 -OBJS += process-linux-xen.o
    2.43 +include $(BASEDIR)/Post.mk
    2.44  
    2.45 -# perfmon.o
    2.46 -# unwind.o needed for kernel unwinding (rare)
    2.47 -
    2.48 -OBJS := $(subst $(TARGET_ARCH)/asm-offsets.o,,$(OBJS))
    2.49 -
    2.50 -# remove following line if not privifying in memory
    2.51 -# OBJS += privify.o
    2.52 -
    2.53 -default: $(TARGET)
    2.54 -
    2.55 -$(CURDIR)/arch.o: $(OBJS)
    2.56 -	$(LD) -r -o $@ $(OBJS)
    2.57 -
    2.58 -$(TARGET)-syms: $(ALL_OBJS) head.o xen.lds.s
    2.59 -	$(LD) $(LDFLAGS) -T $(BASEDIR)/arch/$(TARGET_ARCH)/xen.lds.s -N \
    2.60 -		-Map map.out head.o $(ALL_OBJS) -o $@
    2.61 +$(TARGET)-syms: linux-xen/head.o $(ALL_OBJS) xen.lds.s
    2.62 +	$(LD) $(LDFLAGS) -T xen.lds.s -N \
    2.63 +		-Map map.out linux-xen/head.o $(ALL_OBJS) -o $@
    2.64  	$(NM) -n $@ | $(BASEDIR)/tools/symbols > $(BASEDIR)/xen-syms.S
    2.65  	$(MAKE) $(BASEDIR)/xen-syms.o
    2.66 -	$(LD) $(LDFLAGS) -T $(BASEDIR)/arch/$(TARGET_ARCH)/xen.lds.s -N \
    2.67 -		-Map map.out head.o $(ALL_OBJS) $(BASEDIR)/xen-syms.o -o $@
    2.68 +	$(LD) $(LDFLAGS) -T xen.lds.s -N \
    2.69 +		-Map map.out linux-xen/head.o $(ALL_OBJS) $(BASEDIR)/xen-syms.o -o $@
    2.70  	$(NM) -n $@ | $(BASEDIR)/tools/symbols >$(BASEDIR)/xen-syms.S
    2.71  	$(MAKE) $(BASEDIR)/xen-syms.o
    2.72 -	$(LD) $(LDFLAGS) -T $(BASEDIR)/arch/$(TARGET_ARCH)/xen.lds.s -N \
    2.73 -		-Map map.out head.o $(ALL_OBJS) $(BASEDIR)/xen-syms.o -o $@
    2.74 +	$(LD) $(LDFLAGS) -T xen.lds.s -N \
    2.75 +		-Map map.out linux-xen/head.o $(ALL_OBJS) $(BASEDIR)/xen-syms.o -o $@
    2.76  	rm -f $(BASEDIR)/xen-syms.S $(BASEDIR)/xen-syms.o
    2.77  
    2.78  $(TARGET): $(TARGET)-syms
    2.79 @@ -119,31 +79,9 @@ xen.lds.s: xen/xen.lds.S
    2.80  	$(CC) -E $(CPPFLAGS) -P -DXEN -D__ASSEMBLY__ \
    2.81  		-o xen.lds.s xen/xen.lds.S
    2.82  
    2.83 -# variants of divide/modulo
    2.84 -# see files in xen/arch/ia64/linux/lib (linux/arch/ia64/lib)
    2.85 -__divdi3.o: idiv64.S
    2.86 -	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -o $@ $<
    2.87 -__udivdi3.o: idiv64.S
    2.88 -	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DUNSIGNED -c -o $@ $<
    2.89 -__moddi3.o: idiv64.S
    2.90 -	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DMODULO -c -o $@ $<
    2.91 -__umoddi3.o: idiv64.S
    2.92 -	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DMODULO -DUNSIGNED -c -o $@ $<
    2.93 -__divsi3.o: idiv32.S
    2.94 -	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -o $@ $<
    2.95 -__udivsi3.o: idiv32.S
    2.96 -	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DUNSIGNED -c -o $@ $<
    2.97 -__modsi3.o: idiv32.S
    2.98 -	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DMODULO -c -o $@ $<
    2.99 -__umodsi3.o: idiv32.S
   2.100 -	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DMODULO -DUNSIGNED -c -o $@ $<
   2.101 -
   2.102 -
   2.103 -clean:
   2.104 +clean:: FORCE
   2.105  	rm -f *.o *~ core  xen.lds.s $(BASEDIR)/include/asm-ia64/.offsets.h.stamp asm-offsets.s map.out
   2.106  	rm -f asm-xsi-offsets.s $(BASEDIR)/include/asm-ia64/asm-xsi-offsets.h
   2.107 -	rm -f $(BASEDIR)/arch/ia64/vmx/hvm_*.c
   2.108 +	rm -f $(BASEDIR)/System.map
   2.109 +	rm -f vmx/hvm_*.c
   2.110  	rm -rf $(BASEDIR)/include/asm-ia64/hvm
   2.111 -	rm -f linux/lib/*.o
   2.112 -
   2.113 -.PHONY: default clean
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/xen/arch/ia64/linux-xen/Makefile	Tue Mar 21 11:42:08 2006 +0100
     3.3 @@ -0,0 +1,19 @@
     3.4 +include $(BASEDIR)/Rules.mk
     3.5 +
     3.6 +obj-y += efi.o
     3.7 +obj-y += entry.o
     3.8 +obj-y += irq_ia64.o
     3.9 +obj-y += mm_contig.o
    3.10 +obj-y += pal.o
    3.11 +obj-y += process-linux-xen.o
    3.12 +obj-y += sal.o
    3.13 +obj-y += setup.o
    3.14 +obj-y += smpboot.o
    3.15 +obj-y += smp.o
    3.16 +obj-y += sort.o
    3.17 +obj-y += time.o
    3.18 +obj-y += tlb.o
    3.19 +obj-y += unaligned.o
    3.20 +obj-y += unwind.o
    3.21 +
    3.22 +include $(BASEDIR)/Post.mk
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/xen/arch/ia64/linux/Makefile	Tue Mar 21 11:42:08 2006 +0100
     4.3 @@ -0,0 +1,56 @@
     4.4 +include $(BASEDIR)/Rules.mk
     4.5 +
     4.6 +
     4.7 +obj-y += bitop.o
     4.8 +obj-y += clear_page.o
     4.9 +obj-y += cmdline.o
    4.10 +obj-y += copy_page_mck.o
    4.11 +obj-y += efi_stub.o
    4.12 +obj-y += extable.o
    4.13 +obj-y += flush.o
    4.14 +obj-y += hpsim.o
    4.15 +obj-y += ia64_ksyms.o
    4.16 +obj-y += irq_lsapic.o
    4.17 +obj-y += linuxextable.o
    4.18 +obj-y += machvec.o
    4.19 +obj-y += memcpy_mck.o
    4.20 +obj-y += memset.o
    4.21 +obj-y += strlen.o
    4.22 +
    4.23 +obj-y += __divsi3.o
    4.24 +obj-y += __udivsi3.o
    4.25 +obj-y += __modsi3.o
    4.26 +obj-y += __umodsi3.o
    4.27 +obj-y += __divdi3.o
    4.28 +obj-y += __udivdi3.o
    4.29 +obj-y += __moddi3.o
    4.30 +obj-y += __umoddi3.o
    4.31 +
    4.32 +include $(BASEDIR)/Post.mk
    4.33 +
    4.34 +## variants of divide/modulo
    4.35 +## see files in xen/arch/ia64/linux/lib (linux/arch/ia64/lib)
    4.36 +__divdi3.o: idiv64.S
    4.37 +	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -o $@ $<
    4.38 +
    4.39 +__udivdi3.o: idiv64.S
    4.40 +	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DUNSIGNED -c -o $@ $<
    4.41 +
    4.42 +__moddi3.o: idiv64.S
    4.43 +	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DMODULO -c -o $@ $<
    4.44 +
    4.45 +__umoddi3.o: idiv64.S
    4.46 +	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DMODULO -DUNSIGNED -c -o $@ $<
    4.47 +
    4.48 +__divsi3.o: idiv32.S
    4.49 +	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -o $@ $<
    4.50 +
    4.51 +__udivsi3.o: idiv32.S
    4.52 +	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DUNSIGNED -c -o $@ $<
    4.53 +
    4.54 +__modsi3.o: idiv32.S
    4.55 +	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DMODULO -c -o $@ $<
    4.56 +
    4.57 +__umodsi3.o: idiv32.S
    4.58 +	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DMODULO -DUNSIGNED -c -o $@ $<
    4.59 +
     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/xen/arch/ia64/vmx/Makefile	Tue Mar 21 11:42:08 2006 +0100
     5.3 @@ -0,0 +1,24 @@
     5.4 +include $(BASEDIR)/Rules.mk
     5.5 +
     5.6 +obj-y += hvm_vioapic.o
     5.7 +obj-y += mm.o
     5.8 +obj-y += mmio.o
     5.9 +obj-y += pal_emul.o
    5.10 +obj-y += vlsapic.o
    5.11 +obj-y += vmmu.o
    5.12 +obj-y += vmx_entry.o
    5.13 +obj-y += vmx_hypercall.o
    5.14 +obj-y += vmx_init.o
    5.15 +obj-y += vmx_interrupt.o
    5.16 +obj-y += vmx_irq_ia64.o
    5.17 +obj-y += vmx_ivt.o
    5.18 +obj-y += vmx_phy_mode.o
    5.19 +obj-y += vmx_process.o
    5.20 +obj-y += vmx_support.o
    5.21 +obj-y += vmx_utility.o
    5.22 +obj-y += vmx_vcpu.o
    5.23 +obj-y += vmx_virt.o
    5.24 +obj-y += vmx_vsa.o
    5.25 +obj-y += vtlb.o
    5.26 +
    5.27 +include $(BASEDIR)/Post.mk
     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/xen/arch/ia64/xen/Makefile	Tue Mar 21 11:42:08 2006 +0100
     6.3 @@ -0,0 +1,30 @@
     6.4 +include $(BASEDIR)/Rules.mk
     6.5 +
     6.6 +obj-y += acpi.o
     6.7 +obj-y += dom0_ops.o
     6.8 +obj-y += domain.o
     6.9 +obj-y += dom_fw.o
    6.10 +obj-y += hpsimserial.o
    6.11 +obj-y += hypercall.o
    6.12 +obj-y += hyperprivop.o
    6.13 +obj-y += idle0_task.o
    6.14 +obj-y += irq.o
    6.15 +obj-y += ivt.o
    6.16 +obj-y += mm_init.o
    6.17 +obj-y += pcdp.o
    6.18 +obj-y += privop.o
    6.19 +obj-y += process.o
    6.20 +obj-y += regionreg.o
    6.21 +obj-y += sn_console.o
    6.22 +obj-y += vcpu.o
    6.23 +obj-y += vhpt.o
    6.24 +obj-y += xenasm.o
    6.25 +obj-y += xenirq.o
    6.26 +obj-y += xenmem.o
    6.27 +obj-y += xenmisc.o
    6.28 +obj-y += xensetup.o
    6.29 +obj-y += xentime.o
    6.30 +
    6.31 +obj-$(crash_debug) += gdbstub.o
    6.32 +
    6.33 +include $(BASEDIR)/Post.mk