From owner-svn-src-head@freebsd.org Thu Jan 14 17:03:05 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 68B67A81D27 for ; Thu, 14 Jan 2016 17:03:05 +0000 (UTC) (envelope-from steven@multiplay.co.uk) Received: from mail-wm0-x22f.google.com (mail-wm0-x22f.google.com [IPv6:2a00:1450:400c:c09::22f]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 096B91E26 for ; Thu, 14 Jan 2016 17:03:05 +0000 (UTC) (envelope-from steven@multiplay.co.uk) Received: by mail-wm0-x22f.google.com with SMTP id f206so356638161wmf.0 for ; Thu, 14 Jan 2016 09:03:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=multiplay-co-uk.20150623.gappssmtp.com; s=20150623; h=from:subject:to:references:cc:message-id:date:user-agent :mime-version:in-reply-to:content-type; bh=MyospNQAPhvQ3K4d2d3N5TRVgaf9pgtxOXgWINQ+yo0=; b=ZAFVDw9762fkHaTDviXxcMP2/cbJl/xs7PYS3p+YmJl2TXKNwHcZTzH9VA29NRF09g zRLBk7RcuxAtrkk4mMpsObrO5VbK5DWd9+6NJuduieFCox7LLGv6OT7i5A4kqk7zAZ3V zat3+m9kg2dH5oawf0ZjJGYBfKP2Kil5aO8Uici/pjEd3vzHS1h8QYohGZ0C5T5z6QWF dx+2zLon9Z5BM9Y81aixw5thFUKhMr+GsECZ4tEAkpl8f/tWeESgCUj0AYO+w3PkW8AK jjXeaVQlt0zOx9+p0bJtOVH6BqI+CIb54QotyMU7kwPx4U6EWBl04yQ8N9Bi7CnWn1K/ +A3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:subject:to:references:cc:message-id:date :user-agent:mime-version:in-reply-to:content-type; bh=MyospNQAPhvQ3K4d2d3N5TRVgaf9pgtxOXgWINQ+yo0=; b=EGS0bUDkSY88fUBFojGR1KN/1je5tgM7pnxH7e13lV0Wmu3AvAHtD4HoOaXXcw0AdR FzNgNs2luEck7HNk/hDUO7KHq9YDwv1SjTYopH6VtzMJm9LzLHWyygwwEnfIykToc1Jr IcfRaszT5O7PPKVI3wMy/b/7KdIr/4cVw3mYNxfum+qJ+hGsb4+E3oQny/M0YgMHBn+8 JtgFrjNzmtXsMzGq+CVCQxpdCCMsN/Bhy7V/P56pCNPhy1e227lKTB+QQ/Kgbx9k4Bg8 AQU08rLQi3st4atCn6NEDtxvI55wYiBNjHTnMamGZh8iFgmGSMqijlYypQxeyPCY2ze1 KTvg== X-Gm-Message-State: ALoCoQk7/pdAPte5CARGR+i+z5C2rozDqB+QNycaqfseRmeITA8pmH5oy0FLycKi/giSPlK0GP8I19O29gAFzIIMpl0rIF2IuQ== X-Received: by 10.194.6.196 with SMTP id d4mr5176320wja.120.1452790983560; Thu, 14 Jan 2016 09:03:03 -0800 (PST) Received: from [10.10.1.58] (liv3d.labs.multiplay.co.uk. [82.69.141.171]) by smtp.gmail.com with ESMTPSA id l2sm6901164wjf.15.2016.01.14.09.03.02 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 14 Jan 2016 09:03:02 -0800 (PST) From: Steven Hartland X-Google-Original-From: Steven Hartland Subject: Re: svn commit: r293903 - in head/sys/boot: arm/uboot efi/fdt efi/libefi To: Warner Losh , NGie Cooper References: <201601140922.u0E9M1rV025146@repo.freebsd.org> <9A7534C4-0A2C-4DAC-981A-09868F1723DA@gmail.com> Cc: src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Message-ID: <5697D4D9.9000204@freebsd.org> Date: Thu, 14 Jan 2016 17:03:21 +0000 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jan 2016 17:03:05 -0000 On 14/01/2016 16:53, Warner Losh wrote: > > > On Thu, Jan 14, 2016 at 2:47 AM, NGie Cooper > wrote: > > > > On Jan 14, 2016, at 01:27, NGie Cooper > wrote: > > > > > >> On Jan 14, 2016, at 01:22, Steven Hartland wrote: > >> > >> Author: smh > >> Date: Thu Jan 14 09:22:01 2016 > >> New Revision: 293903 > >> URL: https://svnweb.freebsd.org/changeset/base/293903 > >> > >> Log: > >> Fix GCC warnings causing build failure after r293724 > >> > >> Disable some compiler warnings for GCC (non-standard compiler) > fixing > >> build failures introduced by r293724, which enabled WARNS in > the EFI boot > >> code, when compiling with none standard compiler (GCC). > > > > Disabling warnings is wrong. Here’s how arm could be fixed: > > > > $ svn diff sys/boot/ > > Index: sys/boot/common/bootstrap.h > > =================================================================== > > --- sys/boot/common/bootstrap.h (revision 293877) > > +++ sys/boot/common/bootstrap.h (working copy) > > @@ -32,6 +32,7 @@ > > #include > > #include > > #include > > +#include > > > > /* > > * Generic device specifier; architecture-dependant > > @@ -332,12 +333,8 @@ > > extern struct arch_switch archsw; > > > > /* This must be provided by the MD code, but should it be in the > archsw? */ > > -void delay(int delay); > > - > > void dev_cleanup(void); > > > > -time_t time(time_t *tloc); > > - > > #ifndef CTASSERT /* Allow lint to override */ > > #define CTASSERT(x) _CTASSERT(x, __LINE__) > > #define _CTASSERT(x, y) __CTASSERT(x, y) > > Index: sys/boot/efi/include/efiapi.h > > =================================================================== > > --- sys/boot/efi/include/efiapi.h (revision 293877) > > +++ sys/boot/efi/include/efiapi.h (working copy) > > @@ -532,6 +532,7 @@ > > typedef > > EFI_STATUS > > (EFIAPI *EFI_RESERVED_SERVICE) ( > > + VOID > > ); > > > > typedef > > > > amd64 is a bit trickier: > > > > > /scratch/tmp/ngie/svn/sys/boot/efi/libefi/../include/efigop.h:75: > warning: 'ms_abi' attribute directive ignored > > > > I didn’t dig into why this is happening [yet], other than there > maybe being MS extensions involved? > > > > Thanks, > > -NGie > > This might fix amd64: > > Index: > /scratch/tmp/ngie/svn/sys/boot/efi/libefi/../include/amd64/efibind.h > =================================================================== > --- > /scratch/tmp/ngie/svn/sys/boot/efi/libefi/../include/amd64/efibind.h > (revision 293877) > +++ > /scratch/tmp/ngie/svn/sys/boot/efi/libefi/../include/amd64/efibind.h > (working copy) > @@ -160,8 +160,10 @@ > // > > #ifdef __amd64__ > +#if defined(__clang__) && (__clang_major__ >= 3 && > __clang_minor__ >= 5) > #define EFIAPI __attribute__((ms_abi)) > #endif > +#endif > > #ifndef EFIAPI // Forces EFI calling conventions > reguardless of compiler options > #ifdef _MSC_EXTENSIONS > > > > Sure this fix is right? If you aren't marking the ABI correctly, how > could this possibly work? > > Warner No I don't think it is, Andrew's fix is the most appropriate (disable building of all EFI on none supported platforms). Currently I intend to backout 293903 and apply this change instead. I'm just waiting on a full tinderbox under GCC to finish. Regards Steve