Remove a Cygnus FSF difference, so the tree will build.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@11420 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 8d1d8cd..31f8613 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -7424,10 +7424,8 @@ grokdeclarator (declarator, declspecs, decl_context, initialized, raises, attrli
   int funcdef_flag = 0;
   enum tree_code innermost_code = ERROR_MARK;
   int bitfield = 0;
-#if 0
-  /* See the code below that used this.  */
   tree decl_machine_attr = NULL_TREE;
-#endif
+
   /* Set this to error_mark_node for FIELD_DECLs we could not handle properly.
      All FIELD_DECLs we build here have `init' put into their DECL_INITIAL.  */
   tree init = NULL_TREE;
@@ -7828,10 +7826,7 @@ grokdeclarator (declarator, declspecs, decl_context, initialized, raises, attrli
          else
            {
              type = TREE_TYPE (t);
-#if 0
-             /* See the code below that used this.  */
              decl_machine_attr = DECL_MACHINE_ATTRIBUTES (id);
-#endif
              typedef_decl = t;
            }
        }
@@ -9277,9 +9272,11 @@ grokdeclarator (declarator, declspecs, decl_context, initialized, raises, attrli
                       || ! (funcdef_flag < 0 || inlinep));
            decl = grokfndecl (ctype, type, declarator,
                               virtualp, flags, quals, raises, attrlist,
-                              friendp ? -1 : 0, publicp, inlinep);
+                              friendp ? -1 : 0, publicp, inlinep,
+                              funcdef_flag);
            if (decl == NULL_TREE)
              return NULL_TREE;
+
            decl = build_decl_attribute_variant (decl, decl_machine_attr);
 
            if (explicitp == 2)