[Xen-changelog] Merge.

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

# HG changeset patch
# User sos22@xxxxxxxxxxxxxxxxxxxx
# Node ID 9cc161c08b59ed78e405ac36fc67ec5d24dab37d
# Parent  52bddfb334ae233bc6c93f5d5ef89b8c14010e60
# Parent  b6ebabe4658a0c08e17853431d1c0eba13664d6e
Merge.

Signed-off-by: Steven Smith, sos22@xxxxxxxxx

diff -r 52bddfb334ae -r 9cc161c08b59 Config.mk
--- a/Config.mk Wed Nov 23 12:34:25 2005
+++ b/Config.mk Wed Nov 23 12:35:50 2005
@@ -8,7 +8,6 @@
 # Tools to run on system hosting the build
 HOSTCC     = gcc
 HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer
-HOSTCFLAGS += -Wdeclaration-after-statement
 
 AS         = $(CROSS_COMPILE)as
 LD         = $(CROSS_COMPILE)ld
@@ -39,7 +38,10 @@
 EXTRA_LIB += $(EXTRA_PREFIX)/$(LIBDIR)
 endif
 
-CFLAGS += -Wdeclaration-after-statement 
+test-gcc-flag = $(shell $(CC) -v --help 2>&1 | grep -q " $(1) " && echo $(1))
+
+HOSTCFLAGS += $(call test-gcc-flag,-Wdeclaration-after-statement)
+CFLAGS     += $(call test-gcc-flag,-Wdeclaration-after-statement)
 
 LDFLAGS += $(foreach i, $(EXTRA_LIB), -L$(i)) 
 CFLAGS += $(foreach i, $(EXTRA_INCLUDES), -I$(i))
diff -r 52bddfb334ae -r 9cc161c08b59 xen/Rules.mk
--- a/xen/Rules.mk      Wed Nov 23 12:34:25 2005
+++ b/xen/Rules.mk      Wed Nov 23 12:35:50 2005
@@ -43,8 +43,6 @@
 endif
 ALL_OBJS += $(BASEDIR)/arch/$(TARGET_ARCH)/arch.o
 
-test-gcc-flag = $(shell $(CC) -v --help 2>&1 | grep -q " $(1) " && echo $(1))
-
 include $(BASEDIR)/arch/$(TARGET_ARCH)/Rules.mk
 
 ifneq ($(debug),y)

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