Re: stdbool.h -nostdinc XSA-55 trouble

[Patrick Welche <prlw1@cam.ac.uk>]

[-- Attachment #1: Type: text/plain, Size: 831 bytes --]

On Fri, Aug 09, 2013 at 07:44:26AM +0100, Jan Beulich wrote:
> >>> On 08.08.13 at 17:47, Patrick Welche <prlw1@cam.ac.uk> wrote:
> > On Thu, Aug 08, 2013 at 04:30:06PM +0100, Jan Beulich wrote:
> >> No, according to my checking, the --prefix configure option
> >> listed does not correlate with the directory where the header
> >> is found.
> > 
> > Yes - I think our emails crossed...
> > 
> > The underlying problem is:
> > 
> > Linux:   /usr/lib/gcc/i?86-linux-gnu/n.m/include/stdbool.h
> > NetBSD:  /usr/include/stdbool.h
> 
> So then my original recommendation holds: Extend the Solaris
> workaround to NetBSD, but at the same time generalize it by
> moving it from xen/arch/*/Rules.mk to xen/Rules.mk.

So something like the attached would do the trick...
(I had a successful "make xen" with this on -head)

Cheers,

Patrick

[-- Attachment #2: 0001-NetBSD-stores-stdbool.h-in-usr-include.patch --]
[-- Type: text/plain, Size: 1690 bytes --]

>From 6a1c15425aa33744957540679f8ab5be4330a9f3 Mon Sep 17 00:00:00 2001
From: Patrick Welche <prlw1@cam.ac.uk>
Date: Fri, 9 Aug 2013 15:55:14 +0100
Subject: [PATCH] NetBSD stores stdbool.h in /usr/include

-iwithprefix include will look in a compiler specific directory
and thus not find it, so remove -nostdinc for NetBSD. (This applies
for both gcc and clang.)

Move (non-)addition of -nostdinc to xen/Rules.mk as this is not
arch specific, as suggested by Jan Beulich.

Signed-off-by: Patrick Welche <prlw1@cam.ac.uk>
---
 xen/Rules.mk          | 9 +++++++++
 xen/arch/x86/Rules.mk | 6 ------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/xen/Rules.mk b/xen/Rules.mk
index 26e5bb6..581cf8b 100644
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -13,6 +13,15 @@ lto           ?= n
 
 include $(XEN_ROOT)/Config.mk
 
+# Solaris and NetBSD grab stdarg.h and friends from the system include
+# directory.
+# Clang likewise.
+ifeq ($(XEN_OS),SunOS)
+else ifeq ($(XEN_OS),NetBSD)
+else
+CFLAGS-$(gcc) += -nostdinc
+endif
+
 # Hardcoded configuration implications and dependencies.
 # Do this is a neater way if it becomes unwieldy.
 ifeq ($(debug),y)
diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
index 0a9d68d..a116739 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 += -fno-builtin -fno-common -Wredundant-decls
 CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe
 CFLAGS += -I$(BASEDIR)/include 
-- 
1.8.3.3


[-- Attachment #3: Type: text/plain, Size: 126 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel