From owner-svn-src-all@FreeBSD.ORG Wed Mar 26 19:31:34 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@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 68DFAB5B;
Wed, 26 Mar 2014 19:31:34 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 554EBFCB;
Wed, 26 Mar 2014 19:31:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2QJVYhv049201;
Wed, 26 Mar 2014 19:31:34 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2QJVXgt049099;
Wed, 26 Mar 2014 19:31:33 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201403261931.s2QJVXgt049099@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 26 Mar 2014 19:31:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r263774 - in head: contrib/libstdc++/include/bits
sbin/devd
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Mar 2014 19:31:34 -0000
Author: dim
Date: Wed Mar 26 19:31:33 2014
New Revision: 263774
URL: http://svnweb.freebsd.org/changeset/base/263774
Log:
Revert r263694, and apply a better fix to squelch unnecessary warnings
from clang about possible keywords being treated as identifiers for the
remainder of the translation unit (a.k.a. -Wkeyword-compat), when using
libstdc++ in combination with -Wsystem-headers. This will not only fix
devd, but any C++ program using libstdc++.
MFC after: 3 days
X-MFC-With: r263694
Modified:
head/contrib/libstdc++/include/bits/cpp_type_traits.h
head/sbin/devd/Makefile
Modified: head/contrib/libstdc++/include/bits/cpp_type_traits.h
==============================================================================
--- head/contrib/libstdc++/include/bits/cpp_type_traits.h Wed Mar 26 17:43:24 2014 (r263773)
+++ head/contrib/libstdc++/include/bits/cpp_type_traits.h Wed Mar 26 19:31:33 2014 (r263774)
@@ -80,6 +80,13 @@ _GLIBCXX_END_NAMESPACE
_GLIBCXX_BEGIN_NAMESPACE(std)
+#ifdef __clang__
+// When using clang, suppress warnings about possible keywords (such as
+// __is_void, __is_pod, etc) being used as identifiers.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wkeyword-compat"
+#endif
+
namespace __detail
{
// NB: g++ can not compile these if declared within the class
@@ -398,6 +405,10 @@ namespace __detail
};
#endif
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
_GLIBCXX_END_NAMESPACE
#endif //_CPP_TYPE_TRAITS_H
Modified: head/sbin/devd/Makefile
==============================================================================
--- head/sbin/devd/Makefile Wed Mar 26 17:43:24 2014 (r263773)
+++ head/sbin/devd/Makefile Wed Mar 26 19:31:33 2014 (r263774)
@@ -13,7 +13,6 @@ LDADD= -ll -lutil
YFLAGS+=-v
CFLAGS+=-I. -I${.CURDIR}
-CFLAGS.clang+=-Wno-keyword-compat
CLEANFILES= y.output