GCC unification, part 2. Fix various errors from previous unificaiton.

The previous version of the unified GCC compiler (Android & ChromeOS)
caused some ChromeOS tests to fail.  It also caused an Android NDK
test case to fail.  This CL fixes those problems.  In particular it
does the following:

- Fix some file formatting errors from previous unification patch.
- Update ChangeLog files to reflect Android backport patches.
- Find and incorporate a few missing pieces from the following backports
backports from trunk r221007, r221675, r222011, r212011, r214942,
r214957, r215012, r215016, r218115, r218733, r218746, r220491.  This
involved small changes in the following files:

 gcc/cfghoks.c
 gcc/cfgloop.c
 gcc/cfgloop.h
 gcc/except.c
 gcc/loop-init.c
 gcc/omp-low.c

- Fix minor Android test case regression introduced in the previous
unification patch.

Change-Id: I482e3a34e3ed97c7ba609fe2954b4781f02ec617

1 files changed, 1 insertions, 4 deletions

diff --git a/gcc-4.9/gcc/except.c b/gcc-4.9/gcc/except.c
index d67b4e427..2818119ec 100644
--- a/gcc-4.9/gcc/except.c
+++ b/gcc-4.9/gcc/except.c
@@ -1394,10 +1394,7 @@ sjlj_emit_dispatch_table (rtx dispatch_label, int num_dispatch)
 	      {
 		for (loop = bb->loop_father;
 		     loop_outer (loop); loop = loop_outer (loop))
-		  {
-		    loop->header = NULL;
-		    loop->latch = NULL;
-		  }
+		  mark_loop_for_removal (loop);
 	      }
 	  }