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, 8 insertions, 0 deletions

diff --git a/gcc-4.9/gcc/cfgloop.h b/gcc-4.9/gcc/cfgloop.h
index 11bfc810f..ce1a689b3 100644
--- a/gcc-4.9/gcc/cfgloop.h
+++ b/gcc-4.9/gcc/cfgloop.h
@@ -203,6 +203,12 @@ struct GTY ((chain_next ("%h.next"))) loop {
 
   /* Number of iteration analysis data for RTL.  */
   struct niter_desc *simple_loop_desc;
+
+  /* For sanity checking during loop fixup we record here the former
+     loop header for loops marked for removal.  Note that this prevents
+     the basic-block from being collected but its index can still be
+     reused.  */
+  basic_block former_header;
 };
 
 /* Flags for state of loop structure.  */
@@ -345,6 +351,8 @@ struct loop * loop_version (struct loop *, void *,
 extern bool remove_path (edge);
 extern void unloop (struct loop *, bool *, bitmap);
 extern void scale_loop_frequencies (struct loop *, int, int);
+void mark_loop_for_removal (loop_p);
+
 
 /* Induction variable analysis.  */