X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=gcc%2Ffortran%2Foptions.c;h=48df6746d2d817fd09f536ea74695c6fea76af91;hp=8e8d6a889e017b267e55a09cca5648938e9b6bfe;hb=7f2e183b3f69bc689f579acf304ab76a8627d6af;hpb=0fda8d07cce16d3f79156514c5d24a671760c74e

diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c
index 8e8d6a889e0..48df6746d2d 100644
--- a/gcc/fortran/options.c
+++ b/gcc/fortran/options.c
@@ -87,7 +87,7 @@ gfc_init_options (unsigned int argc ATTRIBUTE_UNUSED,
 
   gfc_option.warn_nonstd_intrinsics = 0;
 
-  return CL_F95;
+  return CL_Fortran;
 }
 
 
@@ -223,6 +223,10 @@ gfc_post_options (const char **pfilename)
   if (gfc_option.flag_second_underscore == -1)
     gfc_option.flag_second_underscore = gfc_option.flag_f2c;
 
+  /* Implement -fno-automatic as -fmax-stack-var-size=0.  */
+  if (!gfc_option.flag_automatic)
+    gfc_option.flag_max_stack_var_size = 0;
+
   return false;
 }