From f5a54e9235a72b6f371c522d16ca2e74c25896cf Mon Sep 17 00:00:00 2001 From: Tim Deegan Date: Thu, 15 Aug 2013 11:20:48 +0100 Subject: xen: move some arch CFLAGS into the common Rules.mk. These are the same on all current architectures, so move them into xen/Rules.mk. Lay them out a little more neatly too. Signed-off-by: Tim Deegan Reviewed-by: Jan Beulich Acked-by: Ian Campbell Acked-by: Keir Fraser --- xen/Rules.mk | 4 ++++ xen/arch/arm/Rules.mk | 2 -- xen/arch/x86/Rules.mk | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index 26e5bb6ce1..c432ad6f6d 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -41,6 +41,10 @@ ALL_OBJS-y += $(BASEDIR)/xsm/built_in.o ALL_OBJS-y += $(BASEDIR)/arch/$(TARGET_ARCH)/built_in.o ALL_OBJS-$(x86) += $(BASEDIR)/crypto/built_in.o +CFLAGS-y += -fno-builtin -fno-common +CFLAGS-y += -Werror -Wredundant-decls -Wno-pointer-arith +CFLAGS-y += -pipe +CFLAGS-y += -iwithprefix include CFLAGS-y += -g -D__XEN__ -include $(BASEDIR)/include/xen/config.h CFLAGS-$(XSM_ENABLE) += -DXSM_ENABLE CFLAGS-$(FLASK_ENABLE) += -DFLASK_ENABLE -DXSM_MAGIC=0xf97cff8c diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index a18e7fd795..d80dfce584 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -10,8 +10,6 @@ HAS_DEVICE_TREE := y HAS_VIDEO := y HAS_ARM_HDLCD := y -CFLAGS += -fno-builtin -fno-common -Wredundant-decls -CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe CFLAGS += -I$(BASEDIR)/include $(call cc-options-add,CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS)) diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index 0a9d68d7ca..f629dff3f4 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -25,8 +25,6 @@ ifneq ($(XEN_OS),SunOS) CFLAGS-$(gcc) += -nostdinc endif -CFLAGS += -fno-builtin -fno-common -Wredundant-decls -CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe CFLAGS += -I$(BASEDIR)/include CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default -- cgit v1.2.3