From owner-svn-src-head@freebsd.org  Thu Dec  7 22:11:25 2017
Return-Path: <owner-svn-src-head@freebsd.org>
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 13D73E929F3;
 Thu,  7 Dec 2017 22:11:25 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D508978CD2;
 Thu,  7 Dec 2017 22:11:24 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vB7MBN8J049459;
 Thu, 7 Dec 2017 22:11:23 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB7MBNTr049458;
 Thu, 7 Dec 2017 22:11:23 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201712072211.vB7MBNTr049458@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Thu, 7 Dec 2017 22:11:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r326671 - head/stand/i386/gptzfsboot
X-SVN-Group: head
X-SVN-Commit-Author: markj
X-SVN-Commit-Paths: head/stand/i386/gptzfsboot
X-SVN-Commit-Revision: 326671
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Dec 2017 22:11:25 -0000

Author: markj
Date: Thu Dec  7 22:11:23 2017
New Revision: 326671
URL: https://svnweb.freebsd.org/changeset/base/326671

Log:
  Avoid setting -Wno-tentative-definition-incomplete-type with gcc.
  
  No version of gcc that I've tried accepts this flag.
  
  Reviewed by:	imp
  Differential Revision:	https://reviews.freebsd.org/D13415

Modified:
  head/stand/i386/gptzfsboot/Makefile

Modified: head/stand/i386/gptzfsboot/Makefile
==============================================================================
--- head/stand/i386/gptzfsboot/Makefile	Thu Dec  7 20:41:23 2017	(r326670)
+++ head/stand/i386/gptzfsboot/Makefile	Thu Dec  7 22:11:23 2017	(r326671)
@@ -39,12 +39,9 @@ CFLAGS+=-DBOOTPROG=\"gptzfsboot\" \
 	-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
 	-Winline -Wno-pointer-sign
 
-NO_WCAST_ALIGN=
+CFLAGS.clang+=	-Wno-tentative-definition-incomplete-type
 
-.if ${COMPILER_TYPE} == "clang" || \
-    (${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} > 40201)
-CFLAGS+=	-Wno-tentative-definition-incomplete-type
-.endif
+NO_WCAST_ALIGN=
 
 .if ${MACHINE} == "amd64"
 LIBZFSBOOT=${BOOTOBJ}/zfs32/libzfsboot.a