| Message ID | 4ED4A8F3.1060100@arm.com |
|---|---|
| State | New |
| Headers | show |
On 29/11/11 09:42, Matthew Gretton-Dann wrote: > All, > > Whilst developing the Cortex-A15 integer pipeline patch it was noted > that the MD_INCLUDES variable in config/arm/t-arm has not been kept > up-to-date. > > The attached patch fixes this, and rearranges the list of md files into > alphabetical order. > > The list was generated using `ls -1 *.md | grep -v arm\\.md`. > > Tested by doing a arm-none-eabi build. > > Can someone please review, and if appropriate apply? > > Thanks, > > Matt > > gcc/ChangeLog: > 2011-11-29 Matthew Gretton-Dann <matthew.gretton-dann@arm.com> > > * config/arm/t-arm (MD_INCLUDES): Ensure all md files are > listed. > OK. R.
Richard Earnshaw wrote: > On 29/11/11 09:42, Matthew Gretton-Dann wrote: >> All, >> >> Whilst developing the Cortex-A15 integer pipeline patch it was noted >> that the MD_INCLUDES variable in config/arm/t-arm has not been kept >> up-to-date. >> >> The attached patch fixes this, and rearranges the list of md files into >> alphabetical order. >> >> The list was generated using `ls -1 *.md | grep -v arm\\.md`. >> >> Tested by doing a arm-none-eabi build. >> >> Can someone please review, and if appropriate apply? >> >> Thanks, >> >> Matt >> >> gcc/ChangeLog: >> 2011-11-29 Matthew Gretton-Dann <matthew.gretton-dann@arm.com> >> >> * config/arm/t-arm (MD_INCLUDES): Ensure all md files are >> listed. >> > > OK. > > R. Is each entry mandatory in that list? I thought gen-tools already arrange for great part of MD_INCLUDES? For example, after adding (include "avr-dimode.md") to avr.md, ./gcc/mddeps.mk reads: MD_INCLUDES = \ ../../../gcc.gnu.org/trunk/gcc/config/avr/predicates.md \ ../../../gcc.gnu.org/trunk/gcc/config/avr/constraints.md \ ../../../gcc.gnu.org/trunk/gcc/config/avr/avr-dimode.md ../../../gcc.gnu.org/trunk/gcc/config/avr/predicates.md: ../../../gcc.gnu.org/trunk/gcc/config/avr/constraints.md: ../../../gcc.gnu.org/trunk/gcc/config/avr/avr-dimode.md: so that maintaining such a list might be considerable easier. Johann
On 01/12/11 11:09, Georg-Johann Lay wrote: > Richard Earnshaw wrote: >> On 29/11/11 09:42, Matthew Gretton-Dann wrote: >>> All, >>> >>> Whilst developing the Cortex-A15 integer pipeline patch it was noted >>> that the MD_INCLUDES variable in config/arm/t-arm has not been kept >>> up-to-date. >>> >>> The attached patch fixes this, and rearranges the list of md files into >>> alphabetical order. >>> >>> The list was generated using `ls -1 *.md | grep -v arm\\.md`. >>> >>> Tested by doing a arm-none-eabi build. >>> >>> Can someone please review, and if appropriate apply? >>> >>> Thanks, >>> >>> Matt >>> >>> gcc/ChangeLog: >>> 2011-11-29 Matthew Gretton-Dann <matthew.gretton-dann@arm.com> >>> >>> * config/arm/t-arm (MD_INCLUDES): Ensure all md files are >>> listed. >>> >> >> OK. >> >> R. > > Is each entry mandatory in that list? > > I thought gen-tools already arrange for great part of MD_INCLUDES? > > For example, after adding (include "avr-dimode.md") to avr.md, ./gcc/mddeps.mk > reads: > > MD_INCLUDES = \ > ../../../gcc.gnu.org/trunk/gcc/config/avr/predicates.md \ > ../../../gcc.gnu.org/trunk/gcc/config/avr/constraints.md \ > ../../../gcc.gnu.org/trunk/gcc/config/avr/avr-dimode.md > > ../../../gcc.gnu.org/trunk/gcc/config/avr/predicates.md: > > ../../../gcc.gnu.org/trunk/gcc/config/avr/constraints.md: > > ../../../gcc.gnu.org/trunk/gcc/config/avr/avr-dimode.md: > > so that maintaining such a list might be considerable easier. > Indeed. I hadn't realised that that feature had been added since I first added that macro. It does indeed look as though the whole definition of MD_INCLUDES is now redundant. R.
diff --git a/gcc/config/arm/t-arm b/gcc/config/arm/t-arm index a9a174d..4b94a7e 100644 --- a/gcc/config/arm/t-arm +++ b/gcc/config/arm/t-arm @@ -19,26 +19,43 @@ # along with GCC; see the file COPYING3. If not see # <http://www.gnu.org/licenses/>. -MD_INCLUDES= $(srcdir)/config/arm/arm-tune.md \ - $(srcdir)/config/arm/predicates.md \ - $(srcdir)/config/arm/arm-generic.md \ - $(srcdir)/config/arm/arm1020e.md \ +# All md files - except for arm.md. +# This list should be kept in alphabetical order and updated whenever an md +# file is added or removed. +MD_INCLUDES= $(srcdir)/config/arm/arm1020e.md \ $(srcdir)/config/arm/arm1026ejs.md \ $(srcdir)/config/arm/arm1136jfs.md \ + $(srcdir)/config/arm/arm926ejs.md \ + $(srcdir)/config/arm/arm-fixed.md \ + $(srcdir)/config/arm/arm-generic.md \ + $(srcdir)/config/arm/arm-tune.md \ + $(srcdir)/config/arm/cirrus.md \ + $(srcdir)/config/arm/constraints.md \ + $(srcdir)/config/arm/cortex-a5.md \ + $(srcdir)/config/arm/cortex-a8.md \ + $(srcdir)/config/arm/cortex-a8-neon.md \ + $(srcdir)/config/arm/cortex-a9.md \ + $(srcdir)/config/arm/cortex-a9-neon.md \ + $(srcdir)/config/arm/cortex-m4-fpu.md \ + $(srcdir)/config/arm/cortex-m4.md \ + $(srcdir)/config/arm/cortex-r4f.md \ + $(srcdir)/config/arm/cortex-r4.md \ $(srcdir)/config/arm/fa526.md \ $(srcdir)/config/arm/fa606te.md \ $(srcdir)/config/arm/fa626te.md \ - $(srcdir)/config/arm/fmp626.md \ $(srcdir)/config/arm/fa726te.md \ - $(srcdir)/config/arm/arm926ejs.md \ - $(srcdir)/config/arm/cirrus.md \ + $(srcdir)/config/arm/fmp626.md \ $(srcdir)/config/arm/fpa.md \ - $(srcdir)/config/arm/vec-common.md \ + $(srcdir)/config/arm/iterators.md \ $(srcdir)/config/arm/iwmmxt.md \ - $(srcdir)/config/arm/vfp.md \ + $(srcdir)/config/arm/ldmstm.md \ $(srcdir)/config/arm/neon.md \ + $(srcdir)/config/arm/predicates.md \ + $(srcdir)/config/arm/sync.md \ $(srcdir)/config/arm/thumb2.md \ - $(srcdir)/config/arm/arm-fixed.md + $(srcdir)/config/arm/vec-common.md \ + $(srcdir)/config/arm/vfp11.md \ + $(srcdir)/config/arm/vfp.md s-config s-conditions s-flags s-codes s-constants s-emit s-recog s-preds \ s-opinit s-extract s-peep s-attr s-attrtab s-output: $(MD_INCLUDES)