diff options
author | kaf24@localhost.localdomain <kaf24@localhost.localdomain> | 2006-08-28 12:09:36 +0100 |
---|---|---|
committer | kaf24@localhost.localdomain <kaf24@localhost.localdomain> | 2006-08-28 12:09:36 +0100 |
commit | 99deb3f2fb35722fc11798ea59910ea37fd1562c (patch) | |
tree | 06ab85a27e6f327437abefa4c2ab6ddf3a61f5c5 /xen/arch/x86/Makefile | |
parent | a1041848b5eba0726c9c7fd59cec56301769e8a4 (diff) | |
download | xen-99deb3f2fb35722fc11798ea59910ea37fd1562c.tar.gz xen-99deb3f2fb35722fc11798ea59910ea37fd1562c.tar.bz2 xen-99deb3f2fb35722fc11798ea59910ea37fd1562c.zip |
[XEN] Rename shadow2 to shadow and move the various source
files into a sensible directory hierarchy.
Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'xen/arch/x86/Makefile')
-rw-r--r-- | xen/arch/x86/Makefile | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 6c3552c6c9..991fa436b3 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -2,6 +2,7 @@ subdir-y += acpi subdir-y += cpu subdir-y += genapic subdir-y += hvm +subdir-y += mm subdir-y += oprofile subdir-$(x86_32) += x86_32 @@ -41,23 +42,6 @@ obj-y += traps.o obj-y += usercopy.o obj-y += x86_emulate.o -ifneq ($(pae),n) -obj-$(x86_32) += shadow2-common.o shadow2_g2_on_s3.o shadow2_g3_on_s3.o -else -obj-$(x86_32) += shadow2-common.o shadow2_g2_on_s2.o -endif - -obj-$(x86_64) += shadow2-common.o shadow2_g4_on_s4.o shadow2_g3_on_s3.o \ - shadow2_g2_on_s3.o - -guest_levels = $(subst g,,$(filter g%,$(subst ., ,$(subst _, ,$(subst shadow2_,,$(1)))))) -shadow_levels = $(subst s,,$(filter s%,$(subst ., ,$(subst _, ,$(subst shadow2_,,$(1)))))) -shadow2_defns = -DGUEST_PAGING_LEVELS=$(call guest_levels,$(1)) \ - -DSHADOW_PAGING_LEVELS=$(call shadow_levels,$(1)) - -shadow2_%.o: shadow2.c $(HDRS) Makefile - $(CC) $(CFLAGS) $(call shadow2_defns,$(@F)) -c $< -o $@ - obj-$(crash_debug) += gdbstub.o $(TARGET): $(TARGET)-syms boot/mkelf32 @@ -86,9 +70,6 @@ xen.lds: $(TARGET_SUBARCH)/xen.lds.S $(HDRS) boot/mkelf32: boot/mkelf32.c $(HOSTCC) $(HOSTCFLAGS) -o $@ $< -shadow_guest32.o: shadow.c -shadow_guest32pae.o: shadow.c - .PHONY: clean clean:: rm -f asm-offsets.s xen.lds boot/*.o boot/*~ boot/core boot/mkelf32 |