public inbox for gcc@gcc.gnu.org
 help / color / mirror / Atom feed
* [google] Merged google/integration -> google/main
@ 2011-09-20 23:25 Diego Novillo
  0 siblings, 0 replies; 3+ messages in thread
From: Diego Novillo @ 2011-09-20 23:25 UTC (permalink / raw)
  To: gcc

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  <dnovillo@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  <dnovillo@google.com>

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

2011-09-18   Diego Novillo  <dnovillo@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  <dnovillo@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  <dnovillo@google.com>

	Merge from google/integration rev 178863.


gcc/cp/ChangeLog.google-main

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

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


^ permalink raw reply	[flat|nested] 3+ messages in thread

* [google] Merged google/integration -> google/main
@ 2011-07-22 22:42 Diego Novillo
  0 siblings, 0 replies; 3+ messages in thread
From: Diego Novillo @ 2011-07-22 22:42 UTC (permalink / raw)
  To: gcc, Delesley Hutchins, David Li, Sriraman Tallam,
	Sharad Singhai, Ollie Wild, Chris Demetriou

This merge brings trunk into google/main (via google/integration).
It had been a long while since we had merged from trunk so it
took a while to fix and there are several broken modules.

We decided that it's better to commit the merge for now and fix
the broken modules next.  So, if you had a copy of my local git
tree, you can discard it now and simply update your SVN copy of
google/main.


Thanks.  Diego.

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [google] Merged google/integration -> google/main
@ 2011-06-06 16:03 Diego Novillo
  0 siblings, 0 replies; 3+ messages in thread
From: Diego Novillo @ 2011-06-06 16:03 UTC (permalink / raw)
  To: gcc

This merge did not bring any code changes.  The only patch merged from
google/integration was the addition of -Wself-assign to c.opt that we
already have in google/main.

Diego.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2011-09-20 23:25 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-09-20 23:25 [google] Merged google/integration -> google/main Diego Novillo
  -- strict thread matches above, loose matches on Subject: below --
2011-07-22 22:42 Diego Novillo
2011-06-06 16:03 Diego Novillo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).