Move #undef DEF_BUILTIN* to builtins.def

I was confused at first why tree-core.h was undefining DEF_BUILTIN_CHKP
before defining it, then undefining it again after including builtins.def.
This is because builtins.def provides a default definition of
DEF_BUILTIN_CHKP, but leaves it up to the caller to undefine it where
necessary.  Similarly to the previous internal-fn.def patch, it seems
more obvious for builtins.def to #undef things unconditionally.

One argument might have been that keeping preprocessor stuff
out of the .def files makes it easier for non-cpp parsers.  In practice
though we already have #ifs and multiline #defines, so single-line #undefs
should be easy in comparison.

Tested on x86_64-linux-gnu, aarch64-linux-gnu and arm-linux-gnueabi.

gcc/ada/
	* gcc-interface/utils.c: Don't undef DEF_BUILTIN.

gcc/c-family/
	* c-common.c: Don't undef DEF_BUILTIN.

gcc/jit/
	* jit-builtins.c: Don't undef DEF_BUILTIN.

gcc/lto/
	* lto-lang.c: Don't undef DEF_BUILTIN.

gcc/
	* builtins.def: #undef DEF_BUILTIN and DEF_BUILTIN_CHKP
	* builtins.c, genmatch.c, tree-core.h: Don't undef them here.

From-SVN: r229924

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 753d992d84683771262fc3ec4b7197f97ae3ded7..6ffc9aa6a89c5cde6773afd7996d783cfae6a818 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+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.

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 22afbdc1b1075c99634f7869ea5877f2f8ecbc6e..22ec245956de1df7621365d167d9cb9d1652cf7b 100644 (file)
--- 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 8617a876ae608ab096e5e7f374bcf16610759d66..3b893b85fa753cbb18486bf0d7821ebd597a2312 100644 (file)
--- 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 add9fc8484f778b24c4ffcef60cf6fe2f32b893a..ad661c199aa37664899f4b86ae83cb6bf627af5c 100644 (file)
--- 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 076da406e1febeea6291fe51e67436fd3594ae45..ed850df2d01155f311f62a24588ebd90320d9dc0 100644 (file)
--- 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 e6d632d8b9763f875969ec12843dc99fc9eb7bc7..7a2781d3c7efafa8fb6388e725b7c8e16abedf2a 100644 (file)
--- 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 b7ae7541d43d0945fa976c7b45a935c69a0ebc8a..bdcb5b25401a09d34323c4640894a1b305d7b684 100644 (file)
--- 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 ad502f972620e373d7d8e25cfd2d1cf8390723e5..1eb8c24da7d4e673c877ed46b79e48df45bf3f26 100644 (file)
--- 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 301179bbdc0dfb366254574b09f8989464f80666..5da80441c5ce528e93477723c709571cb51817f9 100644 (file)
--- 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 b28a5de21f7e1b6f5da07bfdbb79088db6987c8d..63ff5affb55f2d09514afdfb8b00dd7cec6e7f94 100644 (file)
--- 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 332251cd62f6ab6754045445aa447958f98eb0c1..056cab6ffe554d86003d42a59810d674c50f949c 100644 (file)
--- 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 be317a42fbeeacff7b7b41146cb850c18b74b250..4805c2a69b17c88838970e981115e918a7e5486b 100644 (file)
--- 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 3c50e578afda1a0846cee9af3dee8e8f151b6d81..954368f70ff351237185d1ef8bdb03986e5b53d8 100644 (file)
--- 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.  */