diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-09-24 14:07:27 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-09-24 14:07:27 +0000 |
| commit | 86243076b379282bf0f85ee79b114a38c596128d (patch) | |
| tree | 5171e3ca104587d5f80282c6cc1b3b107b2aaf78 /contrib | |
| parent | 7ad0062c35e92915f8347d6fec384b6d77c6feec (diff) | |
| download | gcc-86243076b379282bf0f85ee79b114a38c596128d.tar.gz | |
2011-09-24 Basile Starynkevitch <basile@starynkevitch.net>
* MELT-Plugin-Makefile (melt.so): Also build melt-runtime.args
2011-09-24 Basile Starynkevitch <basile@starynkevitch.net>
* melt-build.tpl (melt-tiny-tests): Run the meltframe test on
melt-runtime.c
* melt-build.mk: Regenerate.
* melt-runtime.c (meltgc_do_initial_mode)
(meltgc_load_modules_and_do_mode): Remove unused MELT frame slots.
* Makefile.in (MELT_RUNTIME_CPPDEFS): Quote more.
(melt-runtime.o): Also build melt-runtime.args.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@179143 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/ChangeLog.MELT | 3 | ||||
| -rw-r--r-- | contrib/MELT-Plugin-Makefile | 11 |
2 files changed, 9 insertions, 5 deletions
diff --git a/contrib/ChangeLog.MELT b/contrib/ChangeLog.MELT index aa62686d5f7..7c1d02e61bd 100644 --- a/contrib/ChangeLog.MELT +++ b/contrib/ChangeLog.MELT @@ -1,4 +1,7 @@ +2011-09-24 Basile Starynkevitch <basile@starynkevitch.net> + * MELT-Plugin-Makefile (melt.so): Also build melt-runtime.args + 2011-09-09 Basile Starynkevitch <basile@starynkevitch.net> * MELT-Plugin-Makefile (MELTGCC_LIBES): New variable. (melt.so): Use it. diff --git a/contrib/MELT-Plugin-Makefile b/contrib/MELT-Plugin-Makefile index 97add4c3e1c..69ee363f385 100644 --- a/contrib/MELT-Plugin-Makefile +++ b/contrib/MELT-Plugin-Makefile @@ -215,12 +215,11 @@ melt-run-md5.h: gfmeltgcc_run_md5 MELTGCC_VERSION_NUMBER = $(shell cat gfmeltgcc_version_number) -melt.so: melt-runtime.c $(MELTGCC_RUNTIME_INCLUDES) \ +melt.so melt-runtime.args: melt-runtime.c $(MELTGCC_RUNTIME_INCLUDES) \ gt-melt-runtime.h $(wildcard $(MELTGCC_PLUGIN_DIR)/include/*.h) \ melt-predef.h melt-run.h melt-run-md5.h GCCMELT-REVISION \ gfmeltgcc_version_number gfmeltgcc_revision - $(CC) $(MELTGCC_INCLUDEFLAGS) -I $(realpath melt/generated) -I $(realpath .) \ - -fPIC -DMELT_IS_PLUGIN -shared \ + @echo $(MELTGCC_INCLUDEFLAGS) -I $(realpath melt/generated) -I $(realpath .) -DMELT_IS_PLUGIN \ $(MELTGCC_OPTIMFLAGS) \ -DMELT_GCC_VERSION=$(MELTGCC_VERSION_NUMBER) \ -DMELT_SOURCE_DIR=\"$(melt_source_dir)\" \ @@ -229,8 +228,10 @@ melt.so: melt-runtime.c $(MELTGCC_RUNTIME_INCLUDES) \ '-DMELT_REVISION="$(shell cat gfmeltgcc_revision)"' \ '-DMELT_MODULE_CFLAGS="$(melt_installed_cflags)"' \ -DMELT_MODULE_MAKEFILE=\"$(melt_installed_module_makefile)\" \ - -DMELT_DEFAULT_MODLIS=\"melt-default-modules\" \ - -o $@ $< $(MELTGCC_LIBES) + -DMELT_DEFAULT_MODLIS=\"melt-default-modules\" > melt-runtime.args-tmp + @mv melt-runtime.args-tmp melt-runtime.args + $(CC) -fPIC -shared `cat melt-runtime.args` \ + -o $@ melt-runtime.c $(MELTGCC_LIBES) clean: $(RM) *.o *~ melt-predef.h gt-melt-runtime.h gfmelt* *tmp |