diff options
Diffstat (limited to 'gcc/builtin-attrs.def')
| -rw-r--r-- | gcc/builtin-attrs.def | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/gcc/builtin-attrs.def b/gcc/builtin-attrs.def index 8314b88cdca..df0bc08d86f 100644 --- a/gcc/builtin-attrs.def +++ b/gcc/builtin-attrs.def @@ -51,13 +51,11 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA DEF_ATTR_NULL_TREE (ATTR_NULL) -/* Note that below we must avoid whitespace in arguments of CONCAT*. */ - /* Construct a tree for a given integer and a list containing it. */ #define DEF_ATTR_FOR_INT(VALUE) \ - DEF_ATTR_INT (CONCAT2 (ATTR_,VALUE), VALUE) \ - DEF_ATTR_TREE_LIST (CONCAT2 (ATTR_LIST_,VALUE), ATTR_NULL, \ - CONCAT2 (ATTR_,VALUE), ATTR_NULL) + DEF_ATTR_INT (ATTR_##VALUE, VALUE) \ + DEF_ATTR_TREE_LIST (ATTR_LIST_##VALUE, ATTR_NULL, \ + ATTR_##VALUE, ATTR_NULL) DEF_ATTR_FOR_INT (0) DEF_ATTR_FOR_INT (1) DEF_ATTR_FOR_INT (2) @@ -67,8 +65,8 @@ DEF_ATTR_FOR_INT (4) /* Construct a tree for a list of two integers. */ #define DEF_LIST_INT_INT(VALUE1, VALUE2) \ - DEF_ATTR_TREE_LIST (CONCAT4 (ATTR_LIST_,VALUE1,_,VALUE2), ATTR_NULL, \ - CONCAT2 (ATTR_,VALUE1), CONCAT2 (ATTR_LIST_,VALUE2)) + DEF_ATTR_TREE_LIST (ATTR_LIST_##VALUE1##_##VALUE2, ATTR_NULL, \ + ATTR_##VALUE1, ATTR_LIST_##VALUE2) DEF_LIST_INT_INT (1,0) DEF_LIST_INT_INT (1,2) DEF_LIST_INT_INT (2,0) @@ -130,10 +128,10 @@ DEF_ATTR_TREE_LIST (ATTR_MALLOC_NOTHROW_NONNULL_1, ATTR_MALLOC, ATTR_NULL, \ /* Construct a tree for a format attribute. */ #define DEF_FORMAT_ATTRIBUTE(TYPE, FA, VALUES) \ - DEF_ATTR_TREE_LIST (CONCAT4 (ATTR_,TYPE,_,VALUES), ATTR_NULL, \ - CONCAT2 (ATTR_,TYPE), CONCAT2 (ATTR_LIST_,VALUES)) \ - DEF_ATTR_TREE_LIST (CONCAT4 (ATTR_FORMAT_,TYPE,_,VALUES), ATTR_FORMAT, \ - CONCAT4 (ATTR_,TYPE,_,VALUES), CONCAT2 (ATTR_NOTHROW_NONNULL_,FA)) + DEF_ATTR_TREE_LIST (ATTR_##TYPE##_##VALUES, ATTR_NULL, \ + ATTR_##TYPE, ATTR_LIST_##VALUES) \ + DEF_ATTR_TREE_LIST (ATTR_FORMAT_##TYPE##_##VALUES, ATTR_FORMAT, \ + ATTR_##TYPE##_##VALUES, ATTR_NOTHROW_NONNULL_##FA) DEF_FORMAT_ATTRIBUTE(PRINTF,1,1_0) DEF_FORMAT_ATTRIBUTE(PRINTF,1,1_2) DEF_FORMAT_ATTRIBUTE(PRINTF,2,2_0) @@ -150,16 +148,16 @@ DEF_FORMAT_ATTRIBUTE(STRFMON,3,3_4) /* Construct a tree for a format_arg attribute. */ #define DEF_FORMAT_ARG_ATTRIBUTE(FA) \ - DEF_ATTR_TREE_LIST (CONCAT2 (ATTR_FORMAT_ARG_,FA), ATTR_FORMAT_ARG, \ - CONCAT2 (ATTR_LIST_,FA), CONCAT2 (ATTR_NOTHROW_NONNULL_,FA)) + DEF_ATTR_TREE_LIST (ATTR_FORMAT_ARG_##FA, ATTR_FORMAT_ARG, \ + ATTR_LIST_##FA, ATTR_NOTHROW_NONNULL_##FA) DEF_FORMAT_ARG_ATTRIBUTE(1) DEF_FORMAT_ARG_ATTRIBUTE(2) #undef DEF_FORMAT_ARG_ATTRIBUTE /* Define an attribute for a function, along with the IDENTIFIER_NODE. */ #define DEF_FN_ATTR_IDENT(NAME, ATTRS, PREDICATE) \ - DEF_ATTR_IDENT (CONCAT2(ATTR_,NAME), STRINGX(NAME)) \ - DEF_FN_ATTR (CONCAT2(ATTR_,NAME), ATTRS, PREDICATE) + DEF_ATTR_IDENT (ATTR_##NAME, #NAME) \ + DEF_FN_ATTR (ATTR_##NAME, ATTRS, PREDICATE) /* The ISO C functions are always checked (whether <stdio.h> is included or not), since it is common to call printf without |