r244316 - in /trunk: contrib/ChangeLog contrib/...

rearnsha@gcc.gnu.org rearnsha@gcc.gnu.org
Wed Jan 11 14:39:00 GMT 2017


Author: rearnsha
Date: Wed Jan 11 14:39:00 2017
New Revision: 244316

URL: https://gcc.gnu.org/viewcvs?rev=244316&root=gcc&view=rev
Log:
[arm] Replace command-line option .def files with single definition file

The files arm-cores.def, arm-fpus.def and arm-arches.def are parsed and
used in several places and the format is slightly awkward to maintain
as they must be parsable in C and by certain scripts.  Furthermore,
changes to the content that affects every entry is particularly awkward for
dealing with merges.

This patch replaces all three files with a single file that specifies all
the command-line related definitions in a new format that allows for better
checking for consistency as well as (hopefully) easier to merge changes.

The awk script used to parse it is relatively complicated, but should be
pretty portable.  It works by parsing in all the data and then operating
one of a number of possible sub-commands to generate the desired output.

The new method picked up one error.  The CPU descriptions referred to an
architecture ARMv5tej which was not supported by -march.  This has been
fixed by adding the relevant entry to the architecture list.

gcc:
	* config.gcc: Use new awk script to check CPU, FPU and architecture
	parameters for --with-... options.
	* config/arm/parsecpu.awk: New file
	* config/arm/arm-cpus.in: New file.
	* config/arm/arm-opts.h: Include arm-cpu.h instead of processing .def
	files.
	* config/arm/arm.c: Include arm-cpu-data.h instead of processing .def
	files.
	* config/arm/t-arm: Update dependency rules.
	* common/config/arm/arm-common.c: Include arm-cpu-cdata.h instead
	of processing .def files.
	* config/arm/genopt.sh: Deleted.
	* config/arm/gentune.sh: Deleted.
	* config/arm/arm-cores.def: Deleted.
	* config/arm/arm-arches.def: Deleted.
	* config/arm/arm-fpus.def: Deleted.
	* config/arm/arm-tune.md: Regenerated.
	* config/arm/arm-tables.opt: Regenerated.
	* config/arm/arm-cpu.h: New generated file.
	* config/arm/arm-cpu-data.h: New generated file.
	* config/arm/arm-cpu-cdata.h: New generated file.

Contrib:
	* gcc_update: Adjust touch list.

Added:
    trunk/gcc/config/arm/arm-cpu-cdata.h
    trunk/gcc/config/arm/arm-cpu-data.h
    trunk/gcc/config/arm/arm-cpu.h
    trunk/gcc/config/arm/arm-cpus.in
    trunk/gcc/config/arm/parsecpu.awk
Removed:
    trunk/gcc/config/arm/arm-arches.def
    trunk/gcc/config/arm/arm-cores.def
    trunk/gcc/config/arm/arm-fpus.def
    trunk/gcc/config/arm/genopt.sh
    trunk/gcc/config/arm/gentune.sh
Modified:
    trunk/contrib/ChangeLog
    trunk/contrib/gcc_update
    trunk/gcc/ChangeLog
    trunk/gcc/common/config/arm/arm-common.c
    trunk/gcc/config.gcc
    trunk/gcc/config/arm/arm-opts.h
    trunk/gcc/config/arm/arm-tables.opt
    trunk/gcc/config/arm/arm-tune.md
    trunk/gcc/config/arm/arm.c
    trunk/gcc/config/arm/t-arm



More information about the Gcc-cvs mailing list