Re: Merge C++ conversion into trunk

[Iain Sandoe]

On 14 Aug 2012, at 19:59, Diego Novillo wrote:
> 
> After the merge is in, I will send an announcement and request major branch 
> merges to wait for another 24 hrs to allow testers the chance to pick up this 
> merge.

The following patch (mimicking what has been done elsewhere at r190402) 
restores bootstrap for powerpc-darwin.
OK for trunk?

Iain

gcc/

        * config/rs6000/rs6000.c (macho_branch_islands): Adjust for changes to
        vec.h.

Index: gcc/config/rs6000/rs6000.c
===================================================================
--- gcc/config/rs6000/rs6000.c  (revision 190417)
+++ gcc/config/rs6000/rs6000.c  (working copy)
@@ -24952,7 +24952,7 @@ macho_branch_islands (void)
 
   while (!VEC_empty (branch_island, branch_islands))
     {
-      branch_island *bi = VEC_last (branch_island, branch_islands);
+      branch_island *bi = &VEC_last (branch_island, branch_islands);
       const char *label = IDENTIFIER_POINTER (bi->label_name);
       const char *name = IDENTIFIER_POINTER (bi->function_name);
       char name_buf[512];