diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2016-01-12 16:26:09 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2016-01-12 16:26:09 +0000 |
| commit | 1a20f72ce30a190578f69ea818c7ea4d2f1fd173 (patch) | |
| tree | 263ba450a1e1c2f56e77b73209b53f75f7e160bd /4.9.3 | |
| parent | initial 5.3.0 patchset based on last 5.2.0 patchset (diff) | |
| download | gcc-patches-1a20f72ce30a190578f69ea818c7ea4d2f1fd173.tar.gz gcc-patches-1a20f72ce30a190578f69ea818c7ea4d2f1fd173.tar.bz2 gcc-patches-1a20f72ce30a190578f69ea818c7ea4d2f1fd173.zip | |
fix from upstream for bootstrapping some targets
Diffstat (limited to '4.9.3')
| -rw-r--r-- | 4.9.3/gentoo/92_all_gcc-4.9-hwloops-ICE-pr63681.patch | 64 | ||||
| -rw-r--r-- | 4.9.3/gentoo/README.history | 3 |
2 files changed, 67 insertions, 0 deletions
diff --git a/4.9.3/gentoo/92_all_gcc-4.9-hwloops-ICE-pr63681.patch b/4.9.3/gentoo/92_all_gcc-4.9-hwloops-ICE-pr63681.patch new file mode 100644 index 0000000..a6fe424 --- /dev/null +++ b/4.9.3/gentoo/92_all_gcc-4.9-hwloops-ICE-pr63681.patch @@ -0,0 +1,64 @@ +https://gcc.gnu.org/PR63681 + +From e22c35e90184855a24c7dc436ba00dd62f539acf Mon Sep 17 00:00:00 2001 +From: bernds <bernds@138bc75d-0d04-0410-961f-82ee72b054a4> +Date: Wed, 21 May 2014 09:22:26 +0000 +Subject: [PATCH] Stop the cfglayout code from failing an assert when called + from hw-doloop. + + * cfgrtl.c (cfg_layout_initialize): Weaken assert to only trigger if + flag_reorder_blocks_and_partition. + * hw-doloop.c (reorg_loops): Avoid reordering if that flag is set. + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@210683 138bc75d-0d04-0410-961f-82ee72b054a4 +--- + gcc/ChangeLog | 6 ++++++ + gcc/cfgrtl.c | 16 ++++++++-------- + gcc/hw-doloop.c | 4 +++- + 3 files changed, 17 insertions(+), 9 deletions(-) + +diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c +index eb25e89..49faf2e 100644 +--- a/gcc/cfgrtl.c ++++ b/gcc/cfgrtl.c +@@ -4213,14 +4213,14 @@ cfg_layout_initialize (unsigned int flags) + rtx x; + basic_block bb; + +- /* Once bb reordering is complete, cfg layout mode should not be re-entered. +- Entering cfg layout mode will perform optimizations on the cfg that +- could affect the bb layout negatively or even require fixups. An +- example of the latter is if edge forwarding performed when optimizing +- the cfg layout required moving a block from the hot to the cold section +- under -freorder-blocks-and-partition. This would create an illegal +- partitioning unless some manual fixup was performed. */ +- gcc_assert (!crtl->bb_reorder_complete); ++ /* Once bb partitioning is complete, cfg layout mode should not be ++ re-entered. Entering cfg layout mode may require fixups. As an ++ example, if edge forwarding performed when optimizing the cfg ++ layout required moving a block from the hot to the cold ++ section. This would create an illegal partitioning unless some ++ manual fixup was performed. */ ++ gcc_assert (!(crtl->bb_reorder_complete ++ && flag_reorder_blocks_and_partition)); + + initialize_original_copy_tables (); + +diff --git a/gcc/hw-doloop.c b/gcc/hw-doloop.c +index cc8f9b7..d182761 100644 +--- a/gcc/hw-doloop.c ++++ b/gcc/hw-doloop.c +@@ -636,7 +636,9 @@ reorg_loops (bool do_reorder, struct hw_doloop_hooks *hooks) + + loops = discover_loops (&loop_stack, hooks); + +- if (do_reorder) ++ /* We can't enter cfglayout mode anymore if basic block partitioning ++ already happened. */ ++ if (do_reorder && !flag_reorder_blocks_and_partition) + { + reorder_loops (loops); + free_loops (loops); +-- +2.6.2 + diff --git a/4.9.3/gentoo/README.history b/4.9.3/gentoo/README.history index 0ae42de..77f39eb 100644 --- a/4.9.3/gentoo/README.history +++ b/4.9.3/gentoo/README.history @@ -1,3 +1,6 @@ +1.5 12 Jan 2015 + + 92_all_gcc-4.9-hwloops-ICE-pr63681.patch + 1.4 27 Oct 2015 U 09_all_default-ssp.patch + 34_all_libjava-classpath-locale-sort.patch |