[Ltp-cvs] utils/analysis/lcov/bin geninfo,1.95,1.96

[Peter O. <obe...@us...>]

Update of /cvsroot/ltp/utils/analysis/lcov/bin
In directory vz-cvs-4.sog:/tmp/cvs-serv24347/bin

Modified Files:
	geninfo 
Log Message:
geninfo: add support for gcc 4.7 .gcno file format

Based on patch by ber...@re....


Index: geninfo
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/geninfo,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** geninfo	20 Jan 2012 11:53:57 -0000	1.95
--- geninfo	10 Apr 2012 11:48:52 -0000	1.96
***************
*** 67,70 ****
--- 67,71 ----
  our $tool_name		= basename($0);
  
+ our $GCOV_VERSION_4_7_0	= 0x40700;
  our $GCOV_VERSION_3_4_0	= 0x30400;
  our $GCOV_VERSION_3_3_0	= 0x30300;
***************
*** 3024,3030 ****
  	# Skip ident and checksum
  	graph_skip($handle, 8, "function ident and checksum") or return undef;
! 	if (is_compat($COMPAT_FLAG_ANDROID_4_4_0)) {
! 		# Skip extra word added by android 4.4.0 toolchain.
! 		graph_skip($handle, 4, "android_4_4_0 extra word");
  	}
  	# Read function name
--- 3025,3033 ----
  	# Skip ident and checksum
  	graph_skip($handle, 8, "function ident and checksum") or return undef;
! 	if (is_compat($COMPAT_FLAG_ANDROID_4_4_0) ||
! 	    ($gcov_version >= $GCOV_VERSION_4_7_0)) {
! 		# Skip extra checksum added by android 4.4.0 / gcc >= 4.7
! 		# toolchains.
! 		graph_skip($handle, 4, "function extra checksum");
  	}
  	# Read function name