Date: Fri, 03 Jan 2014 20:13:50 +0100 From: Andreas Tobler <andreast@FreeBSD.org> To: FreeBSD Tinderbox <tinderbox@FreeBSD.org>, current@FreeBSD.org, armv6@FreeBSD.org Subject: Re: [head tinderbox] failure on armv6/arm Message-ID: <52C70BEE.1090300@FreeBSD.org> In-Reply-To: <201401031846.s03Ikvak011766@freebsd-current.sentex.ca> References: <201401031846.s03Ikvak011766@freebsd-current.sentex.ca>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------080906050105010101090809
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
On 03.01.14 19:46, FreeBSD Tinderbox wrote:
> machine -> /src/sys/arm/include
> cc -c -O -pipe -std=c99 -g -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign -fformat-extensions -Wmissing-include-dirs -fdiagnostics-show-option -Wno-error-tautological-compare -Wno-error-empty-body -Wno-error-parentheses-equality -nostdinc -I. -I/src/sys -I/src/sys/contrib/altq -I/src/sys/contrib/ipfilter -I/src/sys/dev/ath -I/src/sys/dev/ath/ath_hal -I/src/sys/contrib/dev/ath/ath_hal -I/src/sys/contrib/ngatm -I/src/sys/dev/twa -I/src/sys/dev/cxgb -I/src/sys/dev/cxgbe -I/src/sys/contrib/libfdt -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h -funwind-tables -ffreestanding /src/sys/arm/arm/genassym.c
> In file included from /src/sys/arm/arm/genassym.c:48:
> In file included from ./machine/intr.h:71:
> /src/sys/sys/bus.h:585:10: fatal error: 'device_if.h' file not found
> #include "device_if.h"
The attached fixes this breakage (and the one on arm:arm). Ok to commit?
Andreas
--------------080906050105010101090809
Content-Type: text/plain; charset=UTF-8; x-mac-type="0"; x-mac-creator="0";
name="arm_build_fix.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="arm_build_fix.diff"
Index: arm/arm/trap.c
===================================================================
--- arm/arm/trap.c (revision 260220)
+++ arm/arm/trap.c (working copy)
@@ -85,6 +85,7 @@
__FBSDID("$FreeBSD$");
#include <sys/param.h>
+#include <sys/bus.h>
#include <sys/systm.h>
#include <sys/proc.h>
#include <sys/kernel.h>
Index: arm/include/intr.h
===================================================================
--- arm/include/intr.h (revision 260220)
+++ arm/include/intr.h (working copy)
@@ -67,8 +67,6 @@
#define NIRQ 32
#endif
-#include <machine/psl.h>
-#include <sys/bus.h>
int arm_get_next_irq(int);
void arm_mask_irq(uintptr_t);
Index: arm/include/psl.h
===================================================================
--- arm/include/psl.h (revision 260220)
+++ arm/include/psl.h (working copy)
@@ -46,7 +46,6 @@
#ifndef _MACHINE_PSL_H_
#define _MACHINE_PSL_H_
-#include <machine/intr.h>
/*
* These are the different SPL states
--------------080906050105010101090809--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?52C70BEE.1090300>