[1/5,AARCH64] : Move #undef into .def files.

Message ID	1447798238-29608-2-git-send-email-apinski@cavium.com
State	New
Headers	show Return-Path: <gcc-patches-return-414432-incoming=patchwork.ozlabs.org@gcc.gnu.org> DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:in-reply-to:references; q=dns; s= default; b=GQ26gJpRe45jj1dZj7p/mWeb88CJNqd5IpxZxJvbPuuiXJ4SqV31J US1ySyEmvZTfZiPYYrUnL5rxmUKv3cjGFHvYLeFJsdTUr8bcKoWtTh1W3IvdECaT nqSgaBbD3k5cnb7VrbqFZMG3nolJpOsppm9wDY5sCQW44Ulh1B19uI= Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk Sender: gcc-patches-owner@gcc.gnu.org From: Andrew Pinski <apinski@cavium.com> To: gcc-patches@gcc.gnu.org Cc: Andrew Pinski <apinski@cavium.com> Subject: [PATCH 1/5] [AARCH64]: Move #undef into .def files. Date: Tue, 17 Nov 2015 14:10:34 -0800 Message-Id: <1447798238-29608-2-git-send-email-apinski@cavium.com> In-Reply-To: <1447798238-29608-1-git-send-email-apinski@cavium.com> References: <1447798238-29608-1-git-send-email-apinski@cavium.com>

diff --git a/gcc/common/config/aarch64/aarch64-common.c b/gcc/common/config/aarch64/aarch64-common.c index 07c6bba..e312bbc 100644 --- a/gcc/common/config/aarch64/aarch64-common.c +++ b/gcc/common/config/aarch64/aarch64-common.c @@ -121,7 +121,6 @@ static const struct aarch64_option_extension all_extensions[] = #define AARCH64_OPT_EXTENSION(NAME, FLAGS_ON, FLAGS_OFF, FEATURE_STRING) \ {NAME, FLAGS_ON, FLAGS_OFF}, #include "config/aarch64/aarch64-option-extensions.def" -#undef AARCH64_OPT_EXTENSION {NULL, 0, 0} }; @@ -145,7 +144,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} }; @@ -156,7 +154,6 @@ static const struct arch_to_arch_name all_architectures[] = #define AARCH64_ARCH(NAME, CORE, ARCH_IDENT, ARCH, FLAGS) \ {AARCH64_ARCH_##ARCH_IDENT, NAME}, #include "config/aarch64/aarch64-arches.def" -#undef AARCH64_ARCH {aarch64_no_arch, ""} }; diff --git a/gcc/config/aarch64/aarch64-arches.def b/gcc/config/aarch64/aarch64-arches.def index 3b4fb73..542722d 100644 --- a/gcc/config/aarch64/aarch64-arches.def +++ b/gcc/config/aarch64/aarch64-arches.def @@ -33,3 +33,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) +#undef AARCH64_ARCH diff --git a/gcc/config/aarch64/aarch64-cores.def b/gcc/config/aarch64/aarch64-cores.def index 4af70ca..0b456f7 100644 --- a/gcc/config/aarch64/aarch64-cores.def +++ b/gcc/config/aarch64/aarch64-cores.def @@ -53,3 +53,5 @@ AARCH64_CORE("xgene1", xgene1, xgene1, 8A, AARCH64_FL_FOR_ARCH8, xge AARCH64_CORE("cortex-a57.cortex-a53", cortexa57cortexa53, cortexa53, 8A, AARCH64_FL_FOR_ARCH8 | AARCH64_FL_CRC, cortexa57, "0x41", "0xd07.0xd03") AARCH64_CORE("cortex-a72.cortex-a53", cortexa72cortexa53, cortexa53, 8A, AARCH64_FL_FOR_ARCH8 | AARCH64_FL_CRC, cortexa72, "0x41", "0xd08.0xd03") + +#undef AARCH64_CORE diff --git a/gcc/config/aarch64/aarch64-fusion-pairs.def b/gcc/config/aarch64/aarch64-fusion-pairs.def index 53bbef4..a216422 100644 --- a/gcc/config/aarch64/aarch64-fusion-pairs.def +++ b/gcc/config/aarch64/aarch64-fusion-pairs.def @@ -34,3 +34,4 @@ AARCH64_FUSION_PAIR ("movk+movk", MOVK_MOVK) AARCH64_FUSION_PAIR ("adrp+ldr", ADRP_LDR) AARCH64_FUSION_PAIR ("cmp+branch", CMP_BRANCH) +#undef AARCH64_FUSION_PAIR diff --git a/gcc/config/aarch64/aarch64-option-extensions.def b/gcc/config/aarch64/aarch64-option-extensions.def index b261a0f..ea092f5 100644 --- a/gcc/config/aarch64/aarch64-option-extensions.def +++ b/gcc/config/aarch64/aarch64-option-extensions.def @@ -42,3 +42,5 @@ AARCH64_OPT_EXTENSION("lse", AARCH64_FL_LSE, AARCH64_FL_ AARCH64_OPT_EXTENSION("pan", AARCH64_FL_PAN, AARCH64_FL_PAN, "pan") AARCH64_OPT_EXTENSION("lor", AARCH64_FL_LOR, AARCH64_FL_LOR, "lor") AARCH64_OPT_EXTENSION("rdma", AARCH64_FL_RDMA | AARCH64_FL_FPSIMD, AARCH64_FL_RDMA, "rdma") + +#undef AARCH64_OPT_EXTENSION diff --git a/gcc/config/aarch64/aarch64-opts.h b/gcc/config/aarch64/aarch64-opts.h index bf6bb7b..5534867 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 9000d67..90ed0ef 100644 --- a/gcc/config/aarch64/aarch64-protos.h +++ b/gcc/config/aarch64/aarch64-protos.h @@ -227,7 +227,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), @@ -238,7 +237,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, @@ -248,7 +246,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) \ @@ -260,7 +257,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 extern struct tune_params aarch64_tune_params; diff --git a/gcc/config/aarch64/aarch64-tuning-flags.def b/gcc/config/aarch64/aarch64-tuning-flags.def index 6f7dbce..8677c20 100644 --- a/gcc/config/aarch64/aarch64-tuning-flags.def +++ b/gcc/config/aarch64/aarch64-tuning-flags.def @@ -31,3 +31,4 @@ AARCH64_EXTRA_TUNING_OPTION ("rename_fma_regs", RENAME_FMA_REGS) AARCH64_EXTRA_TUNING_OPTION ("recip_sqrt", RECIP_SQRT) +#undef AARCH64_EXTRA_TUNING_OPTION diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c index 5ec7f08..a5971a1 100644 --- a/gcc/config/aarch64/aarch64.c +++ b/gcc/config/aarch64/aarch64.c @@ -169,7 +169,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 }, @@ -180,7 +179,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. */ @@ -522,7 +520,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} }; @@ -534,7 +531,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} @@ -566,7 +562,6 @@ static const struct aarch64_option_extension all_extensions[] = #define AARCH64_OPT_EXTENSION(NAME, FLAGS_ON, FLAGS_OFF, FEATURE_STRING) \ {NAME, FLAGS_ON, FLAGS_OFF}, #include "aarch64-option-extensions.def" -#undef AARCH64_OPT_EXTENSION {NULL, 0, 0} }; diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h index 8834c9b..c6582a4 100644 --- a/gcc/config/aarch64/aarch64.h +++ b/gcc/config/aarch64/aarch64.h @@ -467,7 +467,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 ae4d5a0..d03654c 100644 --- a/gcc/config/aarch64/driver-aarch64.c +++ b/gcc/config/aarch64/driver-aarch64.c @@ -32,7 +32,6 @@ static struct arch_extension ext_to_feat_string[] = { #include "aarch64-option-extensions.def" }; -#undef AARCH64_OPT_EXTENSION struct aarch64_core_data @@ -52,7 +51,6 @@ static struct aarch64_core_data cpu_data [] = { NULL, NULL, NULL, NULL } }; -#undef AARCH64_CORE struct aarch64_arch_driver_info { @@ -69,7 +67,6 @@ static struct aarch64_arch_driver_info aarch64_arches [] = {NULL, NULL} }; -#undef AARCH64_ARCH /* Return the full architecture name string corresponding to the identifier ID. */

[1/5,AARCH64] : Move #undef into .def files.

Commit Message

Comments

Patch