1.1 --- a/xen/Rules.mk	Thu Mar 30 14:06:11 2006 +0100
     1.2 +++ b/xen/Rules.mk	Thu Mar 30 14:31:57 2006 +0100
     1.3 @@ -55,11 +55,14 @@ ifneq ($(max_phys_cpus),)
     1.4  CFLAGS-y               += -DMAX_PHYS_CPUS=$(max_phys_cpus)
     1.5  endif
     1.6  
     1.7 +AFLAGS-y               += -D__ASSEMBLY__
     1.8 +
     1.9  ALL_OBJS := $(ALL_OBJS-y)
    1.10  CFLAGS   := $(strip $(CFLAGS) $(CFLAGS-y))
    1.11 +AFLAGS   := $(strip $(AFLAGS) $(AFLAGS-y))
    1.12  
    1.13  %.o: %.c $(HDRS) Makefile
    1.14  	$(CC) $(CFLAGS) -c $< -o $@
    1.15  
    1.16  %.o: %.S $(HDRS) Makefile
    1.17 -	$(CC) $(CFLAGS) -D__ASSEMBLY__ -c $< -o $@
    1.18 +	$(CC) $(CFLAGS) $(AFLAGS) -c $< -o $@

     2.1 --- a/xen/arch/ia64/Makefile	Thu Mar 30 14:06:11 2006 +0100
     2.2 +++ b/xen/arch/ia64/Makefile	Thu Mar 30 14:31:57 2006 +0100
     2.3 @@ -76,7 +76,7 @@ asm-xsi-offsets.s: asm-xsi-offsets.c
     2.4  
     2.5  # I'm sure a Makefile wizard would know a better way to do this
     2.6  xen.lds.s: xen/xen.lds.S
     2.7 -	$(CC) -E $(CPPFLAGS) -P -DXEN -D__ASSEMBLY__ \
     2.8 +	$(CC) -E $(CPPFLAGS) -P -DXEN $(AFLAGS) \
     2.9  		-o xen.lds.s xen/xen.lds.S
    2.10  
    2.11  clean:: FORCE

     3.1 --- a/xen/arch/x86/Makefile	Thu Mar 30 14:06:11 2006 +0100
     3.2 +++ b/xen/arch/x86/Makefile	Thu Mar 30 14:31:57 2006 +0100
     3.3 @@ -72,7 +72,7 @@ asm-offsets.s: $(TARGET_SUBARCH)/asm-off
     3.4  	$(CC) $(CFLAGS) -S -o $@ $<
     3.5  
     3.6  xen.lds: $(TARGET_SUBARCH)/xen.lds.S $(HDRS)
     3.7 -	$(CC) $(CFLAGS) -P -E -Ui386 -D__ASSEMBLY__ -o $@ $<
     3.8 +	$(CC) $(CFLAGS) -P -E -Ui386 $(AFLAGS) -o $@ $<
     3.9  
    3.10  boot/mkelf32: boot/mkelf32.c
    3.11  	$(HOSTCC) $(HOSTCFLAGS) -o $@ $<