rpms/gcc/devel gcc41-fortran-merge-glitch.patch, NONE, 1.1 gcc41.spec, 1.54, 1.55
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Apr 25 11:08:08 UTC 2006
Author: jakub
Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13288
Modified Files:
gcc41.spec
Added Files:
gcc41-fortran-merge-glitch.patch
Log Message:
4.1.0-11
gcc41-fortran-merge-glitch.patch:
trans-decl.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE gcc41-fortran-merge-glitch.patch ---
Fix a merge glitch.
--- gcc/fortran/trans-decl.c 2006-04-25 11:49:11.000000000 +0200
+++ gcc/fortran/trans-decl.c 2006-04-25 12:58:00.000000000 +0200
@@ -2504,7 +2504,8 @@ gfc_trans_deferred_vars (gfc_symbol * pr
/* An automatic character length, pointer array result. */
if (proc_sym->ts.type == BT_CHARACTER
&& TREE_CODE (proc_sym->ts.cl->backend_decl) == VAR_DECL)
- fnbody = gfc_trans_dummy_character (proc_sym->ts.cl, fnbody);
+ fnbody = gfc_trans_dummy_character (proc_sym, proc_sym->ts.cl,
+ fnbody);
}
else if (proc_sym->ts.type == BT_CHARACTER)
{
Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- gcc41.spec 25 Apr 2006 10:16:22 -0000 1.54
+++ gcc41.spec 25 Apr 2006 11:08:06 -0000 1.55
@@ -129,6 +129,7 @@
Patch32: gcc41-rh187450.patch
Patch33: gcc41-pr27236.patch
Patch34: gcc41-pr27285.patch
+Patch35: gcc41-fortran-merge-glitch.patch
%define _gnu %{nil}
%ifarch sparc
@@ -442,6 +443,7 @@
%patch32 -p0 -b .rh187450~
%patch33 -p0 -b .pr27236~
%patch34 -p0 -b .pr27285~
+%patch35 -p0 -b .fortran-merge-glitch~
sed -i -e 's/4\.1\.1/4.1.0/' gcc/BASE-VER gcc/version.c
sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
More information about the fedora-cvs-commits
mailing list