From cd8b19afc0d2be2aa7fa9e0851888fc0ae227d72 Mon Sep 17 00:00:00 2001 From: Andrew Pinski Date: Fri, 7 Oct 2016 21:36:41 +0000 Subject: [PATCH] aarch64-arches.def (AARCH64_ARCH): #undef at the end. 2016-10-07 Andrew Pinski * config/aarch64/aarch64-arches.def (AARCH64_ARCH): #undef at the end. * config/aarch64/aarch64-cores.def (AARCH64_CORE): Likewise. * config/aarch64/aarch64-fusion-pairs.def (AARCH64_FUSION_PAIR): Likewise. * config/aarch64/aarch64-option-extensions.def (AARCH64_OPT_EXTENSION): Likewise. * config/aarch64/aarch64-tuning-flags.def (AARCH64_EXTRA_TUNING_OPTION): Likewise. * config/aarch64/aarch64-opts.h (AARCH64_CORE): Don't #undef here. (AARCH64_ARCH): Likewise. * common/config/aarch64/aarch64-common.c (AARCH64_OPT_EXTENSION): Likewise. (AARCH64_CORE): Likewise. (AARCH64_ARCH): Likewise. * config/aarch64/aarch64-protos.h (AARCH64_FUSION_PAIR): Likewise. (AARCH64_EXTRA_TUNING_OPTION): Likewise. * config/aarch64/aarch64.c (AARCH64_FUION_PAIR): Likewise. (AARCH64_EXTRA_TUNING_OPTION): Likewise. (AARCH64_ARCH): Likewise. (AARCH64_CORE): Likewise. * config/aarch64/aarch64.h (AARCH64_CORE): Likewise. * config/aarch64/driver-aarch64.c (AARCH64_OPT_EXTENSION): Likewise. (AARCH64_CORE): Likewise. (AARCH64_ARCH): Likewise. From-SVN: r240876 --- gcc/ChangeLog | 23 +++++++++++++++++++ gcc/common/config/aarch64/aarch64-common.c | 3 --- gcc/config/aarch64/aarch64-arches.def | 1 + gcc/config/aarch64/aarch64-cores.def | 2 ++ gcc/config/aarch64/aarch64-fusion-pairs.def | 1 + .../aarch64/aarch64-option-extensions.def | 2 ++ gcc/config/aarch64/aarch64-opts.h | 2 -- gcc/config/aarch64/aarch64-protos.h | 4 ---- gcc/config/aarch64/aarch64-tuning-flags.def | 2 ++ gcc/config/aarch64/aarch64.c | 4 ---- gcc/config/aarch64/aarch64.h | 1 - gcc/config/aarch64/driver-aarch64.c | 3 --- 12 files changed, 31 insertions(+), 17 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8c873c35d96..a7d6689566d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,26 @@ +2016-10-07 Andrew Pinski + + * config/aarch64/aarch64-arches.def (AARCH64_ARCH): #undef at the end. + * config/aarch64/aarch64-cores.def (AARCH64_CORE): Likewise. + * config/aarch64/aarch64-fusion-pairs.def (AARCH64_FUSION_PAIR): Likewise. + * config/aarch64/aarch64-option-extensions.def (AARCH64_OPT_EXTENSION): Likewise. + * config/aarch64/aarch64-tuning-flags.def (AARCH64_EXTRA_TUNING_OPTION): Likewise. + * config/aarch64/aarch64-opts.h (AARCH64_CORE): Don't #undef here. + (AARCH64_ARCH): Likewise. + * common/config/aarch64/aarch64-common.c (AARCH64_OPT_EXTENSION): Likewise. + (AARCH64_CORE): Likewise. + (AARCH64_ARCH): Likewise. + * config/aarch64/aarch64-protos.h (AARCH64_FUSION_PAIR): Likewise. + (AARCH64_EXTRA_TUNING_OPTION): Likewise. + * config/aarch64/aarch64.c (AARCH64_FUION_PAIR): Likewise. + (AARCH64_EXTRA_TUNING_OPTION): Likewise. + (AARCH64_ARCH): Likewise. + (AARCH64_CORE): Likewise. + * config/aarch64/aarch64.h (AARCH64_CORE): Likewise. + * config/aarch64/driver-aarch64.c (AARCH64_OPT_EXTENSION): Likewise. + (AARCH64_CORE): Likewise. + (AARCH64_ARCH): Likewise. + 2016-10-06 Michael Meissner * config/rs6000/rs6000-c.c (rs6000_cpu_cpp_builtins): Split diff --git a/gcc/common/config/aarch64/aarch64-common.c b/gcc/common/config/aarch64/aarch64-common.c index 08e79593420..09debee06b8 100644 --- a/gcc/common/config/aarch64/aarch64-common.c +++ b/gcc/common/config/aarch64/aarch64-common.c @@ -123,7 +123,6 @@ static const struct aarch64_option_extension all_extensions[] = #define AARCH64_OPT_EXTENSION(NAME, FLAG_CANONICAL, FLAGS_ON, FLAGS_OFF, Z) \ {NAME, FLAG_CANONICAL, FLAGS_ON, FLAGS_OFF}, #include "config/aarch64/aarch64-option-extensions.def" -#undef AARCH64_OPT_EXTENSION {NULL, 0, 0, 0} }; @@ -148,7 +147,6 @@ static const struct processor_name_to_arch all_cores[] = #define AARCH64_CORE(NAME, X, IDENT, ARCH_IDENT, FLAGS, COSTS, IMP, PART) \ {NAME, AARCH64_ARCH_##ARCH_IDENT, FLAGS}, #include "config/aarch64/aarch64-cores.def" -#undef AARCH64_CORE {"generic", AARCH64_ARCH_8A, AARCH64_FL_FOR_ARCH8}, {"", aarch64_no_arch, 0} }; @@ -159,7 +157,6 @@ static const struct arch_to_arch_name all_architectures[] = #define AARCH64_ARCH(NAME, CORE, ARCH_IDENT, ARCH, FLAGS) \ {AARCH64_ARCH_##ARCH_IDENT, NAME, FLAGS}, #include "config/aarch64/aarch64-arches.def" -#undef AARCH64_ARCH {aarch64_no_arch, "", 0} }; diff --git a/gcc/config/aarch64/aarch64-arches.def b/gcc/config/aarch64/aarch64-arches.def index 7dcf140411f..830a7cf5455 100644 --- a/gcc/config/aarch64/aarch64-arches.def +++ b/gcc/config/aarch64/aarch64-arches.def @@ -34,3 +34,4 @@ AARCH64_ARCH("armv8-a", generic, 8A, 8, AARCH64_FL_FOR_ARCH8) AARCH64_ARCH("armv8.1-a", generic, 8_1A, 8, AARCH64_FL_FOR_ARCH8_1) AARCH64_ARCH("armv8.2-a", generic, 8_2A, 8, AARCH64_FL_FOR_ARCH8_2) +#undef AARCH64_ARCH diff --git a/gcc/config/aarch64/aarch64-cores.def b/gcc/config/aarch64/aarch64-cores.def index f7fe1a77093..516d12b577f 100644 --- a/gcc/config/aarch64/aarch64-cores.def +++ b/gcc/config/aarch64/aarch64-cores.def @@ -70,3 +70,5 @@ AARCH64_CORE("cortex-a57.cortex-a53", cortexa57cortexa53, cortexa53, 8A, AARCH AARCH64_CORE("cortex-a72.cortex-a53", cortexa72cortexa53, cortexa53, 8A, AARCH64_FL_FOR_ARCH8 | AARCH64_FL_CRC, cortexa72, "0x41", "0xd08.0xd03") AARCH64_CORE("cortex-a73.cortex-a35", cortexa73cortexa35, cortexa53, 8A, AARCH64_FL_FOR_ARCH8 | AARCH64_FL_CRC, cortexa73, "0x41", "0xd09.0xd04") AARCH64_CORE("cortex-a73.cortex-a53", cortexa73cortexa53, cortexa53, 8A, AARCH64_FL_FOR_ARCH8 | AARCH64_FL_CRC, cortexa73, "0x41", "0xd09.0xd03") + +#undef AARCH64_CORE diff --git a/gcc/config/aarch64/aarch64-fusion-pairs.def b/gcc/config/aarch64/aarch64-fusion-pairs.def index f488671f16b..e50ced4cdc6 100644 --- a/gcc/config/aarch64/aarch64-fusion-pairs.def +++ b/gcc/config/aarch64/aarch64-fusion-pairs.def @@ -35,3 +35,4 @@ AARCH64_FUSION_PAIR ("adrp+ldr", ADRP_LDR) AARCH64_FUSION_PAIR ("cmp+branch", CMP_BRANCH) AARCH64_FUSION_PAIR ("aes+aesmc", AES_AESMC) +#undef AARCH64_FUSION_PAIR diff --git a/gcc/config/aarch64/aarch64-option-extensions.def b/gcc/config/aarch64/aarch64-option-extensions.def index a10ccf2254c..b8921ce73ec 100644 --- a/gcc/config/aarch64/aarch64-option-extensions.def +++ b/gcc/config/aarch64/aarch64-option-extensions.def @@ -59,3 +59,5 @@ AARCH64_OPT_EXTENSION("lse", AARCH64_FL_LSE, 0, 0, "atomics") /* Enabling "fp16" also enables "fp". Disabling "fp16" just disables "fp16". */ AARCH64_OPT_EXTENSION("fp16", AARCH64_FL_F16, AARCH64_FL_FP, 0, "fp16") + +#undef AARCH64_OPT_EXTENSION diff --git a/gcc/config/aarch64/aarch64-opts.h b/gcc/config/aarch64/aarch64-opts.h index c550a74456e..7eaca7e46ea 100644 --- a/gcc/config/aarch64/aarch64-opts.h +++ b/gcc/config/aarch64/aarch64-opts.h @@ -28,7 +28,6 @@ enum aarch64_processor #define AARCH64_CORE(NAME, INTERNAL_IDENT, SCHED, ARCH, FLAGS, COSTS, IMP, PART) \ INTERNAL_IDENT, #include "aarch64-cores.def" -#undef AARCH64_CORE /* Used to indicate that no processor has been specified. */ generic, /* Used to mark the end of the processor table. */ @@ -40,7 +39,6 @@ enum aarch64_arch #define AARCH64_ARCH(NAME, CORE, ARCH_IDENT, ARCH_REV, FLAGS) \ AARCH64_ARCH_##ARCH_IDENT, #include "aarch64-arches.def" -#undef AARCH64_ARCH aarch64_no_arch }; diff --git a/gcc/config/aarch64/aarch64-protos.h b/gcc/config/aarch64/aarch64-protos.h index 3cdd69b8af1..07a8cd0455d 100644 --- a/gcc/config/aarch64/aarch64-protos.h +++ b/gcc/config/aarch64/aarch64-protos.h @@ -248,7 +248,6 @@ enum aarch64_fusion_pairs_index #include "aarch64-fusion-pairs.def" AARCH64_FUSE_index_END }; -#undef AARCH64_FUSION_PAIR #define AARCH64_FUSION_PAIR(x, name) \ AARCH64_FUSE_##name = (1u << AARCH64_FUSE_##name##_index), @@ -259,7 +258,6 @@ enum aarch64_fusion_pairs #include "aarch64-fusion-pairs.def" AARCH64_FUSE_ALL = (1u << AARCH64_FUSE_index_END) - 1 }; -#undef AARCH64_FUSION_PAIR #define AARCH64_EXTRA_TUNING_OPTION(x, name) \ AARCH64_EXTRA_TUNE_##name##_index, @@ -269,7 +267,6 @@ enum aarch64_extra_tuning_flags_index #include "aarch64-tuning-flags.def" AARCH64_EXTRA_TUNE_index_END }; -#undef AARCH64_EXTRA_TUNING_OPTION #define AARCH64_EXTRA_TUNING_OPTION(x, name) \ @@ -281,7 +278,6 @@ enum aarch64_extra_tuning_flags #include "aarch64-tuning-flags.def" AARCH64_EXTRA_TUNE_ALL = (1u << AARCH64_EXTRA_TUNE_index_END) - 1 }; -#undef AARCH64_EXTRA_TUNING_OPTION /* Enum describing the various ways that the aarch64_parse_{arch,tune,cpu,extension} functions can fail. diff --git a/gcc/config/aarch64/aarch64-tuning-flags.def b/gcc/config/aarch64/aarch64-tuning-flags.def index 68b5ba0ad0e..b0118be1b61 100644 --- a/gcc/config/aarch64/aarch64-tuning-flags.def +++ b/gcc/config/aarch64/aarch64-tuning-flags.def @@ -34,3 +34,5 @@ AARCH64_EXTRA_TUNING_OPTION ("rename_fma_regs", RENAME_FMA_REGS) two load/stores are not at least 8 byte aligned don't create load/store pairs. */ AARCH64_EXTRA_TUNING_OPTION ("slow_unaligned_ldpw", SLOW_UNALIGNED_LDPW) + +#undef AARCH64_EXTRA_TUNING_OPTION diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c index df6514d85e6..ea7835ee0f3 100644 --- a/gcc/config/aarch64/aarch64.c +++ b/gcc/config/aarch64/aarch64.c @@ -172,7 +172,6 @@ static const struct aarch64_flag_desc aarch64_fusible_pairs[] = { "all", AARCH64_FUSE_ALL }, { NULL, AARCH64_FUSE_NOTHING } }; -#undef AARCH64_FUION_PAIR #define AARCH64_EXTRA_TUNING_OPTION(name, internal_name) \ { name, AARCH64_EXTRA_TUNE_##internal_name }, @@ -183,7 +182,6 @@ static const struct aarch64_flag_desc aarch64_tuning_flags[] = { "all", AARCH64_EXTRA_TUNE_ALL }, { NULL, AARCH64_EXTRA_TUNE_NONE } }; -#undef AARCH64_EXTRA_TUNING_OPTION /* Tuning parameters. */ @@ -828,7 +826,6 @@ static const struct processor all_architectures[] = #define AARCH64_ARCH(NAME, CORE, ARCH_IDENT, ARCH_REV, FLAGS) \ {NAME, CORE, CORE, AARCH64_ARCH_##ARCH_IDENT, ARCH_REV, FLAGS, NULL}, #include "aarch64-arches.def" -#undef AARCH64_ARCH {NULL, aarch64_none, aarch64_none, aarch64_no_arch, 0, 0, NULL} }; @@ -840,7 +837,6 @@ static const struct processor all_cores[] = all_architectures[AARCH64_ARCH_##ARCH].architecture_version, \ FLAGS, &COSTS##_tunings}, #include "aarch64-cores.def" -#undef AARCH64_CORE {"generic", generic, cortexa53, AARCH64_ARCH_8A, 8, AARCH64_FL_FOR_ARCH8, &generic_tunings}, {NULL, aarch64_none, aarch64_none, aarch64_no_arch, 0, 0, NULL} diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h index 19caf9f2979..584ff5c43af 100644 --- a/gcc/config/aarch64/aarch64.h +++ b/gcc/config/aarch64/aarch64.h @@ -493,7 +493,6 @@ enum target_cpus #define AARCH64_CORE(NAME, INTERNAL_IDENT, SCHED, ARCH, FLAGS, COSTS, IMP, PART) \ TARGET_CPU_##INTERNAL_IDENT, #include "aarch64-cores.def" -#undef AARCH64_CORE TARGET_CPU_generic }; diff --git a/gcc/config/aarch64/driver-aarch64.c b/gcc/config/aarch64/driver-aarch64.c index ce771ec7ac1..d1aa4c18be4 100644 --- a/gcc/config/aarch64/driver-aarch64.c +++ b/gcc/config/aarch64/driver-aarch64.c @@ -40,7 +40,6 @@ static struct aarch64_arch_extension aarch64_extensions[] = { #include "aarch64-option-extensions.def" }; -#undef AARCH64_OPT_EXTENSION struct aarch64_core_data @@ -61,7 +60,6 @@ static struct aarch64_core_data aarch64_cpu_data[] = { NULL, NULL, NULL, NULL, 0 } }; -#undef AARCH64_CORE struct aarch64_arch_driver_info { @@ -79,7 +77,6 @@ static struct aarch64_arch_driver_info aarch64_arches[] = {NULL, NULL, 0} }; -#undef AARCH64_ARCH /* Return an aarch64_arch_driver_info for the architecture described by ID, or NULL if ID describes something we don't know about. */ -- 2.30.2