diff options
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/ada/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/utils.c | 1 | ||||
| -rw-r--r-- | gcc/builtins.c | 1 | ||||
| -rw-r--r-- | gcc/builtins.def | 3 | ||||
| -rw-r--r-- | gcc/c-family/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/c-family/c-common.c | 1 | ||||
| -rw-r--r-- | gcc/genmatch.c | 2 | ||||
| -rw-r--r-- | gcc/jit/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/jit/jit-builtins.c | 1 | ||||
| -rw-r--r-- | gcc/lto/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/lto/lto-lang.c | 1 | ||||
| -rw-r--r-- | gcc/tree-core.h | 4 |
13 files changed, 24 insertions, 11 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 753d992..6ffc9aa 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,10 @@ 2015-11-07 Richard Sandiford <richard.sandiford@arm.com> + * builtins.def: #undef DEF_BUILTIN and DEF_BUILTIN_CHKP + * builtins.c, genmatch.c, tree-core.h: Don't undef them here. + +2015-11-07 Richard Sandiford <richard.sandiford@arm.com> + * internal-fn.def: #undef DEF_INTERNAL_FN at the end. * internal-fn.c: Don't undef it here. * tree-core.h: Likewise. diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 22afbdc..22ec245 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,7 @@ +2015-11-07 Richard Sandiford <richard.sandiford@arm.com> + + * gcc-interface/utils.c: Don't undef DEF_BUILTIN. + 2015-10-29 Andrew MacLeod <amacleod@redhat.com> * gcc-interface/decl.c: Reorder #include's and remove duplicates. diff --git a/gcc/ada/gcc-interface/utils.c b/gcc/ada/gcc-interface/utils.c index 8617a87..3b893b8 100644 --- a/gcc/ada/gcc-interface/utils.c +++ b/gcc/ada/gcc-interface/utils.c @@ -6040,7 +6040,6 @@ install_builtin_functions (void) BOTH_P, FALLBACK_P, NONANSI_P, \ built_in_attributes[(int) ATTRS], IMPLICIT); #include "builtins.def" -#undef DEF_BUILTIN } /* ----------------------------------------------------------------------- * diff --git a/gcc/builtins.c b/gcc/builtins.c index add9fc8..ad661c1 100644 --- a/gcc/builtins.c +++ b/gcc/builtins.c @@ -78,7 +78,6 @@ const char * built_in_names[(int) END_BUILTINS] = { #include "builtins.def" }; -#undef DEF_BUILTIN /* Setup an array of builtin_info_type, make sure each element decl is initialized to NULL_TREE. */ diff --git a/gcc/builtins.def b/gcc/builtins.def index 076da40..ed850df 100644 --- a/gcc/builtins.def +++ b/gcc/builtins.def @@ -945,3 +945,6 @@ DEF_GCC_BUILTIN (BUILT_IN_LINE, "LINE", BT_FN_INT, ATTR_NOTHROW_LEAF_LIST) /* Pointer Bounds Checker builtins. */ #include "chkp-builtins.def" + +#undef DEF_BUILTIN_CHKP +#undef DEF_BUILTIN diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index e6d632d..7a2781d 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,7 @@ +2015-11-07 Richard Sandiford <richard.sandiford@arm.com> + + * c-common.c: Don't undef DEF_BUILTIN. + 2015-11-06 David Malcolm <dmalcolm@redhat.com> * c-common.c (c_cpp_error): Convert parameter from location_t to diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c index b7ae754..bdcb5b2 100644 --- a/gcc/c-family/c-common.c +++ b/gcc/c-family/c-common.c @@ -5735,7 +5735,6 @@ c_define_builtins (tree va_list_ref_type_node, tree va_list_arg_type_node) BOTH_P, FALLBACK_P, NONANSI_P, \ built_in_attributes[(int) ATTRS], IMPLICIT); #include "builtins.def" -#undef DEF_BUILTIN targetm.init_builtins (); diff --git a/gcc/genmatch.c b/gcc/genmatch.c index ad502f9..1eb8c24 100644 --- a/gcc/genmatch.c +++ b/gcc/genmatch.c @@ -229,7 +229,6 @@ enum built_in_function { #include "builtins.def" END_BUILTINS }; -#undef DEF_BUILTIN /* Return true if CODE represents a commutative tree code. Otherwise return false. */ @@ -4619,7 +4618,6 @@ add_operator (VIEW_CONVERT2, "VIEW_CONVERT2", "tcc_unary", 1); #define DEF_BUILTIN(ENUM, N, C, T, LT, B, F, NA, AT, IM, COND) \ add_builtin (ENUM, # ENUM); #include "builtins.def" -#undef DEF_BUILTIN /* Parse ahead! */ parser p (r); diff --git a/gcc/jit/ChangeLog b/gcc/jit/ChangeLog index 301179b..5da8044 100644 --- a/gcc/jit/ChangeLog +++ b/gcc/jit/ChangeLog @@ -1,3 +1,7 @@ +2015-11-07 Richard Sandiford <richard.sandiford@arm.com> + + * jit-builtins.c: Don't undef DEF_BUILTIN. + 2015-10-29 Andrew MacLeod <amacleod@redhat.com> * dummy-frontend.c: Reorder #include's and remove duplicates. diff --git a/gcc/jit/jit-builtins.c b/gcc/jit/jit-builtins.c index b28a5de..63ff5af 100644 --- a/gcc/jit/jit-builtins.c +++ b/gcc/jit/jit-builtins.c @@ -62,7 +62,6 @@ static const struct builtin_data builtin_data[] = { #include "builtins.def" }; -#undef DEF_BUILTIN /* Helper function for find_builtin_by_name. */ diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog index 332251c..056cab6 100644 --- a/gcc/lto/ChangeLog +++ b/gcc/lto/ChangeLog @@ -1,3 +1,7 @@ +2015-11-07 Richard Sandiford <richard.sandiford@arm.com> + + * lto-lang.c: Don't undef DEF_BUILTIN. + 2015-10-29 Andrew MacLeod <amacleod@redhat.com> * lto-lang.c: Reorder #include's and remove duplicates. diff --git a/gcc/lto/lto-lang.c b/gcc/lto/lto-lang.c index be317a4..4805c2a 100644 --- a/gcc/lto/lto-lang.c +++ b/gcc/lto/lto-lang.c @@ -731,7 +731,6 @@ lto_define_builtins (tree va_list_ref_type_node ATTRIBUTE_UNUSED, builtin_types[(int) LIBTYPE], BOTH_P, FALLBACK_P, \ NONANSI_P, built_in_attributes[(int) ATTRS], IMPLICIT); #include "builtins.def" -#undef DEF_BUILTIN } static GTY(()) tree registered_builtin_types; diff --git a/gcc/tree-core.h b/gcc/tree-core.h index 3c50e57..954368f 100644 --- a/gcc/tree-core.h +++ b/gcc/tree-core.h @@ -159,13 +159,10 @@ enum built_in_function { BEGIN_CHKP_BUILTINS, -#undef DEF_BUILTIN #define DEF_BUILTIN(ENUM, N, C, T, LT, B, F, NA, AT, IM, COND) -#undef DEF_BUILTIN_CHKP #define DEF_BUILTIN_CHKP(ENUM, N, C, T, LT, B, F, NA, AT, IM, COND) \ ENUM##_CHKP = ENUM + BEGIN_CHKP_BUILTINS + 1, #include "builtins.def" -#undef DEF_BUILTIN_CHKP END_CHKP_BUILTINS = BEGIN_CHKP_BUILTINS * 2 + 1, @@ -186,7 +183,6 @@ enum built_in_function { /* Upper bound on non-language-specific builtins. */ END_BUILTINS }; -#undef DEF_BUILTIN /* Tree code classes. Each tree_code has an associated code class represented by a TREE_CODE_CLASS. */ |