RE: [Xen-ia64-devel] Where to compile additional IVT.S

["Dong, Eddie" <eddie.dong@xxxxxxxxx>]

Dong, Eddie wrote:
> Alex/Isaku:
>       Current the make file is to compile additional ivt.S at
> kernel/., another approach is to compile in xen/..
>       The later one has following benfit:
>       1: Easy to read for Makefile and easy to extend for more
> hypervisors.
>       2: Xen specific ministate.h can be in arch/ia64/xen/, like the
> one under arch/ia64/kernel.
> 
> 
>       I am not a makefile expert, just use this example to explain
> idea, suggestion?
> thanks, eddie
> 
> 
Here is the formal patch for this.

Thanks, eddie



    Move 2nd compile of ivt.S to per hypervisor sub dir.
    
    Signed-off-by: Yaozu (Eddie) Dong <eddie.dong@xxxxxxxxx>

diff --git a/arch/ia64/kernel/Makefile b/arch/ia64/kernel/Makefile
index 3e9a162..78ec040 100644
--- a/arch/ia64/kernel/Makefile
+++ b/arch/ia64/kernel/Makefile
@@ -80,16 +80,3 @@ $(obj)/gate-data.o: $(obj)/gate.so
 #
 AFLAGS_ivt.o += -D__IA64_ASM_PARAVIRTUALIZED_NATIVE
 
-# xen multi compile
-$(obj)/xen_%.o: $(src)/%.S FORCE
-       $(call if_changed_dep,as_o_S)
-
-#
-# xenivt.o
-#
-obj-$(CONFIG_XEN) += xen_ivt.o
-ifeq ($(CONFIG_XEN), y)
-targets += xen_ivt.o
-$(obj)/build-in.o: xen_ivt.o
-endif
-AFLAGS_xen_ivt.o += -D__IA64_ASM_PARAVIRTUALIZED_XEN
diff --git a/arch/ia64/xen/Makefile b/arch/ia64/xen/Makefile
index 87e29d2..605b757 100644
--- a/arch/ia64/xen/Makefile
+++ b/arch/ia64/xen/Makefile
@@ -2,7 +2,11 @@
 # Makefile for Xen components
 #
 
+KBUILD_AFLAGS += -D__IA64_ASM_PARAVIRTUALIZED_XEN
+ 
 obj-y := hypercall.o time.o xenivt.o xensetup.o xen_pv_ops.o irq_xen.o
\
         hypervisor.o util.o xencomm.o xcom_hcall.o xcom_asm.o
paravirt_xen.o
 
+obj-y += ../kernel/ivt.o
+
 obj-$(CONFIG_IA64_GENERIC) += machvec.o
diff --git a/arch/ia64/xen/xenivt.S b/arch/ia64/xen/xenivt.S
index c688aaa..2d509f2 100644
--- a/arch/ia64/xen/xenivt.S
+++ b/arch/ia64/xen/xenivt.S
@@ -13,7 +13,6 @@
 #include <asm/kregs.h>
 #include <asm/pgtable.h>
 
-#define __IA64_ASM_PARAVIRTUALIZED_XEN
 #include <asm/xen/inst.h>
 #include <asm/xen/minstate.h>
 #include "../kernel/minstate.h"

Attachment: ivt_simplify.patch
Description: ivt_simplify.patch

_______________________________________________
Xen-ia64-devel mailing list
Xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ia64-devel