diff options
author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2013-04-06 06:42:30 +0000 |
---|---|---|
committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2013-04-06 06:42:30 +0000 |
commit | c0a67c903cf20c2c7d1ff8027ef016c81342ace6 (patch) | |
tree | 0b5ffa971dd9d933f729e5fab2393eaa9895d71b /debian | |
parent | 103a048039969254051c0f93f764369ee2ab4643 (diff) | |
download | gcc-47-c0a67c903cf20c2c7d1ff8027ef016c81342ace6.tar.gz |
gcc-4.7 (4.7.2-24) experimental; urgency=low
* Fix PR middle-end/56848, reverting the fix for PR middle-end/56077.
-- Matthias Klose <doko@ubuntu.com> Fri, 05 Apr 2013 19:56:11 +0200
git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.7@6661 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 6 | ||||
-rw-r--r-- | debian/patches/pr56848.diff | 28 | ||||
-rw-r--r-- | debian/rules.patch | 1 |
3 files changed, 35 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 56640b2..f831d7a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +gcc-4.7 (4.7.2-24) experimental; urgency=low + + * Fix PR middle-end/56848, reverting the fix for PR middle-end/56077. + + -- Matthias Klose <doko@ubuntu.com> Fri, 05 Apr 2013 19:56:11 +0200 + gcc-4.7 (4.7.2-23) experimental; urgency=low * Update to SVN 20130404 (r197476) from the gcc-4_7-branch (4.7.3 release diff --git a/debian/patches/pr56848.diff b/debian/patches/pr56848.diff new file mode 100644 index 0000000..6b3c345 --- /dev/null +++ b/debian/patches/pr56848.diff @@ -0,0 +1,28 @@ +# DP: Rervert the fix for PR middle-end/56077 + +2013-04-01 Andrey Belevantsev <abel@ispras.ru> + + Backport from mainline + 2013-02-25 Andrey Belevantsev <abel@ispras.ru> + Alexander Monakov <amonakov@ispras.ru> + + PR middle-end/56077 + * sched-deps.c (sched_analyze_insn): When reg_pending_barrier, + flush pending lists also on non-jumps. Adjust comment. + + +--- a/src/gcc/sched-deps.c ++++ b/src/gcc/sched-deps.c +@@ -3263,9 +3263,9 @@ + SET_REGNO_REG_SET (&deps->reg_last_in_use, i); + } + +- /* Don't flush pending lists on speculative checks for +- selective scheduling. */ +- if (!sel_sched_p () || !sel_insn_is_speculation_check (insn)) ++ /* Flush pending lists on jumps, but not on speculative checks. */ ++ if (JUMP_P (insn) && !(sel_sched_p () ++ && sel_insn_is_speculation_check (insn))) + flush_pending_lists (deps, insn, true, true); + + reg_pending_barrier = NOT_A_BARRIER; diff --git a/debian/rules.patch b/debian/rules.patch index 476c918..adbdf08 100644 --- a/debian/rules.patch +++ b/debian/rules.patch @@ -86,6 +86,7 @@ debian_patches += \ gcc-target-include-asm \ libgcc-backports \ ppl-version \ + pr56848 \ ifneq (,$(filter $(cloog_backend),ppl-0.11)) debian_patches += gcc-cloog-dl |