Remove unused variables and procedures.

Remove unused variables and procedures (and remove build
warning clutter).

gcc/m2/ChangeLog:

	* gm2-compiler/M2Preprocess.mod (BaseName): Comment out.
	* gm2-lang.cc (opt): Remove.
	* gm2spec.cc (add_include): Remove.
	(full_libraries): Remove.
	(concat_option): Remove.

Signed-off-by: Gaius Mulley <gaiusmod2@gmail.com>

diff --git a/gcc/m2/gm2-compiler/M2Preprocess.mod b/gcc/m2/gm2-compiler/M2Preprocess.mod
index d63db35f93898dcc1e61e3ff11074851227620d9..d53228b4675288fb1d14db341baed38409e8de2e 100644 (file)
--- a/gcc/m2/gm2-compiler/M2Preprocess.mod
+++ b/gcc/m2/gm2-compiler/M2Preprocess.mod
@@ -101,6 +101,7 @@ END GetFileName ;
    Return basename.
 *)
 
+(*
 PROCEDURE BaseName (Path: String) : String ;
 VAR
    ext,
@@ -120,6 +121,7 @@ BEGIN
    END ;
    RETURN Dup (Slice(Path, basename, ext))
 END BaseName ;
+*)
 
 (*
    MakeSaveTempsFileName - return a temporary file like 

diff --git a/gcc/m2/gm2-lang.cc b/gcc/m2/gm2-lang.cc
index 999c57c1cfa0d4fc40fff0447c795b2aa5d63ec1..d9b63bee655222b8799106f92adbeff6bb216933 100644 (file)
--- a/gcc/m2/gm2-lang.cc
+++ b/gcc/m2/gm2-lang.cc
@@ -330,7 +330,6 @@ gm2_langhook_handle_option (
   enum opt_code code = (enum opt_code)scode;
 
   const struct cl_option *option = &cl_options[scode];
-  const char *opt = (const char *)option->opt_text;
   /* ignore file names.  */
   if (code == N_OPTS)
     return 1;

diff --git a/gcc/m2/gm2spec.cc b/gcc/m2/gm2spec.cc
index bc93133243c427521fdeb6ad3fd2575c7af8e353..0645be9fe02fe3ab0521c7faa9d58c6e24e750bd 100644 (file)
--- a/gcc/m2/gm2spec.cc
+++ b/gcc/m2/gm2spec.cc
@@ -129,8 +129,6 @@ static const char *library_abbrev[maxlib]
    -flibs=m2pim,m2iso respectively.  This provides a match between
    the dialect of Modula-2 and the library set.  */
 
-static const char *add_include (const char *libpath, const char *library);
-
 static bool seen_scaffold_static = false;
 static bool seen_scaffold_dynamic = false;
 static bool seen_scaffold_main = false;
@@ -150,7 +148,6 @@ static void append_arg (const struct cl_decoded_option *);
 /* The new argument list will be built here.  */
 static unsigned int gm2_newargc;
 static struct cl_decoded_option *gm2_new_decoded_options;
-static const char *full_libraries = NULL;
 static const char *libraries = NULL;  /* Abbreviated libraries.  */
 
 
@@ -241,31 +238,6 @@ safe_strdup (const char *s)
   return NULL;
 }
 
-static char *
-concat_option (char *dest, const char *pre, const char *path, const char *post)
-{
-  if (dest == NULL)
-    {
-      dest = (char *) xmalloc (strlen (pre) + strlen (path) + strlen (post) + 1);
-      strcpy (dest, pre);
-      strcat (dest, path);
-      strcat (dest, post);
-      return dest;
-    }
-  else
-    {
-      char *result = (char *) xmalloc (strlen (dest) + strlen (pre)
-                                      + strlen (path) + strlen (post) + 1 + 1);
-      strcpy (result, dest);
-      strcat (result, " ");
-      strcat (result, pre);
-      strcat (result, path);
-      strcat (result, post);
-      free (dest);
-      return result;
-    }
-}
-
 /* add_default_libs adds the -l option which is derived from the
    libraries.  */