Jerone Young wrote: > This patch removes static x86 entries and makes things work for multiple > archs. > > Signed-off-by: Jerone Young <[EMAIL PROTECTED]> > > diff --git a/kernel/Makefile b/kernel/Makefile > --- a/kernel/Makefile > +++ b/kernel/Makefile > @@ -1,5 +1,10 @@ include ../config.mak > include ../config.mak > > +ARCH_DIR=$(ARCH) > +ifneq '$(filter $(ARCH_DIR), x86_64 i386)' '' > + ARCH_DIR=x86 > +endif > + >
Let's be consistent with functions and directives: ARCH_DIR=$(if $(filter $(ARCH),x86_64 i386),x86,$(ARCH)) > KVERREL = $(patsubst /lib/modules/%/build,%,$(KERNELDIR)) > > DESTDIR= > @@ -18,10 +23,19 @@ _hack = mv $1 $1.orig && \ > | sed '/\#include/! s/\blapic\b/l_apic/g' > $1 && rm $1.orig > > unifdef = mv $1 $1.orig && \ > - unifdef -DCONFIG_X86 $1.orig > $1; \ > + unifdef -DCONFIG_$(shell echo $(ARCH_DIR)|tr '[:lower:]' '[:upper:]') > $1.orig > $1; \ > [ $$? -le 1 ] && rm $1.orig > My eyes hurt. A new variable please (and assign with := to avoid the shell being called too often). > > hack = $(call _hack,$T/$(strip $1)) > + > +ifneq '$(filter $(ARCH_DIR), x86)' '' > +HACK_FILES = kvm_main.c \ > + mmu.c \ > + vmx.c \ > + svm.c \ > + x86.c \ > + irq.h > +endif > > hack-files-x86 = ... hack-files-ppc = ... hack-files = $(hack-files-$(ARCH_DIR)) (yeah, someone else is now gauging their eyes out) -- Any sufficiently difficult bug is indistinguishable from a feature. ------------------------------------------------------------------------- This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone _______________________________________________ kvm-devel mailing list kvm-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/kvm-devel
