Compile tested and verified. -JX

diff -r 2cd44eba4df6 xen/Rules.mk --- a/xen/Rules.mk Thu Mar 30 11:55:07 2006 +0100 +++ b/xen/Rules.mk Thu Mar 30 07:15:00 2006 -0500 @@ -55,11 +55,15 @@ CFLAGS-y += -DMAX_PHYS_CPU CFLAGS-y += -DMAX_PHYS_CPUS=$(max_phys_cpus) endif +AFLAGS := -D__ASSEMBLY__ + + ALL_OBJS := $(ALL_OBJS-y) CFLAGS := $(strip $(CFLAGS) $(CFLAGS-y)) +AFLAGS := $(strip $(AFLAGS) $(AFLAGS-y)) %.o: %.c $(HDRS) Makefile $(CC) $(CFLAGS) -c $< -o $@ %.o: %.S $(HDRS) Makefile - $(CC) $(CFLAGS) -D__ASSEMBLY__ -c $< -o $@ + $(CC) $(CFLAGS) $(AFLAGS) -c $< -o $@ diff -r 2cd44eba4df6 xen/arch/ia64/Makefile --- a/xen/arch/ia64/Makefile Thu Mar 30 11:55:07 2006 +0100 +++ b/xen/arch/ia64/Makefile Thu Mar 30 07:15:00 2006 -0500 @@ -76,7 +76,7 @@ asm-xsi-offsets.s: asm-xsi-offsets.c # I'm sure a Makefile wizard would know a better way to do this xen.lds.s: xen/xen.lds.S - $(CC) -E $(CPPFLAGS) -P -DXEN -D__ASSEMBLY__ \ + $(CC) -E $(CPPFLAGS) -P -DXEN $(AFLAGS) \ -o xen.lds.s xen/xen.lds.S clean:: FORCE diff -r 2cd44eba4df6 xen/arch/x86/Makefile --- a/xen/arch/x86/Makefile Thu Mar 30 11:55:07 2006 +0100 +++ b/xen/arch/x86/Makefile Thu Mar 30 07:15:00 2006 -0500 @@ -72,7 +72,7 @@ asm-offsets.s: $(TARGET_SUBARCH)/asm-off $(CC) $(CFLAGS) -S -o $@ $< xen.lds: $(TARGET_SUBARCH)/xen.lds.S $(HDRS) - $(CC) $(CFLAGS) -P -E -Ui386 -D__ASSEMBLY__ -o $@ $< + $(CC) $(CFLAGS) -P -E -Ui386 $(AFLAGS) -o $@ $< boot/mkelf32: boot/mkelf32.c $(HOSTCC) $(HOSTCFLAGS) -o $@ $<