ia64/xen-unstable

changeset 9356:8fc534c192c4

Update xen/ia64 to use the new build system. Fixes the ia64 build.

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
author kaf24@firebug.cl.cam.ac.uk
date Tue Mar 21 11:38:50 2006 +0100 (2006-03-21)
parents d0db2359769c
children 156505f40a8a
files xen/arch/ia64/Makefile xen/arch/ia64/linux-xen/Makefile xen/arch/ia64/linux/Makefile xen/arch/ia64/vmx/Makefile xen/arch/ia64/xen/Makefile
line diff
     1.1 --- a/xen/arch/ia64/Makefile	Tue Mar 21 11:34:41 2006 +0100
     1.2 +++ b/xen/arch/ia64/Makefile	Tue Mar 21 11:38:50 2006 +0100
     1.3 @@ -1,63 +1,23 @@
     1.4  include $(BASEDIR)/Rules.mk
     1.5  
     1.6 -VPATH = xen vmx linux linux-xen
     1.7 -
     1.8 -OBJS = xensetup.o setup.o time.o irq.o process.o smp.o \
     1.9 -	xenmisc.o acpi.o hypercall.o \
    1.10 -	machvec.o dom0_ops.o domain.o hpsimserial.o pcdp.o \
    1.11 -	idle0_task.o pal.o hpsim.o efi.o efi_stub.o ivt.o mm_contig.o \
    1.12 -	xenmem.o sal.o cmdline.o mm_init.o tlb.o smpboot.o \
    1.13 -	extable.o linuxextable.o sort.o xenirq.o xentime.o \
    1.14 -	regionreg.o entry.o unaligned.o privop.o vcpu.o \
    1.15 -	irq_ia64.o irq_lsapic.o vhpt.o xenasm.o hyperprivop.o dom_fw.o \
    1.16 -	sn_console.o # ia64_ksyms.o 
    1.17 -
    1.18 -OBJS += vmx_init.o vmx_virt.o vmx_vcpu.o vmx_process.o vmx_vsa.o vmx_ivt.o\
    1.19 -	vmx_phy_mode.o vmx_utility.o vmx_interrupt.o vmx_entry.o vmmu.o \
    1.20 -	vtlb.o mmio.o vlsapic.o vmx_hypercall.o mm.o vmx_support.o \
    1.21 -	pal_emul.o vmx_irq_ia64.o hvm_vioapic.o
    1.22 -
    1.23 -# lib files from xen/arch/ia64/linux/ (linux/arch/ia64/lib)
    1.24 -OBJS +=	bitop.o clear_page.o flush.o copy_page_mck.o			\
    1.25 -	memset.o strlen.o memcpy_mck.o 					\
    1.26 -	__divsi3.o __udivsi3.o __modsi3.o __umodsi3.o			\
    1.27 -	__divdi3.o __udivdi3.o __moddi3.o __umoddi3.o
    1.28 +subdir-y += xen
    1.29 +subdir-y += vmx
    1.30 +subdir-y += linux
    1.31 +subdir-y += linux-xen
    1.32  
    1.33 -ifeq ($(crash_debug),y)
    1.34 -OBJS += gdbstub.o
    1.35 -endif
    1.36 -
    1.37 -# xen stack unwinder
    1.38 -# unwind_decoder.c is included in unwind.c
    1.39 -OBJS += unwind.o
    1.40 -#unwind.o: CFLAGS += -DUNW_DEBUG=4
    1.41 -
    1.42 -OBJS += process-linux-xen.o
    1.43 +include $(BASEDIR)/Post.mk
    1.44  
    1.45 -# perfmon.o
    1.46 -# unwind.o needed for kernel unwinding (rare)
    1.47 -
    1.48 -OBJS := $(subst $(TARGET_ARCH)/asm-offsets.o,,$(OBJS))
    1.49 -
    1.50 -# remove following line if not privifying in memory
    1.51 -# OBJS += privify.o
    1.52 -
    1.53 -default: $(TARGET)
    1.54 -
    1.55 -$(CURDIR)/arch.o: $(OBJS)
    1.56 -	$(LD) -r -o $@ $(OBJS)
    1.57 -
    1.58 -$(TARGET)-syms: $(ALL_OBJS) head.o xen.lds.s
    1.59 -	$(LD) $(LDFLAGS) -T $(BASEDIR)/arch/$(TARGET_ARCH)/xen.lds.s -N \
    1.60 -		-Map map.out head.o $(ALL_OBJS) -o $@
    1.61 +$(TARGET)-syms: linux-xen/head.o $(ALL_OBJS) xen.lds.s
    1.62 +	$(LD) $(LDFLAGS) -T xen.lds.s -N \
    1.63 +		-Map map.out linux-xen/head.o $(ALL_OBJS) -o $@
    1.64  	$(NM) -n $@ | $(BASEDIR)/tools/symbols > $(BASEDIR)/xen-syms.S
    1.65  	$(MAKE) $(BASEDIR)/xen-syms.o
    1.66 -	$(LD) $(LDFLAGS) -T $(BASEDIR)/arch/$(TARGET_ARCH)/xen.lds.s -N \
    1.67 -		-Map map.out head.o $(ALL_OBJS) $(BASEDIR)/xen-syms.o -o $@
    1.68 +	$(LD) $(LDFLAGS) -T xen.lds.s -N \
    1.69 +		-Map map.out linux-xen/head.o $(ALL_OBJS) $(BASEDIR)/xen-syms.o -o $@
    1.70  	$(NM) -n $@ | $(BASEDIR)/tools/symbols >$(BASEDIR)/xen-syms.S
    1.71  	$(MAKE) $(BASEDIR)/xen-syms.o
    1.72 -	$(LD) $(LDFLAGS) -T $(BASEDIR)/arch/$(TARGET_ARCH)/xen.lds.s -N \
    1.73 -		-Map map.out head.o $(ALL_OBJS) $(BASEDIR)/xen-syms.o -o $@
    1.74 +	$(LD) $(LDFLAGS) -T xen.lds.s -N \
    1.75 +		-Map map.out linux-xen/head.o $(ALL_OBJS) $(BASEDIR)/xen-syms.o -o $@
    1.76  	rm -f $(BASEDIR)/xen-syms.S $(BASEDIR)/xen-syms.o
    1.77  
    1.78  $(TARGET): $(TARGET)-syms
    1.79 @@ -119,31 +79,9 @@ xen.lds.s: xen/xen.lds.S
    1.80  	$(CC) -E $(CPPFLAGS) -P -DXEN -D__ASSEMBLY__ \
    1.81  		-o xen.lds.s xen/xen.lds.S
    1.82  
    1.83 -# variants of divide/modulo
    1.84 -# see files in xen/arch/ia64/linux/lib (linux/arch/ia64/lib)
    1.85 -__divdi3.o: idiv64.S
    1.86 -	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -o $@ $<
    1.87 -__udivdi3.o: idiv64.S
    1.88 -	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DUNSIGNED -c -o $@ $<
    1.89 -__moddi3.o: idiv64.S
    1.90 -	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DMODULO -c -o $@ $<
    1.91 -__umoddi3.o: idiv64.S
    1.92 -	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DMODULO -DUNSIGNED -c -o $@ $<
    1.93 -__divsi3.o: idiv32.S
    1.94 -	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -o $@ $<
    1.95 -__udivsi3.o: idiv32.S
    1.96 -	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DUNSIGNED -c -o $@ $<
    1.97 -__modsi3.o: idiv32.S
    1.98 -	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DMODULO -c -o $@ $<
    1.99 -__umodsi3.o: idiv32.S
   1.100 -	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DMODULO -DUNSIGNED -c -o $@ $<
   1.101 -
   1.102 -
   1.103 -clean:
   1.104 +clean:: FORCE
   1.105  	rm -f *.o *~ core  xen.lds.s $(BASEDIR)/include/asm-ia64/.offsets.h.stamp asm-offsets.s map.out
   1.106  	rm -f asm-xsi-offsets.s $(BASEDIR)/include/asm-ia64/asm-xsi-offsets.h
   1.107 -	rm -f $(BASEDIR)/arch/ia64/vmx/hvm_*.c
   1.108 +	rm -f $(BASEDIR)/System.map
   1.109 +	rm -f vmx/hvm_*.c
   1.110  	rm -rf $(BASEDIR)/include/asm-ia64/hvm
   1.111 -	rm -f linux/lib/*.o
   1.112 -
   1.113 -.PHONY: default clean
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/xen/arch/ia64/linux-xen/Makefile	Tue Mar 21 11:38:50 2006 +0100
     2.3 @@ -0,0 +1,19 @@
     2.4 +include $(BASEDIR)/Rules.mk
     2.5 +
     2.6 +obj-y += efi.o
     2.7 +obj-y += entry.o
     2.8 +obj-y += irq_ia64.o
     2.9 +obj-y += mm_contig.o
    2.10 +obj-y += pal.o
    2.11 +obj-y += process-linux-xen.o
    2.12 +obj-y += sal.o
    2.13 +obj-y += setup.o
    2.14 +obj-y += smpboot.o
    2.15 +obj-y += smp.o
    2.16 +obj-y += sort.o
    2.17 +obj-y += time.o
    2.18 +obj-y += tlb.o
    2.19 +obj-y += unaligned.o
    2.20 +obj-y += unwind.o
    2.21 +
    2.22 +include $(BASEDIR)/Post.mk
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/xen/arch/ia64/linux/Makefile	Tue Mar 21 11:38:50 2006 +0100
     3.3 @@ -0,0 +1,56 @@
     3.4 +include $(BASEDIR)/Rules.mk
     3.5 +
     3.6 +
     3.7 +obj-y += bitop.o
     3.8 +obj-y += clear_page.o
     3.9 +obj-y += cmdline.o
    3.10 +obj-y += copy_page_mck.o
    3.11 +obj-y += efi_stub.o
    3.12 +obj-y += extable.o
    3.13 +obj-y += flush.o
    3.14 +obj-y += hpsim.o
    3.15 +obj-y += ia64_ksyms.o
    3.16 +obj-y += irq_lsapic.o
    3.17 +obj-y += linuxextable.o
    3.18 +obj-y += machvec.o
    3.19 +obj-y += memcpy_mck.o
    3.20 +obj-y += memset.o
    3.21 +obj-y += strlen.o
    3.22 +
    3.23 +obj-y += __divsi3.o
    3.24 +obj-y += __udivsi3.o
    3.25 +obj-y += __modsi3.o
    3.26 +obj-y += __umodsi3.o
    3.27 +obj-y += __divdi3.o
    3.28 +obj-y += __udivdi3.o
    3.29 +obj-y += __moddi3.o
    3.30 +obj-y += __umoddi3.o
    3.31 +
    3.32 +include $(BASEDIR)/Post.mk
    3.33 +
    3.34 +## variants of divide/modulo
    3.35 +## see files in xen/arch/ia64/linux/lib (linux/arch/ia64/lib)
    3.36 +__divdi3.o: idiv64.S
    3.37 +	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -o $@ $<
    3.38 +
    3.39 +__udivdi3.o: idiv64.S
    3.40 +	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DUNSIGNED -c -o $@ $<
    3.41 +
    3.42 +__moddi3.o: idiv64.S
    3.43 +	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DMODULO -c -o $@ $<
    3.44 +
    3.45 +__umoddi3.o: idiv64.S
    3.46 +	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DMODULO -DUNSIGNED -c -o $@ $<
    3.47 +
    3.48 +__divsi3.o: idiv32.S
    3.49 +	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -o $@ $<
    3.50 +
    3.51 +__udivsi3.o: idiv32.S
    3.52 +	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DUNSIGNED -c -o $@ $<
    3.53 +
    3.54 +__modsi3.o: idiv32.S
    3.55 +	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DMODULO -c -o $@ $<
    3.56 +
    3.57 +__umodsi3.o: idiv32.S
    3.58 +	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DMODULO -DUNSIGNED -c -o $@ $<
    3.59 +
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/xen/arch/ia64/vmx/Makefile	Tue Mar 21 11:38:50 2006 +0100
     4.3 @@ -0,0 +1,24 @@
     4.4 +include $(BASEDIR)/Rules.mk
     4.5 +
     4.6 +obj-y += hvm_vioapic.o
     4.7 +obj-y += mm.o
     4.8 +obj-y += mmio.o
     4.9 +obj-y += pal_emul.o
    4.10 +obj-y += vlsapic.o
    4.11 +obj-y += vmmu.o
    4.12 +obj-y += vmx_entry.o
    4.13 +obj-y += vmx_hypercall.o
    4.14 +obj-y += vmx_init.o
    4.15 +obj-y += vmx_interrupt.o
    4.16 +obj-y += vmx_irq_ia64.o
    4.17 +obj-y += vmx_ivt.o
    4.18 +obj-y += vmx_phy_mode.o
    4.19 +obj-y += vmx_process.o
    4.20 +obj-y += vmx_support.o
    4.21 +obj-y += vmx_utility.o
    4.22 +obj-y += vmx_vcpu.o
    4.23 +obj-y += vmx_virt.o
    4.24 +obj-y += vmx_vsa.o
    4.25 +obj-y += vtlb.o
    4.26 +
    4.27 +include $(BASEDIR)/Post.mk
     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/xen/arch/ia64/xen/Makefile	Tue Mar 21 11:38:50 2006 +0100
     5.3 @@ -0,0 +1,30 @@
     5.4 +include $(BASEDIR)/Rules.mk
     5.5 +
     5.6 +obj-y += acpi.o
     5.7 +obj-y += dom0_ops.o
     5.8 +obj-y += domain.o
     5.9 +obj-y += dom_fw.o
    5.10 +obj-y += hpsimserial.o
    5.11 +obj-y += hypercall.o
    5.12 +obj-y += hyperprivop.o
    5.13 +obj-y += idle0_task.o
    5.14 +obj-y += irq.o
    5.15 +obj-y += ivt.o
    5.16 +obj-y += mm_init.o
    5.17 +obj-y += pcdp.o
    5.18 +obj-y += privop.o
    5.19 +obj-y += process.o
    5.20 +obj-y += regionreg.o
    5.21 +obj-y += sn_console.o
    5.22 +obj-y += vcpu.o
    5.23 +obj-y += vhpt.o
    5.24 +obj-y += xenasm.o
    5.25 +obj-y += xenirq.o
    5.26 +obj-y += xenmem.o
    5.27 +obj-y += xenmisc.o
    5.28 +obj-y += xensetup.o
    5.29 +obj-y += xentime.o
    5.30 +
    5.31 +obj-$(crash_debug) += gdbstub.o
    5.32 +
    5.33 +include $(BASEDIR)/Post.mk