[gfortran] Remoce -fg77-calls

Paul Brook paul@codesourcery.com
Sun Apr 4 21:55:00 GMT 2004


The patch below removes the last traces of -fg77-calls. This has been broken 
and inactive for some time.

Tested on i606-linux.
Applied to tree-ssa branch.

Paul

2004-04-04  Paul Brook  <paul@codesourcery.com>

	* gfortran.h (struct gfc_option_t): Remove flag_g77_calls.
	* options.c (gfc_init.options, gfc_handle_option): Ditto.
	* trans-expr.c (gfc_conv_function_call): Ditto.
	* trans-types.c (gfc_is_nodesc_array): Ditto
	* lang.opt (fg77-calls): Remove.
testsuite
	* lib/fortran-torture.exp (TORTURE_OPTIONS): Remove -fg77-calls.

Index: fortran/gfortran.h
===================================================================
RCS file: /var/cvsroot/gcc-cvs/gcc/gcc/fortran/Attic/gfortran.h,v
retrieving revision 1.1.2.10
diff -u -p -r1.1.2.10 gfortran.h
--- a/fortran/gfortran.h	11 Jan 2004 15:21:50 -0000	1.1.2.10
+++ b/fortran/gfortran.h	4 Apr 2004 15:10:03 -0000
@@ -1223,7 +1223,6 @@ typedef struct
   int warn_unused_labels;
 
   int flag_dollar_ok;
-  int flag_g77_calls;
   int flag_underscoring;
   int flag_second_underscore;
   int flag_implicit_none;
Index: fortran/lang.opt
===================================================================
RCS file: /var/cvsroot/gcc-cvs/gcc/gcc/fortran/Attic/lang.opt,v
retrieving revision 1.1.2.7
diff -u -p -r1.1.2.7 lang.opt
--- a/fortran/lang.opt	11 Jan 2004 15:21:50 -0000	1.1.2.7
+++ b/fortran/lang.opt	4 Apr 2004 15:15:27 -0000
@@ -81,10 +81,6 @@ ffree-form
 F95
 Assume that the source file is free form
 
-fg77-calls
-F95
-Generate g77-compatible calls
-
 funderscoring
 F95
 Append underscores to externally visible names
Index: fortran/options.c
===================================================================
RCS file: /var/cvsroot/gcc-cvs/gcc/gcc/fortran/Attic/options.c,v
retrieving revision 1.1.2.10
diff -u -p -r1.1.2.10 options.c
--- a/fortran/options.c	11 Jan 2004 15:21:50 -0000	1.1.2.10
+++ b/fortran/options.c	4 Apr 2004 15:10:21 -0000
@@ -59,7 +59,6 @@ gfc_init_options (unsigned int argc ATTR
   gfc_option.warn_unused_labels = 0;
 
   gfc_option.flag_dollar_ok = 0;
-  gfc_option.flag_g77_calls = 1;
   gfc_option.flag_underscoring = 1;
   gfc_option.flag_second_underscore = 1;
   gfc_option.flag_implicit_none = 0;
@@ -222,11 +221,6 @@ gfc_handle_option (size_t scode, const c
       gfc_option.source_form = FORM_FREE;
       break;
 
-    case OPT_fg77_calls:
-      /*TODO: the non-g77 calling convention is broken beyond hope.  */
-      /*gfc_option.flag_g77_calls = value;*/
-      break;
-
     case OPT_funderscoring:
       gfc_option.flag_underscoring = value;
       break;
Index: fortran/trans-expr.c
===================================================================
RCS file: /var/cvsroot/gcc-cvs/gcc/gcc/fortran/Attic/trans-expr.c,v
retrieving revision 1.1.2.19
diff -u -p -r1.1.2.19 trans-expr.c
--- a/fortran/trans-expr.c	16 Feb 2004 12:36:08 -0000	1.1.2.19
+++ b/fortran/trans-expr.c	4 Apr 2004 15:11:48 -0000
@@ -945,7 +945,6 @@ gfc_conv_function_call (gfc_se * se, gfc
   tree type;
   tree var;
   tree len;
-  int g77;
   tree stringargs;
   gfc_formal_arglist *formal;
 
@@ -1016,8 +1015,6 @@ gfc_conv_function_call (gfc_se * se, gfc
     }
 
   formal = sym->formal;
-  /* Use g77 calling convention if neccessary.  */
-  g77 = (gfc_option.flag_g77_calls);
   /* Evaluate the arguments.  */
   for (; arg != NULL; arg = arg->next, formal = formal ? formal->next : NULL)
     {
@@ -1080,7 +1077,7 @@ gfc_conv_function_call (gfc_se * se, gfc
 	      f = (formal != NULL)
 		  && !formal->sym->attr.pointer
 		  && formal->sym->as->type != AS_ASSUMED_SHAPE;
-	      f = g77 && (f || !sym->attr.always_explicit);
+	      f = f || !sym->attr.always_explicit;
 	      gfc_conv_array_parameter (&parmse, arg->expr, argss, f);
 	    } 
 	}
Index: fortran/trans-types.c
===================================================================
RCS file: /var/cvsroot/gcc-cvs/gcc/gcc/fortran/Attic/trans-types.c,v
retrieving revision 1.1.2.12
diff -u -p -r1.1.2.12 trans-types.c
--- a/fortran/trans-types.c	4 Apr 2004 11:50:00 -0000	1.1.2.12
+++ b/fortran/trans-types.c	4 Apr 2004 15:12:08 -0000
@@ -465,7 +465,7 @@ gfc_is_nodesc_array (gfc_symbol * sym)
 
   if (sym->attr.dummy)
     {
-      if (gfc_option.flag_g77_calls && sym->as->type != AS_ASSUMED_SHAPE)
+      if (sym->as->type != AS_ASSUMED_SHAPE)
         return 1;
       else
         return 0;
Index: testsuite/lib/fortran-torture.exp
===================================================================
RCS 
file: /var/cvsroot/gcc-cvs/gcc/gcc/testsuite/lib/Attic/fortran-torture.exp,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 fortran-torture.exp
--- a/testsuite/lib/fortran-torture.exp	26 Jul 2003 16:27:50 -0000	1.1.2.1
+++ b/testsuite/lib/fortran-torture.exp	4 Apr 2004 15:19:00 -0000
@@ -36,7 +36,6 @@ if ![info exists TORTURE_OPTIONS] {
 	{ -O2 -fomit-frame-pointer -finline-functions -funroll-loops } \
 	{ -O2 -fomit-frame-pointer -finline-functions -funroll-all-loops } \
 	{ -O2 -fno-repack-arrays } \
-	{ -O2 -fg77-calls } \
 	{ -O3 -g } \
 	{ -Os }]
 }



More information about the Fortran mailing list