From: Tim Deegan <tim@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
Subject: [PATCH 2/3] xen: move -nostdinc into common Rules.mk.
Date: Thu, 15 Aug 2013 14:25:06 +0100 [thread overview]
Message-ID: <1376573107-27249-3-git-send-email-tim@xen.org> (raw)
In-Reply-To: <1376573107-27249-1-git-send-email-tim@xen.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 <tim@xen.org>
---
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
next prev parent reply other threads:[~2013-08-15 13:25 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-15 13:25 [PATCH 0/3] stdinc-related build fixes Tim Deegan
2013-08-15 13:25 ` [PATCH 1/3] xen: move some arch CFLAGS into the common Rules.mk Tim Deegan
2013-08-15 14:11 ` Ian Campbell
2013-08-15 13:25 ` Tim Deegan [this message]
2013-08-15 14:12 ` [PATCH 2/3] xen: move -nostdinc into " Ian Campbell
2013-08-15 13:25 ` [PATCH 3/3] xen: Add stdbool.h workaround for BSD Tim Deegan
2013-08-15 14:15 ` Ian Campbell
2013-08-19 13:48 ` Ian Jackson
2013-08-19 14:16 ` Tim Deegan
2013-08-19 16:48 ` Ian Jackson
2013-08-15 13:51 ` [PATCH 0/3] stdinc-related build fixes Jan Beulich
2013-08-15 15:26 ` Keir Fraser
2013-08-15 15:55 ` Solaris / FreeBSD builds (was Re: [PATCH 0/3] stdinc-related build fixes.) Tim Deegan
2013-08-15 19:49 ` [PATCH 0/3] stdinc-related build fixes Patrick Welche
2013-08-15 19:58 ` Andrew Cooper
2013-08-15 21:05 ` Patrick Welche
2013-08-15 21:15 ` Tim Deegan
2013-08-16 7:17 ` clang compilation Patrick Welche
2013-08-16 8:17 ` Tim Deegan
2013-08-16 8:48 ` Jan Beulich
2013-08-16 8:54 ` Tim Deegan
2013-08-16 9:27 ` Jan Beulich
2013-08-16 10:00 ` Jan Beulich
2013-08-16 8:23 ` [PATCH 0/3] stdinc-related build fixes Jan Beulich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1376573107-27249-3-git-send-email-tim@xen.org \
--to=tim@xen.org \
--cc=Ian.Jackson@eu.citrix.com \
--cc=chegger@amazon.de \
--cc=ian.campbell@citrix.com \
--cc=jbeulich@suse.com \
--cc=keir@xen.org \
--cc=prlw1@cam.ac.uk \
--cc=stefano.stabellini@citrix.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).