diff options
| author | Yvan Roux <yvan.roux@linaro.org> | 2017-03-03 15:33:21 +0100 |
|---|---|---|
| committer | Yvan Roux <yvan.roux@linaro.org> | 2017-03-14 12:19:25 +0000 |
| commit | 03f60d2203bce646f0d1bab2f2074b6c821721ed (patch) | |
| tree | ef7b5afe2c319a3b4f01c30aff4eae4ff6e7b8bd | |
| parent | 231353fa1122ed89942a8e38b977517a6e4b5d99 (diff) | |
gcc/
Backport from trunk r243541.
2016-12-12 Thomas Preud'homme <thomas.preudhomme@arm.com>
* config/arm/arm-opts.h: Move struct arm_arch_core_flag and
arm_arch_core_flags to ...
* common/config/arm/arm-common.c: There.
Change-Id: I9b759fe3a4a657f9d088c13403ec9ff90275a61b
| -rw-r--r-- | gcc/common/config/arm/arm-common.c | 20 | ||||
| -rw-r--r-- | gcc/config/arm/arm-opts.h | 20 |
2 files changed, 20 insertions, 20 deletions
diff --git a/gcc/common/config/arm/arm-common.c b/gcc/common/config/arm/arm-common.c index 29ae0c35dd0..1cb59aae5ed 100644 --- a/gcc/common/config/arm/arm-common.c +++ b/gcc/common/config/arm/arm-common.c @@ -97,6 +97,26 @@ arm_rewrite_mcpu (int argc, const char **argv) return arm_rewrite_selected_cpu (argv[argc - 1]); } +struct arm_arch_core_flag +{ + const char *const name; + const arm_feature_set flags; +}; + +static const struct arm_arch_core_flag arm_arch_core_flags[] = +{ +#undef ARM_CORE +#define ARM_CORE(NAME, X, IDENT, ARCH, FLAGS, COSTS) \ + {NAME, FLAGS}, +#include "config/arm/arm-cores.def" +#undef ARM_CORE +#undef ARM_ARCH +#define ARM_ARCH(NAME, CORE, ARCH, FLAGS) \ + {NAME, FLAGS}, +#include "config/arm/arm-arches.def" +#undef ARM_ARCH +}; + /* Called by the driver to check whether the target denoted by current command line options is a Thumb-only target. ARGV is an array of -march and -mcpu values (ie. it contains the rhs after the equal diff --git a/gcc/config/arm/arm-opts.h b/gcc/config/arm/arm-opts.h index 9ae104a824b..8483e44b510 100644 --- a/gcc/config/arm/arm-opts.h +++ b/gcc/config/arm/arm-opts.h @@ -79,24 +79,4 @@ enum arm_tls_type { TLS_GNU, TLS_GNU2 }; - -struct arm_arch_core_flag -{ - const char *const name; - const arm_feature_set flags; -}; - -static const struct arm_arch_core_flag arm_arch_core_flags[] = -{ -#undef ARM_CORE -#define ARM_CORE(NAME, X, IDENT, ARCH, FLAGS, COSTS) \ - {NAME, FLAGS}, -#include "arm-cores.def" -#undef ARM_CORE -#undef ARM_ARCH -#define ARM_ARCH(NAME, CORE, ARCH, FLAGS) \ - {NAME, FLAGS}, -#include "arm-arches.def" -#undef ARM_ARCH -}; #endif |