summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorpfg <pfg@FreeBSD.org>2013-11-26 14:58:37 +0000
committerpfg <pfg@FreeBSD.org>2013-11-26 14:58:37 +0000
commit537e7ce6f90e4344fd3ec0e87736372b8fc3cef4 (patch)
treeddc081e4a33460f7821cbfb22c4f41400bf183f9 /contrib
parent99b77b1bb37173c85bcb4e5bd94a33468b076329 (diff)
downloadFreeBSD-src-537e7ce6f90e4344fd3ec0e87736372b8fc3cef4.zip
FreeBSD-src-537e7ce6f90e4344fd3ec0e87736372b8fc3cef4.tar.gz
gcc: Altivec register adjustments from Apple.
Obtained from: gcc pre-4.3 (rev. 124763; GPLv2) MFC after: 3 weeks
Diffstat (limited to 'contrib')
-rw-r--r--contrib/gcc/cp/decl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/gcc/cp/decl.c b/contrib/gcc/cp/decl.c
index 8b7a488..0bf09d4 100644
--- a/contrib/gcc/cp/decl.c
+++ b/contrib/gcc/cp/decl.c
@@ -4967,8 +4967,8 @@ make_rtl_for_nonlocal_decl (tree decl, tree init, const char* asmspec)
gcc_assert (TREE_STATIC (decl));
/* 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) || !TREE_PUBLIC (decl));
+ if (init == NULL_TREE && DECL_INITIAL (decl) == NULL_TREE)
+ gcc_assert (DECL_EXTERNAL (decl));
}
/* We don't create any RTL for local variables. */
OpenPOWER on IntegriCloud