From a7c9a3042453642fd220e01b2063307cd479472a Mon Sep 17 00:00:00 2001 From: Richard Earnshaw Date: Thu, 29 Jun 2017 10:24:04 +0000 Subject: [PATCH] [arm] Fix bootstrap - missing initializer in tail entry of autogenerated code My patch yesterday accidentally missed a hunk that added the update to the tail entry of the autogenerated data structure produced by parsecpu.awk. This causes native bootstraps to fail. This patch adds back the missing hunk. 2017-06-29 Richard Earnshaw * config/arm/parsecpu.awk (gen_comm_data): Add initializer for profile to the dummy entry at the end of the list of architectures. * config/arm/arm-cpu-cdata.h: Regenerated. From-SVN: r249777 --- gcc/ChangeLog | 6 ++++++ gcc/config/arm/arm-cpu-cdata.h | 18 +++++++++--------- gcc/config/arm/parsecpu.awk | 2 +- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 17feaec..af354cc 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2017-06-29 Richard Earnshaw + + * config/arm/parsecpu.awk (gen_comm_data): Add initializer for + profile to the dummy entry at the end of the list of architectures. + * config/arm/arm-cpu-cdata.h: Regenerated. + 2017-06-29 Kyrylo Tkachov Michael Collison diff --git a/gcc/config/arm/arm-cpu-cdata.h b/gcc/config/arm/arm-cpu-cdata.h index 4528d07..1cf1149 100644 --- a/gcc/config/arm/arm-cpu-cdata.h +++ b/gcc/config/arm/arm-cpu-cdata.h @@ -1993,6 +1993,14 @@ static const struct cpu_arch_extension arch_opttab_armv7e_m[] = { "nofp", true, false, { ISA_ALL_FP, isa_nobit } }, + { + "vfpv4-sp-d16", false, true, + { ISA_VFPv4, isa_nobit } + }, + { + "fpv5-d16", false, true, + { ISA_FPv5,ISA_FP_DBL, isa_nobit } + }, { NULL, false, false, {isa_nobit}} }; @@ -2037,14 +2045,6 @@ static const struct cpu_arch_extension arch_opttab_armv8_1_a[] = { "nofp", true, false, { ISA_ALL_FP, isa_nobit } }, - { - "vfpv4-sp-d16", false, true, - { ISA_VFPv4, isa_nobit } - }, - { - "fpv5-d16", false, true, - { ISA_FPv5,ISA_FP_DBL, isa_nobit } - }, { NULL, false, false, {isa_nobit}} }; @@ -2462,7 +2462,7 @@ const arch_option all_architectures[] = TARGET_CPU_iwmmxt2, }, {{NULL, NULL, {isa_nobit}}, - NULL, BASE_ARCH_0, TARGET_CPU_arm_none} + NULL, BASE_ARCH_0, 0, TARGET_CPU_arm_none} }; const arm_fpu_desc all_fpus[] = diff --git a/gcc/config/arm/parsecpu.awk b/gcc/config/arm/parsecpu.awk index d38d664..d096bca 100644 --- a/gcc/config/arm/parsecpu.awk +++ b/gcc/config/arm/parsecpu.awk @@ -311,7 +311,7 @@ function gen_comm_data () { } print " {{NULL, NULL, {isa_nobit}}," - print " NULL, BASE_ARCH_0, TARGET_CPU_arm_none}" + print " NULL, BASE_ARCH_0, 0, TARGET_CPU_arm_none}" print "};\n" print "const arm_fpu_desc all_fpus[] =" -- 2.7.4