WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 		  
Home Products Support Community News
 
   
 

xen-changelog

[Top] [All Lists]
<prev [Date] next>
[Advanced]
 <prev [Thread] next>

[Xen-changelog] Move arch/x86 to new build system.

from [Xen patchbot -unstable] [Permanent Link][Original]
To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] Move arch/x86 to new build system.
From: Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date: Sun, 19 Mar 2006 16:10:06 +0000
Delivery-date: Sun, 19 Mar 2006 16:11:25 +0000
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx 
# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 768936b2800aebca0513dbc626890378946f256f
# Parent  9795d9407acc1cbe3162d716a5e81bd5d27c90a0
Move arch/x86 to new build system.

Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>

diff -r 9795d9407acc -r 768936b2800a xen/Makefile
--- a/xen/Makefile      Sun Mar 19 13:02:18 2006
+++ b/xen/Makefile      Sun Mar 19 14:17:50 2006
@@ -61,6 +61,7 @@
        $(MAKE) -C acm
 endif
        $(MAKE) -C arch/$(TARGET_ARCH)
+       $(MAKE) -C arch/$(TARGET_ARCH) $(TARGET)
 
 # drivers/char/console.o contains static banner/compile info. Blow it away.
 # Don't refresh these files during e.g., 'sudo make install'
diff -r 9795d9407acc -r 768936b2800a xen/Post.mk
--- a/xen/Post.mk       Sun Mar 19 13:02:18 2006
+++ b/xen/Post.mk       Sun Mar 19 14:17:50 2006
@@ -3,7 +3,6 @@
 
 obj-y += $(patsubst %,%/built_in.o,$(subdirs-y))
 
-default: built_in.o
 built_in.o: $(obj-y)
        $(LD) $(LDFLAGS) -r -o $@ $^
 
@@ -13,7 +12,7 @@
 %/built_in.o: FORCE
        $(MAKE) -C $*
 
-clean: $(addprefix _clean_, $(subdirs-all))
+clean:: $(addprefix _clean_, $(subdirs-all)) FORCE
        rm -f *.o *~ core
 _clean_%/: FORCE
        $(MAKE) -C $* clean
diff -r 9795d9407acc -r 768936b2800a xen/Rules.mk
--- a/xen/Rules.mk      Sun Mar 19 13:02:18 2006
+++ b/xen/Rules.mk      Sun Mar 19 14:17:50 2006
@@ -36,18 +36,13 @@
 HDRS    := $(subst $(BASEDIR)/include/xen/banner.h,,$(HDRS))
 HDRS    := $(subst $(BASEDIR)/include/xen/compile.h,,$(HDRS))
 
-C_SRCS  := $(wildcard *.c)
-S_SRCS  := $(wildcard *.S)
-OBJS    := $(patsubst %.S,%.o,$(S_SRCS))
-OBJS    += $(patsubst %.c,%.o,$(C_SRCS))
-
 include $(BASEDIR)/arch/$(TARGET_ARCH)/Rules.mk
 
 # Note that link order matters!
 ALL_OBJS-y               += $(BASEDIR)/common/built_in.o
 ALL_OBJS-y               += $(BASEDIR)/drivers/built_in.o
 ALL_OBJS-$(ACM_SECURITY) += $(BASEDIR)/acm/built_in.o
-ALL_OBJS-y               += $(BASEDIR)/arch/$(TARGET_ARCH)/arch.o
+ALL_OBJS-y               += $(BASEDIR)/arch/$(TARGET_ARCH)/built_in.o
 
 CFLAGS-y               += -g -D__XEN__
 CFLAGS-$(ACM_SECURITY) += -DACM_SECURITY
diff -r 9795d9407acc -r 768936b2800a xen/arch/x86/Makefile
--- a/xen/arch/x86/Makefile     Sun Mar 19 13:02:18 2006
+++ b/xen/arch/x86/Makefile     Sun Mar 19 14:17:50 2006
@@ -1,59 +1,61 @@
-
 include $(BASEDIR)/Rules.mk
 
-OBJS += $(patsubst %.S,%.o,$(wildcard $(TARGET_SUBARCH)/*.S))
-OBJS += $(patsubst %.c,%.o,$(wildcard $(TARGET_SUBARCH)/*.c))
-OBJS += $(patsubst %.c,%.o,$(wildcard acpi/*.c))
-OBJS += $(patsubst %.c,%.o,$(wildcard genapic/*.c))
-OBJS += $(patsubst %.c,%.o,$(wildcard cpu/*.c))
-OBJS += $(patsubst %.c,%.o,$(wildcard cpu/mcheck/*.c))
-OBJS += $(patsubst %.c,%.o,$(wildcard cpu/mtrr/*.c))
-OBJS += $(patsubst %.c,%.o,$(wildcard hvm/*.c))
-OBJS += $(patsubst %.c,%.o,$(wildcard hvm/vmx/*.c))
-OBJS += $(patsubst %.S,%.o,$(wildcard hvm/vmx/$(TARGET_SUBARCH)/*.S))
-OBJS += $(patsubst %.c,%.o,$(wildcard hvm/svm/*.c))
-OBJS += $(patsubst %.S,%.o,$(wildcard hvm/svm/$(TARGET_SUBARCH)/*.S))
+subdirs-y += acpi
+subdirs-y += cpu
+subdirs-y += genapic
+subdirs-y += hvm
 
-ifeq ($(TARGET_SUBARCH),x86_64) 
-OBJS := $(subst cpu/centaur.o,,$(OBJS))
-OBJS := $(subst cpu/cyrix.o,,$(OBJS))
-OBJS := $(subst cpu/rise.o,,$(OBJS))
-OBJS := $(subst cpu/transmeta.o,,$(OBJS))
+subdirs-$(x86_32) += x86_32
+subdirs-$(x86_64) += x86_64
+
+obj-y += apic.o
+obj-y += audit.o
+obj-y += bitops.o
+obj-y += delay.o
+obj-y += dmi_scan.o
+obj-y += dom0_ops.o
+obj-y += domain.o
+obj-y += domain_build.o
+obj-y += e820.o
+obj-y += extable.o
+obj-y += flushtlb.o
+obj-y += i387.o
+obj-y += i8259.o
+obj-y += io_apic.o
+obj-y += irq.o
+obj-y += microcode.o
+obj-y += mm.o
+obj-y += mpparse.o
+obj-y += nmi.o
+obj-y += physdev.o
+obj-y += rwlock.o
+obj-y += setup.o
+obj-y += smp.o
+obj-y += smpboot.o
+obj-y += string.o
+obj-y += time.o
+obj-y += trampoline.o
+obj-y += traps.o
+obj-y += usercopy.o
+obj-y += x86_emulate.o
+
+ifneq ($(pae),n)
+obj-$(x86_32) += shadow.o shadow_public.o shadow_guest32.o
+else
+obj-$(x86_32) += shadow32.o
 endif
 
-OBJS := $(patsubst shadow%.o,,$(OBJS)) # drop all
-ifeq ($(TARGET_SUBARCH),x86_64) 
- OBJS += shadow.o shadow_public.o shadow_guest32.o shadow_guest32pae.o # 
x86_64: new code
-endif
-ifeq ($(TARGET_SUBARCH),x86_32) 
- ifneq ($(pae),n)
-  OBJS += shadow.o shadow_public.o shadow_guest32.o    # x86_32p: new code
- else
-  OBJS += shadow32.o                   # x86_32: old code
- endif
-endif
+obj-$(x86_64) += shadow.o shadow_public.o shadow_guest32.o shadow_guest32pae.o
 
-ifneq ($(supervisor_mode_kernel),y)
-OBJS := $(subst x86_32/supervisor_mode_kernel.o,,$(OBJS))
-endif
+obj-$(crash_debug) += gdbstub.o
 
-OBJS := $(subst $(TARGET_SUBARCH)/asm-offsets.o,,$(OBJS))
-OBJS := $(subst $(TARGET_SUBARCH)/xen.lds.o,,$(OBJS))
-
-ifneq ($(crash_debug),y)
-OBJS := $(patsubst gdbstub%.o,,$(OBJS))
-endif
-
-default: $(TARGET)
+include $(BASEDIR)/Post.mk
 
 $(TARGET): $(TARGET)-syms boot/mkelf32
        ./boot/mkelf32 $(TARGET)-syms $(TARGET) 0x100000 \
        `$(NM) $(TARGET)-syms | sort | tail -n 1 | sed -e 's/^\([^ 
]*\).*/0x\1/'`
 
-$(CURDIR)/arch.o: $(OBJS)
-       $(LD) $(LDFLAGS) -r -o $@ $(OBJS)
-
-$(TARGET)-syms: boot/$(TARGET_SUBARCH).o $(ALL_OBJS) xen.lds
+$(TARGET)-syms: boot/$(TARGET_SUBARCH).o xen.lds
        $(LD) $(LDFLAGS) -T xen.lds -N \
            boot/$(TARGET_SUBARCH).o $(ALL_OBJS) -o $@
        $(NM) -n $@ | $(BASEDIR)/tools/symbols >$(BASEDIR)/xen-syms.S
@@ -77,21 +79,5 @@
 
 shadow_guest32.o: shadow.c
 
-clean:
-       rm -f *.o *.s *~ core boot/*.o boot/*~ boot/core boot/mkelf32
-       rm -f x86_32/*.o x86_32/*~ x86_32/core
-       rm -f x86_64/*.o x86_64/*~ x86_64/core
-       rm -f mtrr/*.o mtrr/*~ mtrr/core
-       rm -f acpi/*.o acpi/*~ acpi/core
-       rm -f genapic/*.o genapic/*~ genapic/core
-       rm -f cpu/*.o cpu/*~ cpu/core
-       rm -f hvm/*.o hvm/*~ hvm/core
-       rm -f hvm/vmx/*.o hvm/vmx/*~ hvm/vmx/core
-       rm -f hvm/vmx/x86_32/*.o hvm/vmx/x86_32/*~ hvm/vmx/x86_32/core
-       rm -f hvm/vmx/x86_64/*.o hvm/vmx/x86_64/*~ hvm/vmx/x86_64/core
-       rm -f hvm/svm/*.o hvm/svm/*~ hvm/svm/core
-       rm -f hvm/svm/x86_32/*.o hvm/svm/x86_32/*~ hvm/svm/x86_32/core
-       rm -f hvm/svm/x86_64/*.o hvm/svm/x86_64/*~ hvm/svm/x86_64/core
-       rm -f xen.lds
-
-.PHONY: default clean
+clean:: FORCE
+       rm -f asm-offsets.s xen.lds boot/*.o boot/*~ boot/core boot/mkelf32
diff -r 9795d9407acc -r 768936b2800a xen/arch/x86/Rules.mk
--- a/xen/arch/x86/Rules.mk     Sun Mar 19 13:02:18 2006
+++ b/xen/arch/x86/Rules.mk     Sun Mar 19 14:17:50 2006
@@ -33,13 +33,17 @@
 endif
 
 ifeq ($(XEN_TARGET_ARCH),x86_32)
-LDFLAGS += -m elf_i386 
+LDFLAGS += -m elf_i386
+x86_32 := y
+x86_64 := n
 endif
 
 ifeq ($(TARGET_SUBARCH),x86_64)
 CFLAGS  += -mno-red-zone -fpic -fno-reorder-blocks
 CFLAGS  += -fno-asynchronous-unwind-tables
 LDFLAGS += -m elf_x86_64
+x86_32 := n
+x86_64 := y
 endif
 
 # Test for at least GCC v3.2.x.
diff -r 9795d9407acc -r 768936b2800a xen/common/Makefile
--- a/xen/common/Makefile       Sun Mar 19 13:02:18 2006
+++ b/xen/common/Makefile       Sun Mar 19 14:17:50 2006
@@ -1,4 +1,3 @@
-
 include $(BASEDIR)/Rules.mk
 
 obj-y += acm_ops.o
diff -r 9795d9407acc -r 768936b2800a xen/arch/x86/acpi/Makefile
--- /dev/null   Sun Mar 19 13:02:18 2006
+++ b/xen/arch/x86/acpi/Makefile        Sun Mar 19 14:17:50 2006
@@ -0,0 +1,5 @@
+include $(BASEDIR)/Rules.mk
+
+obj-y += boot.o
+
+include $(BASEDIR)/Post.mk
diff -r 9795d9407acc -r 768936b2800a xen/arch/x86/cpu/Makefile
--- /dev/null   Sun Mar 19 13:02:18 2006
+++ b/xen/arch/x86/cpu/Makefile Sun Mar 19 14:17:50 2006
@@ -0,0 +1,16 @@
+include $(BASEDIR)/Rules.mk
+
+subdirs-y += mcheck
+subdirs-y += mtrr
+
+obj-y += amd.o
+obj-y += common.o
+obj-y += intel.o
+obj-y += intel_cacheinfo.o
+
+obj-$(x86_32) += centaur.o
+obj-$(x86_32) += cyrix.o
+obj-$(x86_32) += rise.o
+obj-$(x86_32) += transmeta.o
+
+include $(BASEDIR)/Post.mk
diff -r 9795d9407acc -r 768936b2800a xen/arch/x86/cpu/mcheck/Makefile
--- /dev/null   Sun Mar 19 13:02:18 2006
+++ b/xen/arch/x86/cpu/mcheck/Makefile  Sun Mar 19 14:17:50 2006
@@ -0,0 +1,11 @@
+include $(BASEDIR)/Rules.mk
+
+obj-y += k7.o
+obj-y += mce.o
+obj-y += non-fatal.o
+obj-y += p4.o
+obj-y += p5.o
+obj-y += p6.o
+obj-y += winchip.o
+
+include $(BASEDIR)/Post.mk
diff -r 9795d9407acc -r 768936b2800a xen/arch/x86/cpu/mtrr/Makefile
--- /dev/null   Sun Mar 19 13:02:18 2006
+++ b/xen/arch/x86/cpu/mtrr/Makefile    Sun Mar 19 14:17:50 2006
@@ -0,0 +1,10 @@
+include $(BASEDIR)/Rules.mk
+
+obj-y += amd.o
+obj-y += centaur.o
+obj-y += cyrix.o
+obj-y += generic.o
+obj-y += main.o
+obj-y += state.o
+
+include $(BASEDIR)/Post.mk
diff -r 9795d9407acc -r 768936b2800a xen/arch/x86/genapic/Makefile
--- /dev/null   Sun Mar 19 13:02:18 2006
+++ b/xen/arch/x86/genapic/Makefile     Sun Mar 19 14:17:50 2006
@@ -0,0 +1,10 @@
+include $(BASEDIR)/Rules.mk
+
+obj-y += bigsmp.o
+obj-y += default.o
+obj-y += es7000.o
+obj-y += es7000plat.o
+obj-y += probe.o
+obj-y += summit.o
+
+include $(BASEDIR)/Post.mk
diff -r 9795d9407acc -r 768936b2800a xen/arch/x86/hvm/Makefile
--- /dev/null   Sun Mar 19 13:02:18 2006
+++ b/xen/arch/x86/hvm/Makefile Sun Mar 19 14:17:50 2006
@@ -0,0 +1,14 @@
+include $(BASEDIR)/Rules.mk
+
+subdirs-y += svm
+subdirs-y += vmx
+
+obj-y += hvm.o
+obj-y += i8259.o
+obj-y += intercept.o
+obj-y += io.o
+obj-y += platform.o
+obj-y += vioapic.o
+obj-y += vlapic.o
+
+include $(BASEDIR)/Post.mk
diff -r 9795d9407acc -r 768936b2800a xen/arch/x86/hvm/svm/Makefile
--- /dev/null   Sun Mar 19 13:02:18 2006
+++ b/xen/arch/x86/hvm/svm/Makefile     Sun Mar 19 14:17:50 2006
@@ -0,0 +1,12 @@
+include $(BASEDIR)/Rules.mk
+
+subdirs-$(x86_32) += x86_32
+subdirs-$(x86_64) += x86_64
+
+obj-y += emulate.o
+obj-y += instrlen.o
+obj-y += intr.o
+obj-y += svm.o
+obj-y += vmcb.o
+
+include $(BASEDIR)/Post.mk
diff -r 9795d9407acc -r 768936b2800a xen/arch/x86/hvm/svm/x86_32/Makefile
--- /dev/null   Sun Mar 19 13:02:18 2006
+++ b/xen/arch/x86/hvm/svm/x86_32/Makefile      Sun Mar 19 14:17:50 2006
@@ -0,0 +1,5 @@
+include $(BASEDIR)/Rules.mk
+
+obj-y += exits.o
+
+include $(BASEDIR)/Post.mk
diff -r 9795d9407acc -r 768936b2800a xen/arch/x86/hvm/svm/x86_64/Makefile
--- /dev/null   Sun Mar 19 13:02:18 2006
+++ b/xen/arch/x86/hvm/svm/x86_64/Makefile      Sun Mar 19 14:17:50 2006
@@ -0,0 +1,5 @@
+include $(BASEDIR)/Rules.mk
+
+obj-y += exits.o
+
+include $(BASEDIR)/Post.mk
diff -r 9795d9407acc -r 768936b2800a xen/arch/x86/hvm/vmx/Makefile
--- /dev/null   Sun Mar 19 13:02:18 2006
+++ b/xen/arch/x86/hvm/vmx/Makefile     Sun Mar 19 14:17:50 2006
@@ -0,0 +1,10 @@
+include $(BASEDIR)/Rules.mk
+
+subdirs-$(x86_32) += x86_32
+subdirs-$(x86_64) += x86_64
+
+obj-y += io.o
+obj-y += vmcs.o
+obj-y += vmx.o
+
+include $(BASEDIR)/Post.mk
diff -r 9795d9407acc -r 768936b2800a xen/arch/x86/hvm/vmx/x86_32/Makefile
--- /dev/null   Sun Mar 19 13:02:18 2006
+++ b/xen/arch/x86/hvm/vmx/x86_32/Makefile      Sun Mar 19 14:17:50 2006
@@ -0,0 +1,5 @@
+include $(BASEDIR)/Rules.mk
+
+obj-y += exits.o
+
+include $(BASEDIR)/Post.mk
diff -r 9795d9407acc -r 768936b2800a xen/arch/x86/hvm/vmx/x86_64/Makefile
--- /dev/null   Sun Mar 19 13:02:18 2006
+++ b/xen/arch/x86/hvm/vmx/x86_64/Makefile      Sun Mar 19 14:17:50 2006
@@ -0,0 +1,5 @@
+include $(BASEDIR)/Rules.mk
+
+obj-y += exits.o
+
+include $(BASEDIR)/Post.mk
diff -r 9795d9407acc -r 768936b2800a xen/arch/x86/x86_32/Makefile
--- /dev/null   Sun Mar 19 13:02:18 2006
+++ b/xen/arch/x86/x86_32/Makefile      Sun Mar 19 14:17:50 2006
@@ -0,0 +1,11 @@
+include $(BASEDIR)/Rules.mk
+
+obj-y += domain_page.o
+obj-y += entry.o
+obj-y += mm.o
+obj-y += seg_fixup.o
+obj-y += traps.o
+
+obj-$(supervisor_mode_kernel) += supervisor_mode_kernel.o
+
+include $(BASEDIR)/Post.mk
diff -r 9795d9407acc -r 768936b2800a xen/arch/x86/x86_64/Makefile
--- /dev/null   Sun Mar 19 13:02:18 2006
+++ b/xen/arch/x86/x86_64/Makefile      Sun Mar 19 14:17:50 2006
@@ -0,0 +1,7 @@
+include $(BASEDIR)/Rules.mk
+
+obj-y += entry.o
+obj-y += mm.o
+obj-y += traps.o
+
+include $(BASEDIR)/Post.mk

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
[More with this subject...]
<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] Move arch/x86 to new build system., Xen patchbot -unstable <=
Previous by Date:  [Xen-changelog] Apply Xen build system changes to all non-arch subdirectories., Xen patchbot -unstable
Next by Date:  [Xen-changelog] Abstract some details of context switching into ctxt_switch_from/to, Xen patchbot -unstable
Previous by Thread:  [Xen-changelog] Apply Xen build system changes to all non-arch subdirectories., Xen patchbot -unstable
Next by Thread:  [Xen-changelog] Abstract some details of context switching into ctxt_switch_from/to, Xen patchbot -unstable
Indexes:  [Date] [Thread] [Top] [All Lists]
 
   

Copyright , Citrix Systems Inc. All rights reserved. Legal and Privacy