gcc-plugins: Use dynamic initializers

[mirror_ubuntu-bionic-kernel.git] / scripts / gcc-plugins / randomize_layout_plugin.c

diff --git a/scripts/gcc-plugins/randomize_layout_plugin.c b/scripts/gcc-plugins/randomize_layout_plugin.c
index 0073af326449864b4da5f7a64677c0de2d5eafa2..c4a345c3715b63ba48a2dc37811dd38fbb7c615a 100644 (file)
--- a/scripts/gcc-plugins/randomize_layout_plugin.c
+++ b/scripts/gcc-plugins/randomize_layout_plugin.c
@@ -580,68 +580,35 @@ static void finish_type(void *event_data, void *data)
        return;
 }
 
-static struct attribute_spec randomize_layout_attr = {
-       .name           = "randomize_layout",
-       // related to args
-       .min_length     = 0,
-       .max_length     = 0,
-       .decl_required  = false,
-       // need type declaration
-       .type_required  = true,
-       .function_type_required = false,
-       .handler                = handle_randomize_layout_attr,
-#if BUILDING_GCC_VERSION >= 4007
-       .affects_type_identity  = true
-#endif
-};
+static struct attribute_spec randomize_layout_attr = { };
+static struct attribute_spec no_randomize_layout_attr = { };
+static struct attribute_spec randomize_considered_attr = { };
+static struct attribute_spec randomize_performed_attr = { };
 
-static struct attribute_spec no_randomize_layout_attr = {
-       .name           = "no_randomize_layout",
-       // related to args
-       .min_length     = 0,
-       .max_length     = 0,
-       .decl_required  = false,
-       // need type declaration
-       .type_required  = true,
-       .function_type_required = false,
-       .handler                = handle_randomize_layout_attr,
+static void register_attributes(void *event_data, void *data)
+{
+       randomize_layout_attr.name              = "randomize_layout";
+       randomize_layout_attr.type_required     = true;
+       randomize_layout_attr.handler           = handle_randomize_layout_attr;
 #if BUILDING_GCC_VERSION >= 4007
-       .affects_type_identity  = true
+       randomize_layout_attr.affects_type_identity = true;
 #endif
-};
 
-static struct attribute_spec randomize_considered_attr = {
-       .name           = "randomize_considered",
-       // related to args
-       .min_length     = 0,
-       .max_length     = 0,
-       .decl_required  = false,
-       // need type declaration
-       .type_required  = true,
-       .function_type_required = false,
-       .handler                = handle_randomize_considered_attr,
+       no_randomize_layout_attr.name           = "no_randomize_layout";
+       no_randomize_layout_attr.type_required  = true;
+       no_randomize_layout_attr.handler        = handle_randomize_layout_attr;
 #if BUILDING_GCC_VERSION >= 4007
-       .affects_type_identity  = false
+       no_randomize_layout_attr.affects_type_identity = true;
 #endif
-};
 
-static struct attribute_spec randomize_performed_attr = {
-       .name           = "randomize_performed",
-       // related to args
-       .min_length     = 0,
-       .max_length     = 0,
-       .decl_required  = false,
-       // need type declaration
-       .type_required  = true,
-       .function_type_required = false,
-       .handler                = handle_randomize_performed_attr,
-#if BUILDING_GCC_VERSION >= 4007
-       .affects_type_identity  = false
-#endif
-};
+       randomize_considered_attr.name          = "randomize_considered";
+       randomize_considered_attr.type_required = true;
+       randomize_considered_attr.handler       = handle_randomize_considered_attr;
+
+       randomize_performed_attr.name           = "randomize_performed";
+       randomize_performed_attr.type_required  = true;
+       randomize_performed_attr.handler        = handle_randomize_performed_attr;
 
-static void register_attributes(void *event_data, void *data)
-{
        register_attribute(&randomize_layout_attr);
        register_attribute(&no_randomize_layout_attr);
        register_attribute(&randomize_considered_attr);