2010-06-17 Basile Starynkevitch <basile@starynkevitch.net>

	    Jeremie Salvucci  <jeremie.salvucci@free.fr>
	* gcc/melt-runtime.c (compile_gencsrc_to_binmodule):
	in MELT_IS_PLUGIN variant, removed extra parenthesis.
	* gcc/melt-runtime.h (melt_make_raw_object):
	in MELT_IS_PLUGIN variant, added a third ignored argument.

2010-06-17  Basile Starynkevitch  <basile@starynkevitch.net>
	    Jeremie Salvucci  <jeremie.salvucci@free.fr>
	* contrib/build-melt-plugin.sh: added -C argument.



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

5 files changed, 20 insertions, 5 deletions

diff --git a/contrib/ChangeLog.MELT b/contrib/ChangeLog.MELT
index f2c3b64e501..be790643ab2 100644
--- a/contrib/ChangeLog.MELT
+++ b/contrib/ChangeLog.MELT
@@ -1,3 +1,6 @@
+2010-06-17  Basile Starynkevitch  <basile@starynkevitch.net>
+	    Jeremie Salvucci  <jeremie.salvucci@free.fr>
+	* build-melt-plugin.sh: added -C argument.
 
 2010-06-15  Basile Starynkevitch  <basile@starynkevitch.net>
 	* build-melt-plugin.sh: Protect every if test with double-quotes.
diff --git a/contrib/build-melt-plugin.sh b/contrib/build-melt-plugin.sh
index 55a44ffdf02..2126591e3b8 100644
--- a/contrib/build-melt-plugin.sh
+++ b/contrib/build-melt-plugin.sh
@@ -102,15 +102,19 @@ verbose_sleep() {
 }
 ################ parsing the shell program argument
 parse_args() {
-    while getopts "hqs:S:B:Y:M:" opt ; do
+    while getopts "hqs:S:B:Y:M:C:" opt ; do
 	echo debugMELT opt= $opt OPTARG= $OPTARG
 	case $opt in
 	    h) usage;;
 	    q) quiet=1;;
 	    s) 
 		verbose_echo Evaluating $OPTARG;
-		eval $OPTARG
+		eval "$OPTARG"
 		;;
+           C) HOSTCFLAGS+=" $OPTARG"
+              HOSTMELTCFLAGS+=" $OPTARG"
+               verbose_echo using $OPTARG as host and melt compiler flags
+               ;;
 	    S) GCC_SOURCE_TREE=$($REALPATH "$OPTARG");
 		verbose_echo GCC source tree is $GCC_SOURCE_TREE
 		;;
diff --git a/gcc/ChangeLog.MELT b/gcc/ChangeLog.MELT
index a0493c40520..ca475d95472 100644
--- a/gcc/ChangeLog.MELT
+++ b/gcc/ChangeLog.MELT
@@ -1,3 +1,9 @@
+2010-06-17  Basile Starynkevitch  <basile@starynkevitch.net>
+	    Jeremie Salvucci  <jeremie.salvucci@free.fr>
+	* melt-runtime.c (compile_gencsrc_to_binmodule):
+	in MELT_IS_PLUGIN variant, removed extra parenthesis.
+	* melt-runtime.h (melt_make_raw_object):
+	in MELT_IS_PLUGIN variant, added a third ignored argument.
 
 2010-06-16  Basile Starynkevitch  <basile@starynkevitch.net>
 	* melt/warmelt-outobj.melt: added translatedebug mode.
diff --git a/gcc/melt-runtime.c b/gcc/melt-runtime.c
index cfab10c9e03..4d1a3f8bf88 100644
--- a/gcc/melt-runtime.c
+++ b/gcc/melt-runtime.c
@@ -5399,7 +5399,7 @@ compile_gencsrc_to_binmodule (const char *srcfile, const char *binfile, const ch
       warning (0, "escaped character[s] in MELT module makefile %s", ourmakefile);
     obstack_1grow (&cmd_obstack, ' ');
     /* add the -C workdir argument if workdir is not the current directory */
-    if (workdir && strcmp(workdir, ".") && strcmp(workdir, mycwd))) {
+    if (workdir && strcmp(workdir, ".") && strcmp(workdir, mycwd)) {
       debugeprintf ("compile_gencsrc_to_binmodule dochdir in workdir %s", workdir);
       obstack_grow0 (&cmd_obstack, MAKECHDIR_ARG, strlen (MAKECHDIR_ARG));
       obstack_1grow (&cmd_obstack, ' ');
diff --git a/gcc/melt-runtime.h b/gcc/melt-runtime.h
index beab7592daa..d29280b911b 100644
--- a/gcc/melt-runtime.h
+++ b/gcc/melt-runtime.h
@@ -1858,7 +1858,8 @@ melt_make_raw_object(melt_ptr_t klas, int len, const char*clanam) {
 #define melt_putfield_object(Obj,Off,Val,Fldnam) do {		\
 ((meltobject_ptr_t)(Obj))->obj_vartab[Off] = (melt_ptr_t)(Val);	\
 }while(0)
-#define melt_make_raw_object(Klas,Len) ((melt_ptr_t)meltgc_new_raw_object(Klas,Len))
+#define melt_make_raw_object(Klas,Len,Clanam) \
+  ((melt_ptr_t)meltgc_new_raw_object((meltobject_ptr_t)(Klas),Len))
 #define melt_raw_object_create(Newobj,Klas,Len,Clanam) do { \
   Newobj = melt_make_raw_object(Klas,Len,Clanam); } while(0)
 #endif
@@ -3256,7 +3257,7 @@ melt_output_cfile_decl_impl(melt_ptr_t cfilnam, melt_ptr_t declbuf, melt_ptr_t i
   melt_output_cfile_decl_impl_secondary (cfilnam, declbuf, implbuf, 0);
 }
 
-
+#ifdef ENABLE_CHECKING
 static inline void
 debugeputs_at (const char *fil, int lin, const char *msg)
 {
@@ -3264,6 +3265,7 @@ debugeputs_at (const char *fil, int lin, const char *msg)
 }
 
 #define debugeputs(Msg) debugeputs_at(__FILE__,__LINE__,(Msg))
+#endif /* ENABLE_CHECKING */
 
 static inline void
 debugvalue_at (const char *fil, int lin, const char *msg, void *val)