PR c/88568

[thirdparty/gcc.git] / gcc / attribs.c

diff --git a/gcc/attribs.c b/gcc/attribs.c
index a55638d9389f46ef21580b906f6488069f9226c4..adf497322daef3fe2e7d42b04f0857ed792f9aef 100644 (file)
--- a/gcc/attribs.c
+++ b/gcc/attribs.c
@@ -1691,8 +1691,11 @@ handle_dll_attribute (tree * pnode, tree name, tree args, int flags,
             a function global scope, unless declared static.  */
          if (current_function_decl != NULL_TREE && !TREE_STATIC (node))
            TREE_PUBLIC (node) = 1;
-         /* Clear TREE_STATIC because DECL_EXTERNAL is set.  */
-         TREE_STATIC (node) = 0;
+         /* Clear TREE_STATIC because DECL_EXTERNAL is set, unless
+            it is a C++ static data member.  */
+         if (DECL_CONTEXT (node) == NULL_TREE
+             || !RECORD_OR_UNION_TYPE_P (DECL_CONTEXT (node)))
+           TREE_STATIC (node) = 0;
        }
 
       if (*no_add_attrs == false)