From: pfg <pfg@FreeBSD.org>
Date: Mon, 12 Oct 2015 02:05:25 +0000 (+0000)
Subject: Revert	r289150:
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2b83d5a980404ddde25f082a1515d59a921b7f4b;p=people%2Fjulieng%2Ffreebsd.git

Revert	r289150:
Correct handling of enum attributes with g++

It is causing issues on some platforms.

Reported by:	sbruno (through adrian)
---

diff --git a/contrib/gcc/cp/parser.c b/contrib/gcc/cp/parser.c
index 895d0eeed111..25cc2250f9f0 100644
--- a/contrib/gcc/cp/parser.c
+++ b/contrib/gcc/cp/parser.c
@@ -10906,7 +10906,6 @@ cp_parser_enum_specifier (cp_parser* parser)
   if (cp_parser_allow_gnu_extensions_p (parser))
     {
       tree trailing_attr = cp_parser_attributes_opt (parser);
-      trailing_attr = chainon (trailing_attr, attributes);
       cplus_decl_attributes (&type,
 			     trailing_attr,
 			     (int) ATTR_FLAG_TYPE_IN_PLACE);