From owner-svn-src-all@FreeBSD.ORG  Sat Jul 30 17:27:29 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 921E6106566B;
	Sat, 30 Jul 2011 17:27:29 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 81B968FC18;
	Sat, 30 Jul 2011 17:27:29 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p6UHRTuX008858;
	Sat, 30 Jul 2011 17:27:29 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6UHRTBr008855;
	Sat, 30 Jul 2011 17:27:29 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201107301727.p6UHRTBr008855@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Sat, 30 Jul 2011 17:27:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224523 - head/contrib/gcc/cp
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: Sat, 30 Jul 2011 17:27:29 -0000

Author: mm
Date: Sat Jul 30 17:27:29 2011
New Revision: 224523
URL: http://svn.freebsd.org/changeset/base/224523

Log:
  Fix invalid assertion of C++ external static data member declarations
  as anonymous namespaces are local to the current translation.
  
  GCC PR:		c++/33094
  
  Reviewed by:	uqs
  Approved by:	re (kib)
  Obtained from:	gcc (branches/redhat/gcc-4_1-branch, rev. 129554, GPLv2)
  MFC after:	1 week

Modified:
  head/contrib/gcc/cp/ChangeLog
  head/contrib/gcc/cp/decl.c

Modified: head/contrib/gcc/cp/ChangeLog
==============================================================================
--- head/contrib/gcc/cp/ChangeLog	Sat Jul 30 14:13:57 2011	(r224522)
+++ head/contrib/gcc/cp/ChangeLog	Sat Jul 30 17:27:29 2011	(r224523)
@@ -1,3 +1,9 @@
+2007-09-29  Jason Merrill  <jason@redhat.com>
+
+	PR c++/33094
+	* decl.c (make_rtl_for_nonlocal_decl): It's ok for a member
+	constant to not have DECL_EXTERNAL if it's file-local.
+
 2007-08-24  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/31941

Modified: head/contrib/gcc/cp/decl.c
==============================================================================
--- head/contrib/gcc/cp/decl.c	Sat Jul 30 14:13:57 2011	(r224522)
+++ head/contrib/gcc/cp/decl.c	Sat Jul 30 17:27:29 2011	(r224523)
@@ -4968,7 +4968,7 @@ make_rtl_for_nonlocal_decl (tree decl, t
       /* An in-class declaration of a static data member should be
 	 external; it is only a declaration, and not a definition.  */
       if (init == NULL_TREE)
-	gcc_assert (DECL_EXTERNAL (decl));
+	gcc_assert (DECL_EXTERNAL (decl) || !TREE_PUBLIC (decl));
     }
 
   /* We don't create any RTL for local variables.  */