diff --git a/gcc/m2/gm2-compiler/M2Options.def b/gcc/m2/gm2-compiler/M2Options.def
index b6dc1f7f51f..f7dcb3d6fff 100644
--- a/gcc/m2/gm2-compiler/M2Options.def
+++ b/gcc/m2/gm2-compiler/M2Options.def
@@ -36,7 +36,7 @@ FROM m2linemap IMPORT location_t ;
 
 EXPORT QUALIFIED SetReturnCheck, SetNilCheck, SetCaseCheck,
                  SetCheckAll, SetVerboseUnbounded, SetQuiet, SetCpp, GetCpp,
-                 SetMakeall, SetMakeall0, SetIncludePath, SetAutoInit,
+                 (* SetMakeall, SetMakeall0, SetIncludePath, *) SetAutoInit,
                  SetUnboundedByReference,
                  SetSearchPath, SetISO, SetPIM, SetPIM2, SetPIM3, SetPIM4,
                  SetPositiveModFloor, SetCompilerDebugging, SetExceptions,
@@ -264,23 +264,23 @@ PROCEDURE SetLowerCaseKeywords (value: BOOLEAN) : BOOLEAN ;
 
 (*
    SetMakeall -
-*)
 
 PROCEDURE SetMakeall (value: BOOLEAN) : BOOLEAN ;
+*)
 
 
 (*
    SetMakeall0 -
-*)
 
 PROCEDURE SetMakeall0 (value: BOOLEAN) : BOOLEAN ;
+*)
 
 
 (*
    SetIncludePath -
-*)
 
 PROCEDURE SetIncludePath (arg: ADDRESS) : BOOLEAN ;
+*)
 
 
 (*
diff --git a/gcc/m2/gm2-compiler/M2Options.mod b/gcc/m2/gm2-compiler/M2Options.mod
index a26435d9d1f..36d7e3f488f 100644
--- a/gcc/m2/gm2-compiler/M2Options.mod
+++ b/gcc/m2/gm2-compiler/M2Options.mod
@@ -426,34 +426,34 @@ END SetVerbose ;
 
 (*
    SetMakeall -
-*)
 
 PROCEDURE SetMakeall (value: BOOLEAN) : BOOLEAN ;
 BEGIN
    (* value is unused *)
    RETURN( TRUE )
 END SetMakeall ;
+*)
 
 
 (*
    SetMakeall0 -
-*)
 
 PROCEDURE SetMakeall0 (value: BOOLEAN) : BOOLEAN ;
 BEGIN
    (* value is unused *)
    RETURN( TRUE )
 END SetMakeall0 ;
+*)
 
 
 (*
    SetIncludePath -
-*)
 
 PROCEDURE SetIncludePath (arg: ADDRESS) : BOOLEAN ;
 BEGIN
    RETURN( TRUE )
 END SetIncludePath ;
+*)
 
 
 (*
@@ -987,11 +987,11 @@ END SetWholeValueCheck ;
 
 PROCEDURE SetWall (value: BOOLEAN) ;
 BEGIN
-   UnusedVariableChecking  := TRUE ;
-   UnusedParameterChecking := TRUE ;
-   PedanticCast := TRUE ;
-   PedanticParamNames := TRUE ;
-   StudentChecking := TRUE
+   UnusedVariableChecking  := value ;
+   UnusedParameterChecking := value ;
+   PedanticCast := value ;
+   PedanticParamNames := value ;
+   StudentChecking := value
 END SetWall ;
 
 
diff --git a/gcc/m2/gm2-libs/SArgs.mod b/gcc/m2/gm2-libs/SArgs.mod
index 10c06f7dce0..3f8bcaebd45 100644
--- a/gcc/m2/gm2-libs/SArgs.mod
+++ b/gcc/m2/gm2-libs/SArgs.mod
@@ -64,7 +64,7 @@ BEGIN
    IF i < ArgC
    THEN
       (* ppc := ADDRESS (VAL (PtrToPtrToChar, ArgV) + (i * CARDINAL (TSIZE(PtrToChar)))) ; *)
-      ppc := ADDRESS (ArgV + (i*TSIZE(PtrToChar))) ;
+      ppc := ADDRESS (PtrToChar (ArgV) + (i * TSIZE (PtrToChar))) ;
       s   := InitStringCharStar (ppc^) ;
 
       RETURN TRUE
diff --git a/gm2tools/Makefile.in b/gm2tools/Makefile.in
index 386f2e4163a..d228a6a9b39 100644
--- a/gm2tools/Makefile.in
+++ b/gm2tools/Makefile.in
@@ -639,8 +639,8 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-@NATIVE_FALSE@uninstall-local:
 @NATIVE_FALSE@install-exec-local:
+@NATIVE_FALSE@uninstall-local:
 clean: clean-am
 
 clean-am: clean-binPROGRAMS clean-generic mostlyclean-am