Skip to contentSkip to conversation

Move arch/ia64 to new build system

PATCH In review Alex Williamson 2 participants 2 messages Mar 20, 2006 – Mar 21, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Move arch/ia64 to new build system

Hi Keir,

The patch below updates xen/ia64 to the new build system in
xen-unstable. This patch is necessary to build ia64 on the current tip. Thanks,

Alex

---

xen/arch/ia64/Makefile +15 -77
diff -r 768936b2800a xen/arch/ia64/Makefile
@@ -1,63 +1,23 @@ include $(BASEDIR)/Rules.mk
 include $(BASEDIR)/Rules.mk
 
-VPATH = xen vmx linux linux-xen
+subdir-y += xen
+subdir-y += vmx
+subdir-y += linux
+subdir-y += linux-xen
 
-OBJS = xensetup.o setup.o time.o irq.o process.o smp.o \
-	xenmisc.o acpi.o hypercall.o \
-	machvec.o dom0_ops.o domain.o hpsimserial.o pcdp.o \
-	idle0_task.o pal.o hpsim.o efi.o efi_stub.o ivt.o mm_contig.o \
-	xenmem.o sal.o cmdline.o mm_init.o tlb.o smpboot.o \
-	extable.o linuxextable.o sort.o xenirq.o xentime.o \
-	regionreg.o entry.o unaligned.o privop.o vcpu.o \
-	irq_ia64.o irq_lsapic.o vhpt.o xenasm.o hyperprivop.o dom_fw.o \
-	sn_console.o # ia64_ksyms.o 
+include $(BASEDIR)/Post.mk
 
-OBJS += vmx_init.o vmx_virt.o vmx_vcpu.o vmx_process.o vmx_vsa.o vmx_ivt.o\
-	vmx_phy_mode.o vmx_utility.o vmx_interrupt.o vmx_entry.o vmmu.o \
-	vtlb.o mmio.o vlsapic.o vmx_hypercall.o mm.o vmx_support.o \
-	pal_emul.o vmx_irq_ia64.o hvm_vioapic.o
-
-# lib files from xen/arch/ia64/linux/ (linux/arch/ia64/lib)
-OBJS +=	bitop.o clear_page.o flush.o copy_page_mck.o			\
-	memset.o strlen.o memcpy_mck.o 					\
-	__divsi3.o __udivsi3.o __modsi3.o __umodsi3.o			\
-	__divdi3.o __udivdi3.o __moddi3.o __umoddi3.o
-
-ifeq ($(crash_debug),y)
-OBJS += gdbstub.o
-endif
-
-# xen stack unwinder
-# unwind_decoder.c is included in unwind.c
-OBJS += unwind.o
-#unwind.o: CFLAGS += -DUNW_DEBUG=4
-
-OBJS += process-linux-xen.o
-
-# perfmon.o
-# unwind.o needed for kernel unwinding (rare)
-
-OBJS := $(subst $(TARGET_ARCH)/asm-offsets.o,,$(OBJS))
-
-# remove following line if not privifying in memory
-# OBJS += privify.o
-
-default: $(TARGET)
-
-$(CURDIR)/arch.o: $(OBJS)
-	$(LD) -r -o $@ $(OBJS)
-
-$(TARGET)-syms: $(ALL_OBJS) head.o xen.lds.s
-	$(LD) $(LDFLAGS) -T $(BASEDIR)/arch/$(TARGET_ARCH)/xen.lds.s -N \
-		-Map map.out head.o $(ALL_OBJS) -o $@
+$(TARGET)-syms: linux-xen/head.o $(ALL_OBJS) xen.lds.s
+	$(LD) $(LDFLAGS) -T xen.lds.s -N \
+		-Map map.out linux-xen/head.o $(ALL_OBJS) -o $@
 	$(NM) -n $@ | $(BASEDIR)/tools/symbols > $(BASEDIR)/xen-syms.S
 	$(MAKE) $(BASEDIR)/xen-syms.o
-	$(LD) $(LDFLAGS) -T $(BASEDIR)/arch/$(TARGET_ARCH)/xen.lds.s -N \
-		-Map map.out head.o $(ALL_OBJS) $(BASEDIR)/xen-syms.o -o $@
+	$(LD) $(LDFLAGS) -T xen.lds.s -N \
+		-Map map.out linux-xen/head.o $(ALL_OBJS) $(BASEDIR)/xen-syms.o -o $@
 	$(NM) -n $@ | $(BASEDIR)/tools/symbols >$(BASEDIR)/xen-syms.S
 	$(MAKE) $(BASEDIR)/xen-syms.o
-	$(LD) $(LDFLAGS) -T $(BASEDIR)/arch/$(TARGET_ARCH)/xen.lds.s -N \
-		-Map map.out head.o $(ALL_OBJS) $(BASEDIR)/xen-syms.o -o $@
+	$(LD) $(LDFLAGS) -T xen.lds.s -N \
+		-Map map.out linux-xen/head.o $(ALL_OBJS) $(BASEDIR)/xen-syms.o -o $@
 	rm -f $(BASEDIR)/xen-syms.S $(BASEDIR)/xen-syms.o
 
 $(TARGET): $(TARGET)-syms
@@ -119,31 +79,9 @@ xen.lds.s: xen/xen.lds.S
 	$(CC) -E $(CPPFLAGS) -P -DXEN -D__ASSEMBLY__ \
 		-o xen.lds.s xen/xen.lds.S
 
-# variants of divide/modulo
-# see files in xen/arch/ia64/linux/lib (linux/arch/ia64/lib)
-__divdi3.o: idiv64.S
-	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -o $@ $<
-__udivdi3.o: idiv64.S
-	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DUNSIGNED -c -o $@ $<
-__moddi3.o: idiv64.S
-	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DMODULO -c -o $@ $<
-__umoddi3.o: idiv64.S
-	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DMODULO -DUNSIGNED -c -o $@ $<
-__divsi3.o: idiv32.S
-	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -o $@ $<
-__udivsi3.o: idiv32.S
-	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DUNSIGNED -c -o $@ $<
-__modsi3.o: idiv32.S
-	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DMODULO -c -o $@ $<
-__umodsi3.o: idiv32.S
-	$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DMODULO -DUNSIGNED -c -o $@ $<
-
-
-clean:
+clean:: FORCE
 	rm -f *.o *~ core  xen.lds.s $(BASEDIR)/include/asm-ia64/.offsets.h.stamp asm-offsets.s map.out
 	rm -f asm-xsi-offsets.s $(BASEDIR)/include/asm-ia64/asm-xsi-offsets.h
-	rm -f $(BASEDIR)/arch/ia64/vmx/hvm_*.c
+	rm -f $(BASEDIR)/System.map
+	rm -f vmx/hvm_*.c
 	rm -rf $(BASEDIR)/include/asm-ia64/hvm
-	rm -f linux/lib/*.o
-
-.PHONY: default clean
xen/arch/ia64/linux-xen/Makefile new file +19 -0
diff -r 768936b2800a xen/arch/ia64/linux-xen/Makefile
@@ -0,0 +1,19 @@
+include $(BASEDIR)/Rules.mk
+
+obj-y += efi.o
+obj-y += entry.o
+obj-y += irq_ia64.o
+obj-y += mm_contig.o
+obj-y += pal.o
+obj-y += process-linux-xen.o
+obj-y += sal.o
+obj-y += setup.o
+obj-y += smpboot.o
+obj-y += smp.o
+obj-y += sort.o
+obj-y += time.o
+obj-y += tlb.o
+obj-y += unaligned.o
+obj-y += unwind.o
+
+include $(BASEDIR)/Post.mk
xen/arch/ia64/linux/Makefile new file +56 -0

56 lines not on this page · raw message

xen/arch/ia64/vmx/Makefile new file +24 -0
diff -r 768936b2800a xen/arch/ia64/vmx/Makefile
@@ -0,0 +1,24 @@
+include $(BASEDIR)/Rules.mk
+
+obj-y += hvm_vioapic.o
+obj-y += mm.o
+obj-y += mmio.o
+obj-y += pal_emul.o
+obj-y += vlsapic.o
+obj-y += vmmu.o
+obj-y += vmx_entry.o
+obj-y += vmx_hypercall.o
+obj-y += vmx_init.o
+obj-y += vmx_interrupt.o
+obj-y += vmx_irq_ia64.o
+obj-y += vmx_ivt.o
+obj-y += vmx_phy_mode.o
+obj-y += vmx_process.o
+obj-y += vmx_support.o
+obj-y += vmx_utility.o
+obj-y += vmx_vcpu.o
+obj-y += vmx_virt.o
+obj-y += vmx_vsa.o
+obj-y += vtlb.o
+
+include $(BASEDIR)/Post.mk
xen/arch/ia64/xen/Makefile new file +32 -0
diff -r 768936b2800a xen/arch/ia64/xen/Makefile
@@ -0,0 +1,32 @@
+include $(BASEDIR)/Rules.mk
+
+obj-y += acpi.o
+obj-y += dom0_ops.o
+obj-y += domain.o
+obj-y += dom_fw.o
+obj-y += hpsimserial.o
+obj-y += hypercall.o
+obj-y += hyperprivop.o
+obj-y += idle0_task.o
+obj-y += irq.o
+obj-y += ivt.o
+obj-y += mm_init.o
+obj-y += pcdp.o
+obj-y += privop.o
+obj-y += process.o
+obj-y += regionreg.o
+obj-y += sn_console.o
+obj-y += vcpu.o
+obj-y += vhpt.o
+obj-y += xenasm.o
+obj-y += xenirq.o
+obj-y += xenmem.o
+obj-y += xenmisc.o
+obj-y += xensetup.o
+obj-y += xentime.o
+
+ifeq ($(crash_debug),y)
+obj-y += gdbstub.o
+endif
+
+include $(BASEDIR)/Post.mk
#1 lore raw
Quoted 3 lines · Alex Williamson

The patch below updates xen/ia64 to the new build system in
xen-unstable. This patch is necessary to build ia64 on the current tip. Thanks,

Sorry about that. I'd hoped to maintain compatibility with the old ia64 Makefiles until after 3.0.2. Thanks for the patch.

-- Keir