From owner-svn-src-stable@FreeBSD.ORG  Sat Aug  6 07:01:16 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 807851065675;
	Sat,  6 Aug 2011 07:01:16 +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 6FDD38FC08;
	Sat,  6 Aug 2011 07:01:16 +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 p7671GfU039458;
	Sat, 6 Aug 2011 07:01:16 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7671G26039455;
	Sat, 6 Aug 2011 07:01:16 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201108060701.p7671G26039455@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Sat, 6 Aug 2011 07:01:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224671 - stable/7/contrib/gcc/cp
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Aug 2011 07:01:16 -0000

Author: mm
Date: Sat Aug  6 07:01:16 2011
New Revision: 224671
URL: http://svn.freebsd.org/changeset/base/224671

Log:
  MFC r224523, r224524:
  
  MFC r224523:
  Fix invalid assertion of C++ external static data member declarations
  as anonymous namespaces are local to the current translation.
  
  MFC r224524:
  Fix accidential dos-style endings to unix-style line endings
  from last commit (r224523) to match the version approved by re@
  
  GCC PR:		c++/33094
  
  Reviewed by:	uqs
  Obtained from:	gcc (branches/redhat/gcc-4_1-branch, rev. 129554, GPLv2)

Modified:
  stable/7/contrib/gcc/cp/ChangeLog
  stable/7/contrib/gcc/cp/decl.c
Directory Properties:
  stable/7/contrib/gcc/   (props changed)

Modified: stable/7/contrib/gcc/cp/ChangeLog
==============================================================================
--- stable/7/contrib/gcc/cp/ChangeLog	Sat Aug  6 07:00:26 2011	(r224670)
+++ stable/7/contrib/gcc/cp/ChangeLog	Sat Aug  6 07:01:16 2011	(r224671)
@@ -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: stable/7/contrib/gcc/cp/decl.c
==============================================================================
--- stable/7/contrib/gcc/cp/decl.c	Sat Aug  6 07:00:26 2011	(r224670)
+++ stable/7/contrib/gcc/cp/decl.c	Sat Aug  6 07:01:16 2011	(r224671)
@@ -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.  */