From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tim Deegan Subject: [PATCH 2/3] xen: move -nostdinc into common Rules.mk. Date: Thu, 15 Aug 2013 14:25:06 +0100 Message-ID: <1376573107-27249-3-git-send-email-tim@xen.org> References: <1376573107-27249-1-git-send-email-tim@xen.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1376573107-27249-1-git-send-email-tim@xen.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: keir@xen.org, ian.campbell@citrix.com, chegger@amazon.de, Ian.Jackson@eu.citrix.com, prlw1@cam.ac.uk, stefano.stabellini@citrix.com, jbeulich@suse.com List-Id: xen-devel@lists.xenproject.org Previously we didn't use it at all the on ARM ports or for clang builds. For ARM, I think this is just an oversight. For clang, this used not to work, because '-withprefix include' didn't let us see stdarg.h, but that's fixed in clang v3.0. Also move the '-withprefix include' to beside -nostdinc as it's only needed with -nostdinc anyway. Signed-off-by: Tim Deegan --- xen/Rules.mk | 6 +++++- xen/arch/x86/Rules.mk | 6 ------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index c432ad6..bbfc1ac 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -44,8 +44,12 @@ 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 +# Solaris puts stdarg.h &c in the system include directory. +ifneq ($(XEN_OS),SunOS) +CFLAGS-y += -nostdinc -iwithprefix include +endif + CFLAGS-$(XSM_ENABLE) += -DXSM_ENABLE CFLAGS-$(FLASK_ENABLE) += -DFLASK_ENABLE -DXSM_MAGIC=0xf97cff8c CFLAGS-$(FLASK_ENABLE) += -DFLASK_DEVELOP -DFLASK_BOOTPARAM -DFLASK_AVC_STATS diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index f629dff..04c1a90 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -19,12 +19,6 @@ xenoprof := y # supervisor_mode_kernel ?= n -# Solaris grabs stdarg.h and friends from the system include directory. -# Clang likewise. -ifneq ($(XEN_OS),SunOS) -CFLAGS-$(gcc) += -nostdinc -endif - CFLAGS += -I$(BASEDIR)/include CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default -- 1.7.10.4