gcc-plugins: Use dynamic initializers

GCC 8 changed the order of some fields and is very picky about ordering
in static initializers, so instead just move to dynamic initializers,
and drop the redundant already-zero field assignments.

Suggested-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Signed-off-by: Kees Cook <keescook@chromium.org>

1 files changed, 5 insertions, 12 deletions

diff --git a/scripts/gcc-plugins/latent_entropy_plugin.c b/scripts/gcc-plugins/latent_entropy_plugin.c
index 65264960910d..cbe1d6c4b1a5 100644
--- a/scripts/gcc-plugins/latent_entropy_plugin.c
+++ b/scripts/gcc-plugins/latent_entropy_plugin.c
@@ -255,21 +255,14 @@ static tree handle_latent_entropy_attribute(tree *node, tree name,
         return NULL_TREE;
 }
 
-static struct attribute_spec latent_entropy_attr = {
-        .name                           = "latent_entropy",
-        .min_length                     = 0,
-        .max_length                     = 0,
-        .decl_required                  = true,
-        .type_required                  = false,
-        .function_type_required         = false,
-        .handler                        = handle_latent_entropy_attribute,
-#if BUILDING_GCC_VERSION >= 4007
-        .affects_type_identity          = false
-#endif
-};
+static struct attribute_spec latent_entropy_attr = { };
 
 static void register_attributes(void *event_data __unused, void *data __unused)
 {
+        latent_entropy_attr.name                = "latent_entropy";
+        latent_entropy_attr.decl_required       = true;
+        latent_entropy_attr.handler             = handle_latent_entropy_attribute;
+
         register_attribute(&latent_entropy_attr);
 }