Patchwork Merged r182417 from branches/google/gcc-4_6. (issue 5491078)

login
register
mail settings
Submitter asharif@google.com
Date Dec. 19, 2011, 10:09 p.m.
Message ID <20cf302ef8c8ba75e504b479336c@google.com>
Download mbox | patch
Permalink /patch/132326/
State New
Headers show

Comments

asharif@google.com - Dec. 19, 2011, 10:09 p.m.
Reviewers: xur, jingyu, shenhan, bjanakiraman_google.com,

Message:
This merges xur's patch to our mobile release branch. LGTM and I will
submit it.



Please review this at http://codereview.appspot.com/5491078/

Affected files:
    M    gcc-4_6-mobile
   M     gcc-4_6-mobile/gcc/ChangeLog.google-4_6
   M     gcc-4_6-mobile/gcc/libgcov.c


2011-12-19   Ahmad Sharif  <asharif@google.com>

	* gcc-4_6-mobile:
	* gcc-4_6-mobile/gcc/ChangeLog.google-4_6:
	* gcc-4_6-mobile/gcc/libgcov.c:

Index: gcc-4_6-mobile
===================================================================
--- gcc-4_6-mobile	(revision 179999)
+++ gcc-4_6-mobile	(working copy)

Property changes on: gcc-4_6-mobile

Patch

Index: gcc-4_6-mobile/gcc/ChangeLog.google-4_6
===================================================================
--- gcc-4_6-mobile/gcc/ChangeLog.google-4_6	(revision 182489)
+++ gcc-4_6-mobile/gcc/ChangeLog.google-4_6	(working copy)
@@ -1,3 +1,10 @@ 
+2011-12-16   Rong Xu  <xur@google.com>
+	Backport r182416 from google/main.
+
+	2011-12-16   Rong Xu  <xur@google.com>
+
+		* libgcc/libgcov.c (gcov_merge_gcda_file): reset summary_pos.
+
  2011-12-05  Jing Yu  <jingyu@google.com>

  	Backport r171347 and r181549 from trunk.
Index: gcc-4_6-mobile/gcc/libgcov.c
===================================================================
--- gcc-4_6-mobile/gcc/libgcov.c	(revision 182489)
+++ gcc-4_6-mobile/gcc/libgcov.c	(working copy)
@@ -810,6 +810,7 @@ 
    gcov_unsigned_t tag, length;

    eof_pos = 0;
+  summary_pos = 0;

    tag = gcov_read_unsigned ();
    if (tag)