From: Gaius Mulley Date: Wed, 23 Nov 2022 14:50:34 +0000 (+0000) Subject: Definition files in m2/gm2-gcc changed to FOR "C" and plugin fix. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd4db553742f7acad03ca0b99bb521e52d7ff56b;p=thirdparty%2Fgcc.git 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 --- diff --git a/gcc/m2/gm2-gcc/init.def b/gcc/m2/gm2-gcc/init.def index 79348f9a99e3..5c52999ace4b 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 . *) -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 d4e2e1b94da5..e0c48d523d4e 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 . *) -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 6a2005aa293e..d995e2ba7c1c 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 . *) -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 039ad3bdf2b5..e91c1e6e4922 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 . *) -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 3d6f9031c760..c32d3811e601 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 . *) -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 b1a108521e79..9accb389a179 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 . *) -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 ceeb5582c32b..774d772cd7f6 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 . *) -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 7e05f9451da3..ec36db31ab86 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 . *) -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 e96b226cb35b..4e2c6c80008f 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 . *) -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 2576d4baa0eb..dc617ecd46c0 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 . *) -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 3148746e1dbe..680dd3602ef7 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;