Definition files in m2/gm2-gcc changed to FOR "C" and plugin fix.

gcc/m2/ChangeLog:

	* gm2-gcc/init.def: Change to DEFINITION FOR "C".
	* gm2-gcc/m2block.def: Change to DEFINITION FOR "C".
	* gm2-gcc/m2builtins.def: Change to DEFINITION FOR "C".
	* gm2-gcc/m2convert.def: Change to DEFINITION FOR "C".
	* gm2-gcc/m2except.def: Change to DEFINITION FOR "C".
	* gm2-gcc/m2misc.def: Change to DEFINITION FOR "C".
	* gm2-gcc/m2statement.def: Change to DEFINITION FOR "C".
	* gm2-gcc/m2top.def: Change to DEFINITION FOR "C".
	* gm2-gcc/m2tree.def: Change to DEFINITION FOR "C".
	* gm2-gcc/m2type.def: Change to DEFINITION FOR "C".
	* m2/gm2spec.cc: Generate an error if the user requests
	the m2-plugin when plugins were disabled during
	the build.

Signed-off-by: Gaius Mulley <gaius.mulley@southwales.ac.uk>

diff --git a/gcc/m2/gm2-gcc/init.def b/gcc/m2/gm2-gcc/init.def
index 79348f9a99e38f46a63d6a3c27105a21575d6165..5c52999ace4b51e53fdc670d8de0388fc68cf130 100644 (file)
--- a/gcc/m2/gm2-gcc/init.def
+++ b/gcc/m2/gm2-gcc/init.def
@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Modula-2; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  *)
 
-DEFINITION MODULE init ;
+DEFINITION MODULE FOR "C" init ;
 
 FROM SYSTEM IMPORT ADDRESS ;
 

diff --git a/gcc/m2/gm2-gcc/m2block.def b/gcc/m2/gm2-gcc/m2block.def
index d4e2e1b94da5ec37a6fed7f1cc5433fd06212425..e0c48d523d4e5475da0297b97af9459053647a2c 100644 (file)
--- a/gcc/m2/gm2-gcc/m2block.def
+++ b/gcc/m2/gm2-gcc/m2block.def
@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Modula-2; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  *)
 
-DEFINITION MODULE m2block ;
+DEFINITION MODULE FOR "C" m2block ;
 
 
 FROM m2tree IMPORT Tree ;

diff --git a/gcc/m2/gm2-gcc/m2builtins.def b/gcc/m2/gm2-gcc/m2builtins.def
index 6a2005aa293eaecc9bf7f3219660e579ff4d33ae..d995e2ba7c1c568fdc96b95988e67cf431e6ab7c 100644 (file)
--- a/gcc/m2/gm2-gcc/m2builtins.def
+++ b/gcc/m2/gm2-gcc/m2builtins.def
@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Modula-2; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  *)
 
-DEFINITION MODULE m2builtins ;
+DEFINITION MODULE FOR "C" m2builtins ;
 
 FROM SYSTEM IMPORT ADDRESS ;
 FROM m2tree IMPORT Tree ;

diff --git a/gcc/m2/gm2-gcc/m2convert.def b/gcc/m2/gm2-gcc/m2convert.def
index 039ad3bdf2b5cc51580f88c48655f7c53b2c4c81..e91c1e6e492247e09d45e970d489904653a1348c 100644 (file)
--- a/gcc/m2/gm2-gcc/m2convert.def
+++ b/gcc/m2/gm2-gcc/m2convert.def
@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Modula-2; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  *)
 
-DEFINITION MODULE m2convert ;
+DEFINITION MODULE FOR "C" m2convert ;
 
 FROM m2tree IMPORT Tree ;
 FROM m2linemap IMPORT location_t ;

diff --git a/gcc/m2/gm2-gcc/m2except.def b/gcc/m2/gm2-gcc/m2except.def
index 3d6f9031c760126b66daf4ae2489a55218abb426..c32d3811e6018dd7e8aea081d4d5c88b6deb9f00 100644 (file)
--- a/gcc/m2/gm2-gcc/m2except.def
+++ b/gcc/m2/gm2-gcc/m2except.def
@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Modula-2; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  *)
 
-DEFINITION MODULE m2except ;
+DEFINITION MODULE FOR "C" m2except ;
 
 FROM m2tree IMPORT Tree ;
 FROM m2linemap IMPORT location_t ;

diff --git a/gcc/m2/gm2-gcc/m2misc.def b/gcc/m2/gm2-gcc/m2misc.def
index b1a108521e7921e46add30027dc3b0b73cd07c3c..9accb389a179a1df627f40b5a81b30a5c45c3476 100644 (file)
--- a/gcc/m2/gm2-gcc/m2misc.def
+++ b/gcc/m2/gm2-gcc/m2misc.def
@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Modula-2; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  *)
 
-DEFINITION MODULE m2misc ;
+DEFINITION MODULE FOR "C" m2misc ;
 
 FROM m2tree IMPORT Tree ;
 

diff --git a/gcc/m2/gm2-gcc/m2statement.def b/gcc/m2/gm2-gcc/m2statement.def
index ceeb5582c32ba102647e161af3926a90a78bdb07..774d772cd7f6d85195e27ddfe6306927b31fb11e 100644 (file)
--- a/gcc/m2/gm2-gcc/m2statement.def
+++ b/gcc/m2/gm2-gcc/m2statement.def
@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Modula-2; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  *)
 
-DEFINITION MODULE m2statement ;
+DEFINITION MODULE FOR "C" m2statement ;
 
 
 FROM SYSTEM IMPORT ADDRESS ;

diff --git a/gcc/m2/gm2-gcc/m2top.def b/gcc/m2/gm2-gcc/m2top.def
index 7e05f9451da3c735cbc34c52e9fe37c936eb8b2a..ec36db31ab86895813511a969dcd08cbb5ed4584 100644 (file)
--- a/gcc/m2/gm2-gcc/m2top.def
+++ b/gcc/m2/gm2-gcc/m2top.def
@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Modula-2; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  *)
 
-DEFINITION MODULE m2top ;
+DEFINITION MODULE FOR "C" m2top ;
 
 
 (*

diff --git a/gcc/m2/gm2-gcc/m2tree.def b/gcc/m2/gm2-gcc/m2tree.def
index e96b226cb35b137ec5cc1cb6d218021d31b0e7f8..4e2c6c80008f901b96b5fcb41024f5cdd7043a75 100644 (file)
--- a/gcc/m2/gm2-gcc/m2tree.def
+++ b/gcc/m2/gm2-gcc/m2tree.def
@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Modula-2; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  *)
 
-DEFINITION MODULE m2tree ;
+DEFINITION MODULE FOR "C" m2tree ;
 
 FROM SYSTEM IMPORT ADDRESS ;
 

diff --git a/gcc/m2/gm2-gcc/m2type.def b/gcc/m2/gm2-gcc/m2type.def
index 2576d4baa0eb7170665f18f333211be2f49b581a..dc617ecd46c0d66b9167fb066c8883b9c6f26e8f 100644 (file)
--- a/gcc/m2/gm2-gcc/m2type.def
+++ b/gcc/m2/gm2-gcc/m2type.def
@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Modula-2; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  *)
 
-DEFINITION MODULE m2type ;
+DEFINITION MODULE FOR "C" m2type ;
 
 FROM SYSTEM IMPORT ADDRESS ;
 FROM m2tree IMPORT Tree ;

diff --git a/gcc/m2/gm2spec.cc b/gcc/m2/gm2spec.cc
index 3148746e1dbe5b4076407c592d1277434cb812c2..680dd3602ef706ed9cf2ea331468de3e753e3296 100644 (file)
--- a/gcc/m2/gm2spec.cc
+++ b/gcc/m2/gm2spec.cc
@@ -610,8 +610,12 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options,
   /* The number of libraries added in.  */
   int added_libraries;
 
+#ifdef ENABLE_PLUGIN
   /* True if we should add -fplugin=m2rte to the command-line.  */
   bool need_plugin = true;
+#else
+  bool need_plugin = false;
+#endif
 
   /* True if we should set up include paths and library paths.  */
   bool allow_libraries = true;
@@ -674,6 +678,11 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options,
           break;
         case OPT_fm2_plugin:
           need_plugin = decoded_options[i].value;
+#ifndef ENABLE_PLUGIN
+         if (need_plugin)
+           error ("plugin support is disabled; configure with "
+                  "%<--enable-plugin%>");
+#endif
           break;
        case OPT_fscaffold_dynamic:
          seen_scaffold_dynamic = true;