From de37af8c4e5327db905d6ef77b77a9f26765f392 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Schl=C3=BCter?=
 <tobias.schlueter@physik.uni-muenchen.de>
Date: Tue, 24 Aug 2004 18:58:33 +0200
Subject: [PATCH] resolve.c (merge_argument_lists): Revert unintentionally
 committed change.

* resolve.c (merge_argument_lists): Revert unintentionally
committed change.

From-SVN: r86498
---
 gcc/fortran/ChangeLog | 5 +++++
 gcc/fortran/resolve.c | 4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index da0257291a2a..1c95c96f1a27 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-24  Tobias Schlueter  <tobias.schlueter@physik.uni-muenchen.de>
+
+	* resolve.c (merge_argument_lists): Revert unintentionally 
+	committed change.
+	
 2004-08-24  Tobias Schlueter  <tobias.schlueter@physik.uni-muenchen.de>
 
 	* trans-decl.c (build_function_decl): Fix spelling in comment.
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 31c3bf4f2cfa..22d747c092d9 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -312,10 +312,6 @@ merge_argument_lists (gfc_symbol *proc, gfc_formal_arglist *new_args)
       /* Add a new argument.  Argument order is not important.  */
       new_arglist = gfc_get_formal_arglist ();
       new_arglist->sym = new_sym;
-      /* We mark all arguments as optional, since in the common case
-	 only a subset of the arguments will be present. This avoids
-	 having to special case arguments of master functions later on.  */
-      new_arglist->sym->attr.optional = 1;
       new_arglist->next = proc->formal;
       proc->formal  = new_arglist;
     }
-- 
GitLab