This commit is contained in:
Jakub Jelinek 2010-01-21 17:17:27 +00:00
parent 09bfdb61b5
commit 85d822a98d
4 changed files with 52 additions and 6 deletions

View File

@ -1,2 +1,2 @@
fastjar-0.97.tar.gz
gcc-4.4.2-20100121.tar.bz2
gcc-4.4.3-20100121.tar.bz2

View File

@ -1,9 +1,9 @@
%global DATE 20100121
%global SVNREV 156110
%global gcc_version 4.4.2
%global SVNREV 156157
%global gcc_version 4.4.3
# Note, gcc_release must be integer, if you want to add suffixes to
# %{release}, append them after %{gcc_release} on Release: line.
%global gcc_release 28
%global gcc_release 1
%global _unpackaged_files_terminate_build 0
%global multilib_64_archs sparc64 ppc64 s390x x86_64
%if 0%{?fedora} >= 13
@ -166,6 +166,7 @@ Patch17: gcc44-pr38757.patch
Patch18: gcc44-libstdc++-docs.patch
Patch19: gcc44-ppc64-aixdesc.patch
Patch20: gcc44-max-vartrack-size.patch
Patch21: gcc44-vta-non-call-exception.patch
Patch1000: fastjar-0.97-segfault.patch
Patch1001: fastjar-0.97-len1.patch
@ -475,6 +476,7 @@ which are required to compile with the GNAT.
%endif
%patch19 -p0 -b .ppc64-aixdesc~
%patch20 -p0 -b .max-vartrack-size~
%patch21 -p0 -b .vta-non-call-exception~
# This testcase doesn't compile.
rm libjava/testsuite/libjava.lang/PR35020*
@ -488,7 +490,7 @@ tar xzf %{SOURCE4}
tar xjf %{SOURCE10}
%endif
sed -i -e 's/4\.4\.3/4.4.2/' gcc/BASE-VER
sed -i -e 's/4\.4\.4/4.4.3/' gcc/BASE-VER
echo 'Red Hat %{version}-%{gcc_release}' > gcc/DEV-PHASE
# Default to -gdwarf-3 rather than -gdwarf-2
@ -1864,6 +1866,12 @@ fi
%doc rpm.doc/changelogs/libmudflap/ChangeLog*
%changelog
* Thu Jan 21 2010 Jakub Jelinek <jakub@redhat.com> 4.4.3-1
- update from gcc-4_4-branch
- GCC 4.4.3 release
- don't insert DEBUG_STMTs after stmts that can throw, instead insert them
at the start of the next bb
* Thu Jan 21 2010 Jakub Jelinek <jakub@redhat.com> 4.4.2-28
- update from gcc-4_4-branch
- PRs middle-end/42803, rtl-optimization/42691, target/42542, target/42774,

View File

@ -0,0 +1,38 @@
2010-01-21 Jakub Jelinek <jakub@redhat.com>
* tree-into-ssa.c (maybe_register_def): If stmt ends the bb,
insert the debug stmt on the single non-EH edge from the stmt.
--- gcc/tree-into-ssa.c.jj 2010-01-21 09:58:38.000000000 +0100
+++ gcc/tree-into-ssa.c 2010-01-21 12:25:22.000000000 +0100
@@ -1968,7 +1968,29 @@ maybe_register_def (def_operand_p def_p,
if (tracked_var)
{
gimple note = gimple_build_debug_bind (tracked_var, def, stmt);
- gsi_insert_after (&gsi, note, GSI_SAME_STMT);
+ if (gsi_one_before_end_p (gsi) && stmt_ends_bb_p (stmt))
+ {
+ basic_block bb = gsi_bb (gsi);
+ edge_iterator ei;
+ edge e, ef = NULL;
+ FOR_EACH_EDGE (e, ei, bb->succs)
+ if (!(e->flags & EDGE_EH))
+ {
+ if (ef)
+ {
+ ef = NULL;
+ break;
+ }
+ ef = e;
+ }
+ if (ef
+ && single_pred_p (ef->dest)
+ && !phi_nodes (ef->dest)
+ && ef->dest != EXIT_BLOCK_PTR)
+ gsi_insert_on_edge_immediate (ef, note);
+ }
+ else
+ gsi_insert_after (&gsi, note, GSI_SAME_STMT);
}
}

View File

@ -1,2 +1,2 @@
2659f09c2e43ef8b7d4406321753f1b2 fastjar-0.97.tar.gz
1fc0974db5ab4002de6dcfd601da6b22 gcc-4.4.2-20100121.tar.bz2
6583a7c9552f341f1fc386e31e580d42 gcc-4.4.3-20100121.tar.bz2