aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/fortran/ChangeLog5
-rw-r--r--gcc/fortran/resolve.c4
2 files changed, 5 insertions, 4 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index da02572..1c95c96 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,5 +1,10 @@
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.
(build_entry_thunks): Remove code with no function.
(gfc_build_intrinsic_function_decls): Remove empty line.
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 31c3bf4..22d747c 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;
}