From owner-svn-src-stable-11@freebsd.org  Wed Sep 13 00:51:37 2017
Return-Path: <owner-svn-src-stable-11@freebsd.org>
Delivered-To: svn-src-stable-11@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 600D6E024AE;
 Wed, 13 Sep 2017 00:51:37 +0000 (UTC)
 (envelope-from rlibby@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 29AB66B91B;
 Wed, 13 Sep 2017 00:51:37 +0000 (UTC)
 (envelope-from rlibby@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8D0pa9J020155;
 Wed, 13 Sep 2017 00:51:36 GMT (envelope-from rlibby@FreeBSD.org)
Received: (from rlibby@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8D0paSx020154;
 Wed, 13 Sep 2017 00:51:36 GMT (envelope-from rlibby@FreeBSD.org)
Message-Id: <201709130051.v8D0paSx020154@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rlibby set sender to
 rlibby@FreeBSD.org using -f
From: Ryan Libby <rlibby@FreeBSD.org>
Date: Wed, 13 Sep 2017 00:51:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r323515 - stable/11/lib/msun/tests
X-SVN-Group: stable-11
X-SVN-Commit-Author: rlibby
X-SVN-Commit-Paths: stable/11/lib/msun/tests
X-SVN-Commit-Revision: 323515
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-11@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for only the 11-stable src tree
 <svn-src-stable-11.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-11/>
List-Post: <mailto:svn-src-stable-11@freebsd.org>
List-Help: <mailto:svn-src-stable-11-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Sep 2017 00:51:37 -0000

Author: rlibby
Date: Wed Sep 13 00:51:36 2017
New Revision: 323515
URL: https://svnweb.freebsd.org/changeset/base/323515

Log:
  MFC r321483 (by ngie):
  
    Mask issues with duplicate definitions for __fnstcw, __fldenv, and
    __fldcw on i386 by ignoring -Wmacro-redefined.
  
    This is a bandaid until the code is fixed and will be reverted before
    MFC.
  
  This unbreaks the tinderbox build for i386.  Although the head commit
  log suggests this would not be MFC'd, it nevertheless is being MFC'd as
  the commit that enabled the warnings that this silences was MFC'd
  without any proper fix for the warnings (head r321455, stable/11
  r323299).

Modified:
  stable/11/lib/msun/tests/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/lib/msun/tests/Makefile
==============================================================================
--- stable/11/lib/msun/tests/Makefile	Wed Sep 13 00:37:42 2017	(r323514)
+++ stable/11/lib/msun/tests/Makefile	Wed Sep 13 00:51:36 2017	(r323515)
@@ -84,6 +84,10 @@ SRCS.ilogb2_test=	ilogb_test.c
 
 LIBADD+=	m
 
+.if ${MACHINE_CPUARCH} == "i386"
+# XXX: __fldcw macro mismatch between fenv.h and ieeefp.h .
+CWARNFLAGS.clang+=	-Wno-error=macro-redefined
+.endif
 WARNS?=		1
 
 # Copied from lib/msun/Makefile