2008-04-25 Tobias Burnus <burnus@net-b.de>

            Daniel Franke <franke.daniel@gmail.com>

	PR fortran/35156
        * gfortranspec.c (lang_specific_driver): Deprecate
        -M option; fix ICE when "-M" is last argument and
        make "-M<dir>" work.
        * options.c (gfc_handle_module_path_options):
        Use -J instead of -M in error messages.
        * invoke.texi: Mark -M as depecated.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@134680 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 3 insertions, 7 deletions

diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c
index 06a462205b41..a1020bf35d48 100644
--- a/gcc/fortran/options.c
+++ b/gcc/fortran/options.c
@@ -391,10 +391,7 @@ gfc_handle_module_path_options (const char *arg)
 {
 
   if (gfc_option.module_dir != NULL)
-    gfc_fatal_error ("gfortran: Only one -M option allowed");
-
-  if (arg == NULL)
-    gfc_fatal_error ("gfortran: Directory required after -M");
+    gfc_fatal_error ("gfortran: Only one -J option allowed");
 
   gfc_option.module_dir = (char *) gfc_getmem (strlen (arg) + 2);
   strcpy (gfc_option.module_dir, arg);
@@ -718,14 +715,13 @@ gfc_handle_option (size_t scode, const char *arg, int value)
       break;
 
     case OPT_J:
-    case OPT_M:
       gfc_handle_module_path_options (arg);
       break;
-    
+
     case OPT_fsign_zero:
       gfc_option.flag_sign_zero = value;
       break;
-    
+
     case OPT_ffpe_trap_:
       gfc_handle_fpe_trap_option (arg);
       break;