[gentoo-commits] repo/gentoo:master commit in: dev-util/lcov/files/

[gentoo-commits] repo/gentoo:master commit in: dev-util/lcov/files/

[Aaron Bauman]

commit:     65be439d3c9e151727ad05c7a13502536940120c
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Nov 18 10:35:34 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Mon Nov 18 22:15:43 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65be439d

dev-util/lcov: remove unused patch

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13695
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 dev-util/lcov/files/lcov-1.9-gcc-4.7.patch | 29 -----------------------------
 1 file changed, 29 deletions(-)

diff --git a/dev-util/lcov/files/lcov-1.9-gcc-4.7.patch b/dev-util/lcov/files/lcov-1.9-gcc-4.7.patch
deleted file mode 100644
index 1b9d6ac0ff2..00000000000
--- a/dev-util/lcov/files/lcov-1.9-gcc-4.7.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-fix from upstream to work with gcc-4.7
-
-Index: bin/geninfo
-===================================================================
-RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/geninfo,v
-retrieving revision 1.95
-retrieving revision 1.96
-diff -u -p -r1.95 -r1.96
---- bin/geninfo	20 Jan 2012 11:53:57 -0000	1.95
-+++ bin/geninfo	10 Apr 2012 11:48:52 -0000	1.96
-@@ -61,6 +61,7 @@ if( $^O eq "msys" )
- our $gcov_tool		= "gcov";
- 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;
- our $GCNO_FUNCTION_TAG	= 0x01000000;
-@@ -3023,5 +3024,10 @@ sub read_gcno_function_record(*$$$$)
- 	graph_expect("function record");
- 	# Skip ident and checksum
- 	graph_skip($handle, 8, "function ident and checksum") or return undef;
-+	if ($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
- 	graph_expect("function name");

[gentoo-commits] repo/gentoo:master commit in: dev-util/lcov/files/

[Joonas Niilola]

commit:     48250a8c5ca66d2fea1da96cac93e9e541e9aeb2
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Mar 21 12:39:58 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Mar 22 14:04:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48250a8c

dev-util/lcov: remove unused patch(es)

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/20033
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-util/lcov/files/lcov-1.13-gcc-8.patch | 91 -------------------------------
 1 file changed, 91 deletions(-)

diff --git a/dev-util/lcov/files/lcov-1.13-gcc-8.patch b/dev-util/lcov/files/lcov-1.13-gcc-8.patch
deleted file mode 100644
index b67ca411bda..00000000000
--- a/dev-util/lcov/files/lcov-1.13-gcc-8.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From a5dd9529f9232b8d901a4d6eb9ae54cae179e5b3 Mon Sep 17 00:00:00 2001
-From: Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
-Date: Wed, 7 Mar 2018 14:18:55 +0100
-Subject: [PATCH] geninfo: Add gcc 8 support
-
-Fix errors and incorrect data when trying to collect coverage data
-for programs compiled with gcc 8.
-
-Covers the following gcov-related changes in gcc:
-
-.gcov-file format:
-  - Line coverage data can appear multiple times for the same line
-  - Line coverage count can be suffixed by '*' to indicated unexecuted
-    basic blocks in that line
-
-.gcno-file format:
-  - new header field 'support unexecuted blocks flag'
-  - new function record fields 'column number', 'ending line number',
-    and 'compiler-generated entity flag'
-
-Signed-off-by: Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
----
- bin/geninfo | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
-
-diff --git a/bin/geninfo b/bin/geninfo
-index 8562560..ef6a818 100755
---- a/bin/geninfo
-+++ b/bin/geninfo
-@@ -68,6 +68,7 @@ our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
- our $gcov_tool		= "gcov";
- our $tool_name		= basename($0);
-
-+our $GCOV_VERSION_8_0_0	= 0x80000;
- our $GCOV_VERSION_4_7_0	= 0x40700;
- our $GCOV_VERSION_3_4_0	= 0x30400;
- our $GCOV_VERSION_3_3_0	= 0x30300;
-@@ -1934,6 +1935,9 @@ sub read_gcov_file($)
- 			{
- 				my ($count, $line, $code) = ($1, $2, $3);
-
-+				# Skip instance-specific counts
-+				next if ($line == $last_line);
-+
- 				$last_line = $line;
- 				$last_block = $UNNAMED_BLOCK;
- 				# Check for exclusion markers
-@@ -1963,6 +1967,9 @@ sub read_gcov_file($)
- 					}
- 				}
-
-+				# Strip unexecuted basic block marker
-+				$count =~ s/\*$//;
-+
- 				# <exec count>:<line number>:<source code>
- 				if ($line eq "0")
- 				{
-@@ -3537,6 +3544,10 @@ sub read_gcno_function_record(*$$$$$)
- 	graph_expect("function name");
- 	$function = read_gcno_string($handle, $big_endian);
- 	return undef if (!defined($function));
-+	if ($version >= $GCOV_VERSION_8_0_0) {
-+		graph_skip($handle, 4, "compiler-generated entity flag")
-+			or return undef;
-+	}
- 	# Read filename
- 	graph_expect("filename");
- 	$filename = read_gcno_string($handle, $big_endian);
-@@ -3544,6 +3555,11 @@ sub read_gcno_function_record(*$$$$$)
- 	# Read first line number
- 	$lineno = read_gcno_value($handle, $big_endian, "initial line number");
- 	return undef if (!defined($lineno));
-+	# Skip column and ending line number
-+	if ($version >= $GCOV_VERSION_8_0_0) {
-+		graph_skip($handle, 4, "column number") or return undef;
-+		graph_skip($handle, 4, "ending line number") or return undef;
-+	}
- 	# Add to list
- 	push(@{$bb->{$function}->{$filename}}, $lineno);
- 	graph_add_order($fileorder, $function, $filename);
-@@ -3631,6 +3647,10 @@ sub read_gcno($)
- 	debug(sprintf("found version 0x%08x\n", $version));
- 	# Skip stamp
- 	graph_skip(*HANDLE, 4, "file timestamp") or goto incomplete;
-+	if ($version >= $GCOV_VERSION_8_0_0) {
-+		graph_skip(*HANDLE, 4, "support unexecuted blocks flag")
-+			or goto incomplete;
-+	}
- 	while (!eof(HANDLE)) {
- 		my $next_pos;
- 		my $curr_pos;