AutoFDO: Update profile_merger gcov_version to 3

This patch should have been a part of r16-6348-g4dfa48077e3892 but
unfortunately I forgot to bump these versions with it.

Bootstrapped and regtested on aarch64-linux-gnu.

Signed-off-by: Dhruv Chawla <dhruvc@nvidia.com>
gcc/ChangeLog:

	* Makefile.in (all.fda): Bump profile_merger gcov_version to 3.

gcc/c/ChangeLog:

	* Make-lang.in (cc1.fda): Likewise.

gcc/cp/ChangeLog:

	* Make-lang.in (cc1plus.fda): Likewise.

gcc/lto/ChangeLog:

	* Make-lang.in (lto1.fda): Likewise.

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 3d3b21abe6ac092eaa9423493218d3e97db12bf8..9e8da255186a3e13faf9fa6012ccb10d6759f5f6 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -4818,7 +4818,7 @@ paranoia: paranoia.o real.o $(LIBIBERTY)
        g++ -o $@ paranoia.o real.o $(LIBIBERTY)
 
 all.fda: $(ALL_FDAS)
-       $(PROFILE_MERGER) $(ALL_FDAS) --output_file all.fda -gcov_version 2
+       $(PROFILE_MERGER) $(ALL_FDAS) --output_file all.fda -gcov_version 3
 
 # These exist for maintenance purposes.
 

diff --git a/gcc/c/Make-lang.in b/gcc/c/Make-lang.in
index bcb8ffda8addc9c47e5aea8a45eb36a68e10950c..fd127caba915dd3941252903601c2c7c2e3e5626 100644 (file)
--- a/gcc/c/Make-lang.in
+++ b/gcc/c/Make-lang.in
@@ -93,7 +93,7 @@ components_in_prev = "bfd opcodes binutils fixincludes gas gcc gmp mpfr mpc isl
 components_in_prev_target = "libstdc++-v3 libsanitizer libvtv libgcc libbacktrace libphobos zlib libgomp libatomic"
 
 cc1.fda: create_fdas_for_cc1
-       $(PROFILE_MERGER) $(shell ls -ha cc1_*.fda) --output_file cc1.fda -gcov_version 2
+       $(PROFILE_MERGER) $(shell ls -ha cc1_*.fda) --output_file cc1.fda -gcov_version 3
 
 create_fdas_for_cc1: ../stage1-gcc/cc1$(exeext) ../prev-gcc/$(PERF_DATA)
        for component_in_prev in "$(components_in_prev)"; do \

diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
index 7f476531d84d138468eb8da26211ae300a0fb26f..55be730f5020342b4987fdc60f858cdffa4586d3 100644 (file)
--- a/gcc/cp/Make-lang.in
+++ b/gcc/cp/Make-lang.in
@@ -210,7 +210,7 @@ components_in_prev = "bfd opcodes binutils fixincludes gas gcc gmp mpfr mpc isl
 components_in_prev_target = "libstdc++-v3 libsanitizer libvtv libgcc libbacktrace libphobos zlib libgomp libatomic"
 
 cc1plus.fda: create_fdas_for_cc1plus
-       $(PROFILE_MERGER) $(shell ls -ha cc1plus_*.fda) --output_file cc1plus.fda -gcov_version 2
+       $(PROFILE_MERGER) $(shell ls -ha cc1plus_*.fda) --output_file cc1plus.fda -gcov_version 3
 
 create_fdas_for_cc1plus: ../stage1-gcc/cc1plus$(exeext) ../prev-gcc/$(PERF_DATA)
        for component_in_prev in "$(components_in_prev)"; do \

diff --git a/gcc/lto/Make-lang.in b/gcc/lto/Make-lang.in
index aacee6c6b250b8edf6460d4efd12b2712e03053a..eacfe53ca1493e447583834bdf851aee4a7ae841 100644 (file)
--- a/gcc/lto/Make-lang.in
+++ b/gcc/lto/Make-lang.in
@@ -106,7 +106,7 @@ components_in_prev = "bfd opcodes binutils fixincludes gas gcc gmp mpfr mpc isl
 components_in_prev_target = "libstdc++-v3 libsanitizer libvtv libgcc libbacktrace libphobos zlib libgomp libatomic"
 
 lto1.fda: create_fdas_for_lto1
-       $(PROFILE_MERGER) $(shell ls -ha lto1_*.fda) --output_file lto1.fda -gcov_version 2
+       $(PROFILE_MERGER) $(shell ls -ha lto1_*.fda) --output_file lto1.fda -gcov_version 3
 
 create_fdas_for_lto1: ../stage1-gcc/lto1$(exeext) ../prev-gcc/$(PERF_DATA)
        for component_in_prev in "$(components_in_prev)"; do \