diff options
| author | ebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-01-28 11:59:14 +0000 |
|---|---|---|
| committer | ebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-01-28 11:59:14 +0000 |
| commit | c93a489157e2fe8ce582b0c2e52f99870aabbc82 (patch) | |
| tree | abaa8d9aea6b5abdc7f3d536544b71a3dda86620 | |
| parent | b2b28d24f9e8e257d1211a9b7717d9f32dc71544 (diff) | |
| download | gcc-c93a489157e2fe8ce582b0c2e52f99870aabbc82.tar.gz | |
* gcc-interface/gigi.h (enum attr_type): Rename into...
(enum attrib_type): ...this.
(struct attrib): Adjust.
* gcc-interface/decl.c (prepend_one_attribute): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@232923 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ada/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/decl.c | 8 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/gigi.h | 4 |
3 files changed, 13 insertions, 6 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 23780deb557..c79fafa9a96 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,10 @@ +2016-01-28 Eric Botcazou <ebotcazou@adacore.com> + + * gcc-interface/gigi.h (enum attr_type): Rename into... + (enum attrib_type): ...this. + (struct attrib): Adjust. + * gcc-interface/decl.c (prepend_one_attribute): Likewise. + 2016-01-20 Eric Botcazou <ebotcazou@adacore.com> * exp_ch2.adb (Expand_Current_Value): Make an appropriate character diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c index 74bc95bf864..3f2358b7c6d 100644 --- a/gcc/ada/gcc-interface/decl.c +++ b/gcc/ada/gcc-interface/decl.c @@ -151,7 +151,7 @@ struct value_annotation_hasher : ggc_cache_ptr_hash<tree_int_map> static GTY ((cache)) hash_table<value_annotation_hasher> *annotate_value_cache; static void prepend_one_attribute (struct attrib **, - enum attr_type, tree, tree, Node_Id); + enum attrib_type, tree, tree, Node_Id); static void prepend_one_attribute_pragma (struct attrib **, Node_Id); static void prepend_attributes (struct attrib **, Entity_Id); static tree elaborate_expression (Node_Id, Entity_Id, const char *, bool, bool, @@ -6258,14 +6258,14 @@ elaborate_entity (Entity_Id gnat_entity) static void prepend_one_attribute (struct attrib **attr_list, - enum attr_type attr_type, + enum attrib_type attrib_type, tree attr_name, tree attr_args, Node_Id attr_error_point) { struct attrib * attr = (struct attrib *) xmalloc (sizeof (struct attrib)); - attr->type = attr_type; + attr->type = attrib_type; attr->name = attr_name; attr->args = attr_args; attr->error_point = attr_error_point; @@ -6281,7 +6281,7 @@ prepend_one_attribute_pragma (struct attrib **attr_list, Node_Id gnat_pragma) { const Node_Id gnat_arg = Pragma_Argument_Associations (gnat_pragma); tree gnu_arg0 = NULL_TREE, gnu_arg1 = NULL_TREE; - enum attr_type etype; + enum attrib_type etype; /* Map the pragma at hand. Skip if this isn't one we know how to handle. */ switch (Get_Pragma_Id (Chars (Pragma_Identifier (gnat_pragma)))) diff --git a/gcc/ada/gcc-interface/gigi.h b/gcc/ada/gcc-interface/gigi.h index 848cabf964a..a55b1b03717 100644 --- a/gcc/ada/gcc-interface/gigi.h +++ b/gcc/ada/gcc-interface/gigi.h @@ -342,7 +342,7 @@ extern bool fp_arith_may_widen; /* Data structures used to represent attributes. */ -enum attr_type +enum attrib_type { ATTR_MACHINE_ATTRIBUTE, ATTR_LINK_ALIAS, @@ -356,7 +356,7 @@ enum attr_type struct attrib { struct attrib *next; - enum attr_type type; + enum attrib_type type; tree name; tree args; Node_Id error_point; |