diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog.MELT | 5 | ||||
| -rw-r--r-- | gcc/melt-make.mk | 157 |
2 files changed, 90 insertions, 72 deletions
diff --git a/gcc/ChangeLog.MELT b/gcc/ChangeLog.MELT index efbaadb2b30..d6e3f92c499 100644 --- a/gcc/ChangeLog.MELT +++ b/gcc/ChangeLog.MELT @@ -1,5 +1,10 @@ +2010-06-27 Basile Starynkevitch <basile@starynkevitch.net> + * melt-make.mk (warmelt*.so): added explicit dependencies on + elt-predef.h run-melt.h melt-runtime.h cc1$(exeext) to ensure + rebuild. + 2010-06-25 Basile Starynkevitch <basile@starynkevitch.net> * melt-module.mk (meltmodule, meltmoduledynamic) diff --git a/gcc/melt-make.mk b/gcc/melt-make.mk index e93fb43ce69..bdef77fd4c7 100644 --- a/gcc/melt-make.mk +++ b/gcc/melt-make.mk @@ -75,13 +75,13 @@ vpath %.melt $(melt_make_source_dir) . $(melt_source_dir) ## the invoking command could set MELT_MAKE_MODULE_XTRAMAKEFLAGS=-j2 MELT_MAKE_MODULE=$(MAKE) -f $(melt_make_module_makefile) $(MELT_MAKE_MODULE_XTRAMAKEFLAGS) VPATH=$(VPATH):. -warmelt-%.0.so: warmelt-%.0.c $(melt_make_module_makefile) melt-predef.h \ - melt-runtime.h melt-runtime.c $(wildcard cc1) +warmelt-%.0.so: warmelt-%.0.c $(melt_make_module_makefile) melt-predef.h run-melt.h \ + melt-runtime.h melt-runtime.c cc1$(exeext) echo in melt-make.mk melt_cflags= $(melt_cflags) $(MELT_MAKE_MODULE) melt_module \ GCCMELT_CFLAGS="$(melt_cflags)" \ GCCMELT_MODULE_SOURCE=$< GCCMELT_MODULE_BINARY=$@ -warmelt-%.0.d.so: warmelt-%.0.c $(melt_make_module_makefile) melt-predef.h +warmelt-%.0.d.so: warmelt-%.0.c $(melt_make_module_makefile) melt-predef.h run-melt.h cc1$(exeext) $(MELT_MAKE_MODULE) melt_module_dynamic \ GCCMELT_CFLAGS="$(melt_cflags)" \ GCCMELT_MODULE_SOURCE=$< GCCMELT_MODULE_BINARY=$(shell basename $@ .d.so).so @@ -99,7 +99,7 @@ warm%.n.so: warm%.c $(melt_make_module_makefile) GCCMELT_CFLAGS="$(melt_cflags)" \ GCCMELT_MODULE_SOURCE=$< GCCMELT_MODULE_BINARY=$@ ## warmeltbig*.c is so big that it can only be compiled with -O0 -warmeltbig-%.so: warmeltbig-%.c $(melt_make_module_makefile) melt-predef.h +warmeltbig-%.so: warmeltbig-%.c $(melt_make_module_makefile) melt-predef.h cc1$(exeext) $(MELT_MAKE_MODULE) melt_module \ GCCMELT_CFLAGS="$(melt_cflags) -O0" \ GCCMELT_MODULE_SOURCE=$< GCCMELT_MODULE_BINARY=$@ @@ -236,7 +236,7 @@ empty-file-for-melt.c: date +"/* empty-file-for-melt.c %c */" > $@-tmp $(melt_make_move) $@-tmp $@ -warmelt-first.1.c: $(melt_make_source_dir)/warmelt-first.melt warmelt0.modlis $(melt_make_gencdeps) $(WARMELT_BASE0SO) empty-file-for-melt.c +warmelt-first.1.c: $(melt_make_source_dir)/warmelt-first.melt warmelt0.modlis $(melt_make_gencdeps) $(WARMELT_BASE0SO) empty-file-for-melt.c melt-predef.h run-melt.h melt-runtime.h cc1$(exeext) $(MELTCCINIT1) $(meltarg_init)=$(WARMELT_BASE0ROW) \ $(meltarg_arg)=$< -frandom-seed=$(shell md5sum $< | cut -b-24) \ $(meltarg_output)=$@ empty-file-for-melt.c @@ -284,17 +284,17 @@ warmelt-%-h2.c: $(melt_make_source_dir)/warmelt-%.melt $(melt_make_gencdeps) \ ## compiled without any optimisation, otherwise the C compiler suffers ## too much.. -warmeltbig.1.c: $(WARMELT_SRCFILES) warmelt0.modlis $(melt_make_gencdeps) $(WARMELT_BASE0SO) empty-file-for-melt.c warmelt-predef.melt $(WARMELT_SRCFILES) +warmeltbig.1.c: $(WARMELT_SRCFILES) warmelt0.modlis $(melt_make_gencdeps) $(WARMELT_BASE0SO) warmelt-predef.melt empty-file-for-melt.c melt-predef.h run-melt.h melt-runtime.h cc1$(exeext) $(MELTCCINIT1) $(meltarg_init)=$(WARMELT_BASE0ROW) \ $(meltarg_arglist)=$(WARMELT_SRCARGLIST) \ $(meltarg_output)=$@ empty-file-for-melt.c -warmeltbig.2.c: $(WARMELT_SRCFILES) warmeltbig.1.so $(melt_make_gencdeps) empty-file-for-melt.c warmelt-predef.melt $(WARMELT_SRCFILES) +warmeltbig.2.c: $(WARMELT_SRCFILES) warmeltbig.1.so $(melt_make_gencdeps) empty-file-for-melt.c warmelt-predef.melt $(WARMELT_SRCFILES) empty-file-for-melt.c melt-predef.h run-melt.h melt-runtime.h cc1$(exeext) $(MELTCCINIT1) $(meltarg_init)=warmeltbig.1 \ $(meltarg_arglist)=$(WARMELT_SRCARGLIST) \ $(meltarg_output)=$@ empty-file-for-melt.c -warmeltbig.3.c: $(WARMELT_SRCFILES) warmeltbig.2.so $(melt_make_gencdeps) empty-file-for-melt.c warmelt-predef.melt $(WARMELT_SRCFILES) +warmeltbig.3.c: $(WARMELT_SRCFILES) warmeltbig.2.so $(melt_make_gencdeps) empty-file-for-melt.c warmelt-predef.melt $(WARMELT_SRCFILES) empty-file-for-melt.c melt-predef.h run-melt.h melt-runtime.h cc1$(exeext) $(MELTCCINIT1) $(meltarg_init)=warmeltbig.2 \ $(meltarg_arglist)=$(WARMELT_SRCARGLIST) \ $(meltarg_output)=$@ empty-file-for-melt.c @@ -325,28 +325,30 @@ warmelth2.modlis: $(WARMELT_BASEH2SO) $(melt_make_move) $@-tmp $@ warmelt-base.1.c: $(melt_make_source_dir)/warmelt-base.melt $(melt_make_gencdeps) \ - warmelt-first.1.so \ - warmelt-base.0.d.so \ - warmelt-debug.0.d.so \ - warmelt-macro.0.d.so \ - warmelt-normal.0.d.so \ - warmelt-normatch.0.d.so \ - warmelt-genobj.0.d.so \ - warmelt-outobj.0.d.so empty-file-for-melt.c + warmelt-first.1.so \ + warmelt-base.0.d.so \ + warmelt-debug.0.d.so \ + warmelt-macro.0.d.so \ + warmelt-normal.0.d.so \ + warmelt-normatch.0.d.so \ + warmelt-genobj.0.d.so \ + warmelt-outobj.0.d.so \ + empty-file-for-melt.c melt-predef.h run-melt.h melt-runtime.h cc1$(exeext) $(MELTCCFILE1) \ $(meltarg_init)=warmelt-first.1:warmelt-base.0.d:warmelt-debug.0.d:warmelt-macro.0.d:warmelt-normal.0.d:warmelt-normatch.0.d:warmelt-genobj.0.d:warmelt-outobj.0.d \ $(meltarg_arg)=$< -frandom-seed=$(shell md5sum $< | cut -b-24) \ $(meltarg_output)=$@ empty-file-for-melt.c warmelt-debug.1.c: $(melt_make_source_dir)/warmelt-debug.melt $(melt_make_gencdeps) \ - warmelt-first.1.so \ - warmelt-base.1.so \ - warmelt-debug.0.d.so \ - warmelt-macro.0.d.so \ - warmelt-normal.0.d.so \ - warmelt-normatch.0.d.so \ - warmelt-genobj.0.d.so \ - warmelt-outobj.0.d.so empty-file-for-melt.c + warmelt-first.1.so \ + warmelt-base.1.so \ + warmelt-debug.0.d.so \ + warmelt-macro.0.d.so \ + warmelt-normal.0.d.so \ + warmelt-normatch.0.d.so \ + warmelt-genobj.0.d.so \ + warmelt-outobj.0.d.so \ + empty-file-for-melt.c melt-predef.h run-melt.h melt-runtime.h cc1$(exeext) $(MELTCCFILE1) \ $(meltarg_init)=warmelt-first.1:warmelt-base.1:warmelt-debug.0.d:warmelt-macro.0.d:warmelt-normal.0.d:warmelt-normatch.0.d:warmelt-genobj.0.d:warmelt-outobj.0.d \ $(meltarg_arg)=$< -frandom-seed=$(shell md5sum $< | cut -b-24) \ @@ -354,14 +356,15 @@ warmelt-debug.1.c: $(melt_make_source_dir)/warmelt-debug.melt $(melt_make_gencde warmelt-macro.1.c: $(melt_make_source_dir)/warmelt-macro.melt $(melt_make_gencdeps) \ - warmelt-first.1.so \ - warmelt-base.1.so \ - warmelt-debug.1.so \ - warmelt-macro.0.d.so \ - warmelt-normal.0.d.so \ - warmelt-normatch.0.d.so \ - warmelt-genobj.0.d.so \ - warmelt-outobj.0.d.so empty-file-for-melt.c + warmelt-first.1.so \ + warmelt-base.1.so \ + warmelt-debug.1.so \ + warmelt-macro.0.d.so \ + warmelt-normal.0.d.so \ + warmelt-normatch.0.d.so \ + warmelt-genobj.0.d.so \ + warmelt-outobj.0.d.so \ + empty-file-for-melt.c warmelt-predef.melt melt-predef.h run-melt.h melt-runtime.h cc1$(exeext) $(MELTCCFILE1) \ $(meltarg_init)=warmelt-first.1:warmelt-base.1:warmelt-debug.1:warmelt-macro.0.d:warmelt-normal.0.d:warmelt-normatch.0.d:warmelt-genobj.0.d:warmelt-outobj.0.d \ $(meltarg_arg)=$< -frandom-seed=$(shell md5sum $< | cut -b-24) \ @@ -369,15 +372,15 @@ warmelt-macro.1.c: $(melt_make_source_dir)/warmelt-macro.melt $(melt_make_gencde warmelt-normal.1.c: $(melt_make_source_dir)/warmelt-normal.melt $(melt_make_gencdeps) \ - warmelt-first.1.so \ - warmelt-base.1.so \ - warmelt-debug.1.so \ - warmelt-macro.1.so \ - warmelt-normal.0.d.so \ - warmelt-normatch.0.d.so \ - warmelt-genobj.0.d.so \ - warmelt-outobj.0.d.so \ - warmelt-predef.melt empty-file-for-melt.c + warmelt-first.1.so \ + warmelt-base.1.so \ + warmelt-debug.1.so \ + warmelt-macro.1.so \ + warmelt-normal.0.d.so \ + warmelt-normatch.0.d.so \ + warmelt-genobj.0.d.so \ + warmelt-outobj.0.d.so \ + empty-file-for-melt.c warmelt-predef.melt melt-predef.h run-melt.h melt-runtime.h cc1$(exeext) $(MELTCCFILE1) \ $(meltarg_init)=warmelt-first.1:warmelt-base.1:warmelt-debug.1:warmelt-macro.1:warmelt-normal.0.d:warmelt-normatch.0.d:warmelt-genobj.0.d:warmelt-outobj.0.d \ $(meltarg_arg)=$< -frandom-seed=$(shell md5sum $< | cut -b-24) \ @@ -385,42 +388,45 @@ warmelt-normal.1.c: $(melt_make_source_dir)/warmelt-normal.melt $(melt_make_genc warmelt-normatch.1.c: $(melt_make_source_dir)/warmelt-normatch.melt $(melt_make_gencdeps) \ - warmelt-first.1.so \ - warmelt-base.1.so \ - warmelt-debug.1.so \ - warmelt-macro.1.so \ - warmelt-normal.1.so \ - warmelt-normatch.0.d.so \ - warmelt-genobj.0.d.so \ - warmelt-outobj.0.d.so empty-file-for-melt.c + warmelt-first.1.so \ + warmelt-base.1.so \ + warmelt-debug.1.so \ + warmelt-macro.1.so \ + warmelt-normal.1.so \ + warmelt-normatch.0.d.so \ + warmelt-genobj.0.d.so \ + warmelt-outobj.0.d.so \ + empty-file-for-melt.c warmelt-predef.melt melt-predef.h run-melt.h melt-runtime.h cc1$(exeext) $(MELTCCFILE1) \ $(meltarg_init)=warmelt-first.1:warmelt-base.1:warmelt-debug.1:warmelt-macro.1:warmelt-normal.1:warmelt-normatch.0.d:warmelt-genobj.0.d:warmelt-outobj.0.d \ $(meltarg_arg)=$< -frandom-seed=$(shell md5sum $< | cut -b-24) \ $(meltarg_output)=$@ empty-file-for-melt.c warmelt-genobj.1.c: $(melt_make_source_dir)/warmelt-genobj.melt $(melt_make_gencdeps) \ - warmelt-first.1.so \ - warmelt-base.1.so \ - warmelt-debug.1.so \ - warmelt-macro.1.so \ - warmelt-normal.1.so \ - warmelt-normatch.1.so \ - warmelt-genobj.0.d.so \ - warmelt-outobj.0.d.so empty-file-for-melt.c + warmelt-first.1.so \ + warmelt-base.1.so \ + warmelt-debug.1.so \ + warmelt-macro.1.so \ + warmelt-normal.1.so \ + warmelt-normatch.1.so \ + warmelt-genobj.0.d.so \ + warmelt-outobj.0.d.so \ + empty-file-for-melt.c warmelt-predef.melt melt-predef.h run-melt.h melt-runtime.h cc1$(exeext) $(MELTCCFILE1) \ $(meltarg_init)=warmelt-first.1:warmelt-base.1:warmelt-debug.1:warmelt-macro.1:warmelt-normal.1:warmelt-normatch.1:warmelt-genobj.0.d:warmelt-outobj.0.d \ $(meltarg_arg)=$< -frandom-seed=$(shell md5sum $< | cut -b-24)\ $(meltarg_output)=$@ empty-file-for-melt.c warmelt-outobj.1.c: $(melt_make_source_dir)/warmelt-outobj.melt $(melt_make_gencdeps) \ - warmelt-first.1.so \ - warmelt-base.1.so \ - warmelt-debug.1.so \ - warmelt-macro.1.so \ - warmelt-normal.1.so \ - warmelt-normatch.1.so \ - warmelt-genobj.1.so \ - warmelt-outobj.0.d.so warmelt-predef.melt empty-file-for-melt.c + warmelt-first.1.so \ + warmelt-base.1.so \ + warmelt-debug.1.so \ + warmelt-macro.1.so \ + warmelt-normal.1.so \ + warmelt-normatch.1.so \ + warmelt-genobj.1.so \ + warmelt-outobj.0.d.so \ + empty-file-for-melt.c warmelt-predef.melt melt-predef.h run-melt.h melt-runtime.h cc1$(exeext) $(MELTCCFILE1) \ $(meltarg_init)=warmelt-first.1:warmelt-base.1:warmelt-debug.1:warmelt-macro.1:warmelt-normal.1:warmelt-normatch.1:warmelt-genobj.1:warmelt-outobj.0.d \ $(meltarg_arg)=$< -frandom-seed=$(shell md5sum $< | cut -b-24)\ @@ -432,14 +438,16 @@ warmelt2.modlis: $(WARMELT_BASE2SO) for f in $(WARMELT_BASE2); do echo $$f >> $@-tmp; done $(melt_make_move) $@-tmp $@ -warmelt-first.2.c: $(melt_make_source_dir)/warmelt-first.melt warmelt1.modlis $(WARMELT_BASE1SO) $(melt_make_gencdeps) +warmelt-first.2.c: $(melt_make_source_dir)/warmelt-first.melt warmelt1.modlis $(WARMELT_BASE1SO) $(melt_make_gencdeps) \ + empty-file-for-melt.c warmelt-predef.melt melt-predef.h run-melt.h melt-runtime.h cc1$(exeext) $(MELTCCINIT1) $(meltarg_init)="@warmelt1" \ $(meltarg_arg)=$< -frandom-seed=$(shell md5sum $< | cut -b-24) \ $(meltarg_output)=$@ empty-file-for-melt.c -warmelt-%.2.c: $(melt_make_source_dir)/warmelt-%.melt warmelt1.modlis $(WARMELT_BASE1SO) $(melt_make_gencdeps) empty-file-for-melt.c +warmelt-%.2.c: $(melt_make_source_dir)/warmelt-%.melt warmelt1.modlis $(WARMELT_BASE1SO) $(melt_make_gencdeps) \ + empty-file-for-melt.c warmelt-predef.melt melt-predef.h run-melt.h melt-runtime.h cc1$(exeext) $(MELTCCFILE1) $(meltarg_init)="@warmelt1" \ -frandom-seed=$(shell md5sum $< | cut -b-24) \ $(meltarg_arg)=$< \ @@ -483,7 +491,8 @@ warmelt2n.modlis: $(WARMELT_BASE2NSO) $(melt_make_move) $@-tmp $@ #### -warmelt-%.c: $(melt_make_source_dir)/warmelt-%.melt warmelt2.modlis $(WARMELT_BASE2SO) $(melt_make_gencdeps) empty-file-for-melt.c +warmelt-%.c: $(melt_make_source_dir)/warmelt-%.melt warmelt2.modlis $(WARMELT_BASE2SO) $(melt_make_gencdeps) \ + empty-file-for-melt.c warmelt-predef.melt melt-predef.h run-melt.h melt-runtime.h cc1$(exeext) @echo generating $@ using $(WARMELT_BASE2SO) -rm -f $@ $(MELTCCFILE1) $(meltarg_init)="@warmelt2" \ @@ -495,7 +504,8 @@ warmelt.modlis: $(WARMELT_BASE2SO) for f in $(WARMELT_BASE); do echo $$f >> $@-tmp; done $(SHELL) $(srcdir)/../move-if-change $@-tmp $@ -warmelt-first.c: $(melt_make_source_dir)/warmelt-first.melt warmelt2.modlis $(WARMELT_BASE2SO) $(melt_make_gencdeps) +warmelt-first.c: $(melt_make_source_dir)/warmelt-first.melt warmelt2.modlis $(WARMELT_BASE2SO) $(melt_make_gencdeps) \ + empty-file-for-melt.c warmelt-predef.melt melt-predef.h run-melt.h melt-runtime.h cc1$(exeext) -rm -f $@ @echo generating $@ using $(WARMELT_BASE2SO) $(MELTCCINIT1) $(meltarg_init)="@warmelt2" \ @@ -513,7 +523,8 @@ diff-warmelt.2.: $(WARMELT_BASESO) #### -xtramelt-ana-base.c: $(melt_make_source_dir)/xtramelt-ana-base.melt warmelt2.modlis $(WARMELT_BASE2SO) $(melt_make_gencdeps) empty-file-for-melt.c +xtramelt-ana-base.c: $(melt_make_source_dir)/xtramelt-ana-base.melt warmelt2.modlis $(WARMELT_BASE2SO) $(melt_make_gencdeps) \ + empty-file-for-melt.c warmelt-predef.melt melt-predef.h run-melt.h melt-runtime.h cc1$(exeext) @echo generating $@ using $(WARMELT_BASE2SO) -rm -f $@ $(MELTCCFILE1) $(meltarg_init)="@warmelt2" \ @@ -521,7 +532,8 @@ xtramelt-ana-base.c: $(melt_make_source_dir)/xtramelt-ana-base.melt warmelt2.mo $(meltarg_output)=$@ empty-file-for-melt.c ls -l $@ -xtramelt-ana-simple.c: $(melt_make_source_dir)/xtramelt-ana-simple.melt warmelt2.modlis $(WARMELT_BASE2SO) xtramelt-ana-base.so $(melt_make_gencdeps) +xtramelt-ana-simple.c: $(melt_make_source_dir)/xtramelt-ana-simple.melt warmelt2.modlis $(WARMELT_BASE2SO) xtramelt-ana-base.so $(melt_make_gencdeps) \ + empty-file-for-melt.c warmelt-predef.melt melt-predef.h run-melt.h melt-runtime.h cc1$(exeext) @echo generating $@ using $(WARMELT_BASE2SO) -rm -f $@ $(MELTCCFILE1) $(meltarg_init)="@warmelt2:xtramelt-ana-base" \ @@ -529,7 +541,8 @@ xtramelt-ana-simple.c: $(melt_make_source_dir)/xtramelt-ana-simple.melt warmel $(meltarg_output)=$@ empty-file-for-melt.c ls -l $@ -xtramelt-parse-infix-syntax.c: $(melt_make_source_dir)/xtramelt-parse-infix-syntax.melt warmelt2.modlis $(WARMELT_BASE2SO) xtramelt-ana-base.so xtramelt-ana-simple.so $(melt_make_gencdeps) +xtramelt-parse-infix-syntax.c: $(melt_make_source_dir)/xtramelt-parse-infix-syntax.melt warmelt2.modlis $(WARMELT_BASE2SO) xtramelt-ana-base.so xtramelt-ana-simple.so $(melt_make_gencdeps) \ + empty-file-for-melt.c warmelt-predef.melt melt-predef.h run-melt.h melt-runtime.h cc1$(exeext) @echo generating $@ using $(WARMELT_BASE2SO) -rm -f $@ $(MELTCCFILE1) $(meltarg_init)="@warmelt2:xtramelt-ana-base:xtramelt-ana-simple" \ |