From 46e343b8d225732ae2e81509ca1accf47444f64b Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Sat, 7 Nov 2015 10:17:05 +0000 Subject: Move #undef DEF_INTERNAL_FN to internal-fn.def In practice the definition of DEF_INTERNAL_FN is never reused after including internal-fn.def, so we might as well #undef it there. This becomes more obvious with a later patch that adds other DEF_INTERNAL_* directives, such as DEF_INTERNAL_OPTAB_FN. If the includer doesn't care about the information carried in these new directives, it can simply leave the macro undefined and internals.def will provide a definition that forwards to DEF_INTERNAL_FN. It doesn't make much sense for includers to have to #undef macros that are defined by internals.def and it seems overly complicated to get internals.def to undef macros only in the cases where it provided a definition. Instead I went with the approach of #undeffing all the DEF_INTERNAL_* macros unconditionally. Tested on x86_64-linux-gnu, aarch64-linux-gnu and arm-linux-gnueabi. gcc/ * internal-fn.def: #undef DEF_INTERNAL_FN at the end. * internal-fn.c: Don't undef it here. * tree-core.h: Likewise. From-SVN: r229923 --- gcc/internal-fn.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'gcc/internal-fn.c') diff --git a/gcc/internal-fn.c b/gcc/internal-fn.c index 6fac752..afbfae8 100644 --- a/gcc/internal-fn.c +++ b/gcc/internal-fn.c @@ -43,7 +43,6 @@ along with GCC; see the file COPYING3. If not see const char *const internal_fn_name_array[] = { #define DEF_INTERNAL_FN(CODE, FLAGS, FNSPEC) #CODE, #include "internal-fn.def" -#undef DEF_INTERNAL_FN "" }; @@ -51,7 +50,6 @@ const char *const internal_fn_name_array[] = { const int internal_fn_flags_array[] = { #define DEF_INTERNAL_FN(CODE, FLAGS, FNSPEC) FLAGS, #include "internal-fn.def" -#undef DEF_INTERNAL_FN 0 }; @@ -65,7 +63,6 @@ init_internal_fns () if (FNSPEC) internal_fn_fnspec_array[IFN_##CODE] = \ build_string ((int) sizeof (FNSPEC), FNSPEC ? FNSPEC : ""); #include "internal-fn.def" -#undef DEF_INTERNAL_FN internal_fn_fnspec_array[IFN_LAST] = 0; } @@ -2062,7 +2059,6 @@ expand_GOACC_REDUCTION (gcall *stmt ATTRIBUTE_UNUSED) static void (*const internal_fn_expanders[]) (gcall *) = { #define DEF_INTERNAL_FN(CODE, FLAGS, FNSPEC) expand_##CODE, #include "internal-fn.def" -#undef DEF_INTERNAL_FN 0 }; -- cgit v1.1