[Xen-changelog] Use AFLAGS for assembly files so we can "+=" more flags.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 6cb5928fa0268884adab1b72fb921cb3a5187bd6
# Parent  85b7a341207e923ee8f5385a62c262332ee861b7
Use AFLAGS for assembly files so we can "+=" more flags.

From: Jimi Xenidis <jimix@xxxxxxxxxxxxxx>

Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>

diff -r 85b7a341207e -r 6cb5928fa026 xen/Rules.mk
--- a/xen/Rules.mk      Thu Mar 30 13:06:11 2006
+++ b/xen/Rules.mk      Thu Mar 30 13:31:57 2006
@@ -55,11 +55,14 @@
 CFLAGS-y               += -DMAX_PHYS_CPUS=$(max_phys_cpus)
 endif
 
+AFLAGS-y               += -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 85b7a341207e -r 6cb5928fa026 xen/arch/ia64/Makefile
--- a/xen/arch/ia64/Makefile    Thu Mar 30 13:06:11 2006
+++ b/xen/arch/ia64/Makefile    Thu Mar 30 13:31:57 2006
@@ -76,7 +76,7 @@
 
 # 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 85b7a341207e -r 6cb5928fa026 xen/arch/x86/Makefile
--- a/xen/arch/x86/Makefile     Thu Mar 30 13:06:11 2006
+++ b/xen/arch/x86/Makefile     Thu Mar 30 13:31:57 2006
@@ -72,7 +72,7 @@
        $(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 $@ $<

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