The aarch64-option-extensions.def parsing in config.gcc had some code left over from when it tried to parse the whole macro definition. Also, config.gcc now only looks at the first fields of the aarch64-arches.def entries.
gcc/ * config.gcc: Remove dead aarch64-option-extensions.def code. * config/aarch64/aarch64-arches.def: Update comment. --- gcc/config.gcc | 8 -------- gcc/config/aarch64/aarch64-arches.def | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/gcc/config.gcc b/gcc/config.gcc index 7eb07870425..555f257c2e7 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -4100,14 +4100,6 @@ case "${target}" in options_parsed="`$ac_cv_prog_CPP -D"$opt_macro" -x c \ ${srcdir}/config/aarch64/aarch64-option-extensions.def`" - # Match one element inside AARCH64_OPT_EXTENSION, we - # consume anything that's not a ,. - elem="[ ]*\([^,]\+\)[ ]*" - - # Repeat the pattern for the number of entries in the - # AARCH64_OPT_EXTENSION, currently 6 times. - sed_patt="^$elem,$elem,$elem,$elem,$elem,$elem" - while [ x"$ext_val" != x ] do ext_val=`echo $ext_val | sed -e 's/\+//'` diff --git a/gcc/config/aarch64/aarch64-arches.def b/gcc/config/aarch64/aarch64-arches.def index e422028224b..ece96e22a70 100644 --- a/gcc/config/aarch64/aarch64-arches.def +++ b/gcc/config/aarch64/aarch64-arches.def @@ -28,7 +28,7 @@ ARCH_REV is an integer specifying the architecture major revision. FLAGS are the flags implied by the architecture. Due to the assumptions about the positions of these fields in config.gcc, - the NAME should be kept as the first argument and FLAGS as the last. */ + NAME should be kept as the first argument. */ AARCH64_ARCH("armv8-a", generic, V8A, 8, AARCH64_FL_FOR_V8A) AARCH64_ARCH("armv8.1-a", generic, V8_1A, 8, AARCH64_FL_FOR_V8_1A) -- 2.25.1