public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc/devel/modula-2] Definition files in m2/gm2-gcc changed to FOR "C" and plugin fix.
@ 2022-11-23 14:51 Gaius Mulley
  0 siblings, 0 replies; only message in thread
From: Gaius Mulley @ 2022-11-23 14:51 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:fd4db553742f7acad03ca0b99bb521e52d7ff56b

commit fd4db553742f7acad03ca0b99bb521e52d7ff56b
Author: Gaius Mulley <gaius.mulley@southwales.ac.uk>
Date:   Wed Nov 23 14:50:34 2022 +0000

    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:
---
 gcc/m2/gm2-gcc/init.def        | 2 +-
 gcc/m2/gm2-gcc/m2block.def     | 2 +-
 gcc/m2/gm2-gcc/m2builtins.def  | 2 +-
 gcc/m2/gm2-gcc/m2convert.def   | 2 +-
 gcc/m2/gm2-gcc/m2except.def    | 2 +-
 gcc/m2/gm2-gcc/m2misc.def      | 2 +-
 gcc/m2/gm2-gcc/m2statement.def | 2 +-
 gcc/m2/gm2-gcc/m2top.def       | 2 +-
 gcc/m2/gm2-gcc/m2tree.def      | 2 +-
 gcc/m2/gm2-gcc/m2type.def      | 2 +-
 gcc/m2/gm2spec.cc              | 9 +++++++++
 11 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/gcc/m2/gm2-gcc/init.def b/gcc/m2/gm2-gcc/init.def
index 79348f9a99e..5c52999ace4 100644
--- 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 d4e2e1b94da..e0c48d523d4 100644
--- 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 6a2005aa293..d995e2ba7c1 100644
--- 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 039ad3bdf2b..e91c1e6e492 100644
--- 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 3d6f9031c76..c32d3811e60 100644
--- 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 b1a108521e7..9accb389a17 100644
--- 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 ceeb5582c32..774d772cd7f 100644
--- 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 7e05f9451da..ec36db31ab8 100644
--- 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 e96b226cb35..4e2c6c80008 100644
--- 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 2576d4baa0e..dc617ecd46c 100644
--- 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 3148746e1db..680dd3602ef 100644
--- 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;

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2022-11-23 14:51 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-23 14:51 [gcc/devel/modula-2] Definition files in m2/gm2-gcc changed to FOR "C" and plugin fix Gaius Mulley

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).