From owner-svn-src-all@freebsd.org Thu Jan 14 10:13:45 2016 Return-Path: Delivered-To: svn-src-all@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 D4CDCA826DC; Thu, 14 Jan 2016 10:13:45 +0000 (UTC) (envelope-from andrew@fubar.geek.nz) Received: from kif.fubar.geek.nz (kif.fubar.geek.nz [178.62.119.249]) by mx1.freebsd.org (Postfix) with ESMTP id A4E141CE2; Thu, 14 Jan 2016 10:13:45 +0000 (UTC) (envelope-from andrew@fubar.geek.nz) Received: from zapp (bcdd4360.skybroadband.com [188.221.67.96]) by kif.fubar.geek.nz (Postfix) with ESMTPSA id 9ED85D7A17; Thu, 14 Jan 2016 10:13:44 +0000 (UTC) Date: Thu, 14 Jan 2016 10:13:43 +0000 From: Andrew Turner To: Steven Hartland Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r293903 - in head/sys/boot: arm/uboot efi/fdt efi/libefi Message-ID: <20160114101343.70e73d01@zapp> In-Reply-To: <201601140922.u0E9M1rV025146@repo.freebsd.org> References: <201601140922.u0E9M1rV025146@repo.freebsd.org> X-Mailer: Claws Mail 3.13.1 (GTK+ 2.24.29; amd64-portbld-freebsd11.0) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/XbyyDAsBdNwk+1EzeNlt40n" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jan 2016 10:13:45 -0000 --MP_/XbyyDAsBdNwk+1EzeNlt40n Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline On Thu, 14 Jan 2016 09:22:01 +0000 (UTC) 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). > > Raised by: ian > MFC after: 2 weeks > X-MFC-With: r293268 > Sponsored by: Multiplay The attached would be a better (however untested) solution. Given we don't build boot1.efi or loader.efi with gcc it extends this to all the EFI code. Andrew --MP_/XbyyDAsBdNwk+1EzeNlt40n Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=efi_no_gcc.diff Index: sys/boot/efi/Makefile =================================================================== --- sys/boot/efi/Makefile (revision 293737) +++ sys/boot/efi/Makefile (working copy) @@ -2,6 +2,9 @@ .include +# In-tree GCC does not support __attribute__((ms_abi)). +.if ${COMPILER_TYPE} != "gcc" + SUBDIR= libefi .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm" @@ -16,4 +19,6 @@ SUBDIR+= loader boot1 .endif +.endif # ${COMPILER_TYPE} != "gcc" + .include Index: sys/boot/efi/boot1/Makefile =================================================================== --- sys/boot/efi/boot1/Makefile (revision 293737) +++ sys/boot/efi/boot1/Makefile (working copy) @@ -4,9 +4,6 @@ .include -# In-tree GCC does not support __attribute__((ms_abi)). -.if ${COMPILER_TYPE} != "gcc" - MK_SSP= no PROG= boot1.sym @@ -96,8 +93,6 @@ CLEANFILES= boot1.efi boot1.efifat -.endif # ${COMPILER_TYPE} != "gcc" - .include beforedepend ${OBJS}: machine Index: sys/boot/efi/loader/Makefile =================================================================== --- sys/boot/efi/loader/Makefile (revision 293737) +++ sys/boot/efi/loader/Makefile (working copy) @@ -4,9 +4,6 @@ .include -# In-tree GCC does not support __attribute__((ms_abi)). -.if ${COMPILER_TYPE} != "gcc" - MK_SSP= no PROG= loader.sym @@ -113,8 +110,6 @@ ${LDSCRIPT} LDADD= ${LIBFICL} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} ${LIBSTAND} -.endif # ${COMPILER_TYPE} != "gcc" - .include beforedepend ${OBJS}: machine --MP_/XbyyDAsBdNwk+1EzeNlt40n--