From owner-freebsd-current@FreeBSD.ORG Fri Jan 3 19:14:14 2014 Return-Path: Delivered-To: current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2BE05DA7; Fri, 3 Jan 2014 19:14:14 +0000 (UTC) Received: from smtp.fgznet.ch (mail.fgznet.ch [81.92.96.47]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7F9441A59; Fri, 3 Jan 2014 19:14:06 +0000 (UTC) Received: from deuterium.andreas.nets (dhclient-91-190-14-19.flashcable.ch [91.190.14.19]) by smtp.fgznet.ch (8.13.8/8.13.8/Submit_SMTPAUTH) with ESMTP id s03JDof0077338; Fri, 3 Jan 2014 20:13:56 +0100 (CET) (envelope-from andreast@FreeBSD.org) Message-ID: <52C70BEE.1090300@FreeBSD.org> Date: Fri, 03 Jan 2014 20:13:50 +0100 From: Andreas Tobler User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:24.0) Gecko/20100101 Thunderbird/24.1.1 MIME-Version: 1.0 To: FreeBSD Tinderbox , current@FreeBSD.org, armv6@FreeBSD.org Subject: Re: [head tinderbox] failure on armv6/arm References: <201401031846.s03Ikvak011766@freebsd-current.sentex.ca> In-Reply-To: <201401031846.s03Ikvak011766@freebsd-current.sentex.ca> Content-Type: multipart/mixed; boundary="------------080906050105010101090809" X-Scanned-By: MIMEDefang 2.64 on 81.92.96.47 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jan 2014 19:14:14 -0000 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 +#include #include #include #include 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 -#include 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 /* * These are the different SPL states --------------080906050105010101090809--