2009-10-16 Basile Starynkevitch <basile@starynkevitch.net>

	[the value importer takes the imported symbol name cstring as an
	extra argument; this facilitates error messages in the importer
	when the import is failing. Also renamed class_clonedsymbol as
	class_cloned_symbol.]
	* gcc/melt/warmelt-first.melt: added more documentation. Renamed
	class_clonedsymbol as class_cloned_symbol. The class_delayed_queue
	is now private so is not exported. The value importer takes a
	extra :cstring argument and displays an error when failing.
	Several functions put inside initial_system_data are no more
	exported.
	* gcc/melt/warmelt-normal.melt: renamed class_clonedsymbol as
	class_cloned_symbol.
	* gcc/melt/warmelt-genobj.melt: likewise.
	* gcc/melt/warmelt-outobj.melt: likewise.
	* gcc/melt-make.mk: file warmelt-first*.c is specific [because it has
	no parent module] so should never be compiled in "dynamic" mode
	into a warmelt-first*.d.so. This is to enable it to define a
	private class, like class_delayed_queue.

	[regenerated, since the import protocol has changed - it has an
	extra string argument!]
	* gcc/melt/warmelt-macro-0.c: regenerated.
	* gcc/melt/warmelt-outobj-0.c: regenerated.
	* gcc/melt/warmelt-genobj-0.c: regenerated.
	* gcc/melt/warmelt-normatch-0.c: regenerated.
	* gcc/melt/warmelt-normal-0.c: regenerated.
	* gcc/melt/warmelt-first-0.c: regenerated.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@152905 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 8 insertions, 4 deletions

diff --git a/gcc/melt-make.mk b/gcc/melt-make.mk
index 3cc750bdcdc..64e7bc21534 100644
--- a/gcc/melt-make.mk
+++ b/gcc/melt-make.mk
@@ -104,26 +104,30 @@ WARMELT_SRCFILES= $(patsubst %.melt, $(melt_make_source_dir)/%.melt, $(WARMELT_F
 WARMELT_SRCRESTFILES= $(patsubst %.melt, $(melt_make_source_dir)/%.melt, $(WARMELT_RESTFILES))
 WARMELT_SRCARGLIST:=$(shell echo $(realpath $(WARMELT_SRCFILES))|sed 's: :,:g')
 WARMELT_BASE= $(basename $(WARMELT_FILES))
+WARMELT_REST= $(basename $(WARMELT_RESTFILES))
 WARMELT_BASELIST:=$(shell echo $(WARMELT_BASE)|sed 's: :,:g')
 
 WARMELT_BASE0= $(patsubst %, %-0, $(WARMELT_BASE))
 WARMELT_BASE0C= $(patsubst %, %-0.c, $(WARMELT_BASE))
 WARMELT_BASE0SO= $(patsubst %, %-0.so, $(WARMELT_BASE))
-WARMELT_BASE0DSO= $(patsubst %, %-0.d.so, $(WARMELT_BASE))
+## the file warmelt-first should never be C compiled in "dynamic"
+## mode, otherwise it cannot have private [non-exported] classes like
+## class_delayed_queue
+WARMELT_BASE0DSO= warmelt-first-0.so $(patsubst %, %-0.d.so, $(WARMELT_REST))
 WARMELT_BASE0ROW:=$(shell echo $(WARMELT_BASE0)|sed 's/ /:/g')
 WARMELT_BASE0DROW:=$(shell echo $(patsubst %, %-0.d, $(WARMELT_BASE))|sed 's/ /:/g')
 ##
 WARMELT_BASEH= $(patsubst %, %-h, $(WARMELT_BASE))
 WARMELT_BASEHSO= $(patsubst %, %-h.so, $(WARMELT_BASE))
-WARMELT_BASEHDSO= $(patsubst %, %-h.d.so, $(WARMELT_BASE))
+WARMELT_BASEHDSO=  warmelt-first-h.so $(patsubst %, %-h.d.so, $(WARMELT_REST))
 WARMELT_BASEHC= $(patsubst %, %-h.c, $(WARMELT_BASE))
 WARMELT_BASEHROW:=$(shell echo $(WARMELT_BASEH)|sed 's/ /:/g')
 WARMELT_BASEHDROW:=$(shell echo $(patsubst %, %-h.d, $(WARMELT_BASE))|sed 's/ /:/g')
 ##
 ##
 WARMELT_BASEH2= $(patsubst %, %-h2, $(WARMELT_BASE))
-WARMELT_BASEH2SO= $(patsubst %, %-h2.so, $(WARMELT_BASE))
-WARMELT_BASEH2DSO= $(patsubst %, %-h2.d.so, $(WARMELT_BASE))
+WARMELT_BASEH2SO= $(patsubst %, %-h2.so, $(WARMELT_REST))
+WARMELT_BASEH2DSO= warmelt-first-h2.so $(patsubst %, %-h2.d.so, $(WARMELT_BASE))
 WARMELT_BASEH2C= $(patsubst %, %-h2.c, $(WARMELT_BASE))
 WARMELT_BASEH2ROW:=$(shell echo $(WARMELT_BASEH2)|sed 's/ /:/g')
 ##