This merge brings google/main up to rev 178863 in
google/integration.

Several changes were required for this merge.  In particular, I
had to re-apply all the libgcov changes we have done in
google/main since libgcov.c moved to libgcc. 

I also had to disable support for annotalysis attributes.  The
token caching done in cp_parser_save_attribute_arg_list was
causing ICEs during parsing (it forces a type cast from token
cache to a tree node).

Validated on x86_64.  Committed to google/main.


Diego.


libgcc/ChangeLog.google-main

2011-09-16   Diego Novillo  <dnovi...@google.com>

        * Makefile.in: Re-apply google/main revisions 172952 and 173605.
        * libgcov.c: Re-apply google/main revisions 168794, 171635, 172736,
        172952, 173353, 173395, 173605, 173806, 174089, 175334, 175354, and
        177231.


gcc/c-family/ChangeLog.google-main

2011-09-20   Diego Novillo  <dnovi...@google.com>

        * c-cppbuiltin.c (c_cpp_builtins): Do not define
        __SUPPORT_TS_ANNOTATION__ nor __SUPPORT_DYN_ANNOTATION__.

2011-09-18   Diego Novillo  <dnovi...@google.com>

        * c-common.c (conversion_warning): When -Wreal-conversion is
        enabled, and either type is floating point, use OPT_Wreal_conversion
        when calling warning_at.

2011-09-15   Diego Novillo  <dnovi...@google.com>

        * c-common.c (check_for_self_assign): Handle NULL
        values for LHS and RHS.  Handle TREE_LIST initializers.



gcc/ChangeLog.google-main

2011-09-20   Diego Novillo  <dnovi...@google.com>

        Merge from google/integration rev 178863.


gcc/cp/ChangeLog.google-main

2011-09-15   Diego Novillo  <dnovi...@google.com>

        * init.c (perform_member_init): Move check for self-assignment
        to the end of the function.


Reply via email to