Revert partially changes from r265454 (PR other/87735).

2018-10-25  Martin Liska  <mliska@suse.cz>

	PR other/87735
	* gcc.dg/tree-prof/time-profiler-1.c: Revert.
	* gcc.dg/tree-prof/time-profiler-2.c: Likewise.
	* gcc.dg/tree-prof/time-profiler-3.c: Likewise.
2018-10-25  Martin Liska  <mliska@suse.cz>

	PR other/87735
	* libgcov-profiler.c: Revert.

From-SVN: r265494

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ef5adb8f9261dc15fc5c1dcd446be2bd3aa590ed..4271212d8f7ca4f0c402d12cdd59b658e60a0150 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2018-10-25  Martin Liska  <mliska@suse.cz>
+
+       PR other/87735
+       * gcc.dg/tree-prof/time-profiler-1.c: Revert.
+       * gcc.dg/tree-prof/time-profiler-2.c: Likewise.
+       * gcc.dg/tree-prof/time-profiler-3.c: Likewise.
+
 2018-10-25  Ilya Leoshkevich  <iii@linux.ibm.com>
 
        * gcc.target/s390/global-array-almost-huge-element.c: New test.

diff --git a/gcc/testsuite/gcc.dg/tree-prof/time-profiler-1.c b/gcc/testsuite/gcc.dg/tree-prof/time-profiler-1.c
index a622df23ce6057d91e7e017efa9c221ce9e7fe83..455f923f3f40533fb37b9d11d03b1966f2d50782 100644 (file)
--- a/gcc/testsuite/gcc.dg/tree-prof/time-profiler-1.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/time-profiler-1.c
@@ -16,6 +16,6 @@ int main ()
 {
   return foo ();
 }
+/* { dg-final-use-not-autofdo { scan-ipa-dump-times "Read tp_first_run: 0" 1 "profile"} } */
 /* { dg-final-use-not-autofdo { scan-ipa-dump-times "Read tp_first_run: 1" 1 "profile"} } */
 /* { dg-final-use-not-autofdo { scan-ipa-dump-times "Read tp_first_run: 2" 1 "profile"} } */
-/* { dg-final-use-not-autofdo { scan-ipa-dump-times "Read tp_first_run: 3" 1 "profile"} } */

diff --git a/gcc/testsuite/gcc.dg/tree-prof/time-profiler-2.c b/gcc/testsuite/gcc.dg/tree-prof/time-profiler-2.c
index 497b585388e28a4e5c9eb4cacdcd276470fa1338..e6eaeb9981016f0a417d317e5a956b7cd6df396c 100644 (file)
--- a/gcc/testsuite/gcc.dg/tree-prof/time-profiler-2.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/time-profiler-2.c
@@ -43,7 +43,7 @@ int main ()
 
   return r;
 }
-/* { dg-final-use-not-autofdo { scan-ipa-dump-times "Read tp_first_run: 1" 2 "profile"} } */
+/* { dg-final-use-not-autofdo { scan-ipa-dump-times "Read tp_first_run: 0" 2 "profile"} } */
+/* { dg-final-use-not-autofdo { scan-ipa-dump-times "Read tp_first_run: 1" 1 "profile"} } */
 /* { dg-final-use-not-autofdo { scan-ipa-dump-times "Read tp_first_run: 2" 1 "profile"} } */
 /* { dg-final-use-not-autofdo { scan-ipa-dump-times "Read tp_first_run: 3" 1 "profile"} } */
-/* { dg-final-use-not-autofdo { scan-ipa-dump-times "Read tp_first_run: 4" 1 "profile"} } */

diff --git a/gcc/testsuite/gcc.dg/tree-prof/time-profiler-3.c b/gcc/testsuite/gcc.dg/tree-prof/time-profiler-3.c
index 69daf2374830b941d38fb78b9d16a5d38c61657d..69ce026082851cfea723c80be463517e9f93498a 100644 (file)
--- a/gcc/testsuite/gcc.dg/tree-prof/time-profiler-3.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/time-profiler-3.c
@@ -17,6 +17,6 @@ int main ()
 {
   return foo ();
 }
+/* { dg-final-use-not-autofdo { scan-ipa-dump-times "Read tp_first_run: 0" 1 "profile"} } */
 /* { dg-final-use-not-autofdo { scan-ipa-dump-times "Read tp_first_run: 1" 1 "profile"} } */
 /* { dg-final-use-not-autofdo { scan-ipa-dump-times "Read tp_first_run: 2" 1 "profile"} } */
-/* { dg-final-use-not-autofdo { scan-ipa-dump-times "Read tp_first_run: 3" 1 "profile"} } */

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 73c6f59ae1e36c7e210fe185a7444c02c80f8652..44fe7327ca41c7e4208ecae1cd09afc1bb992002 100644 (file)
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,8 @@
+2018-10-25  Martin Liska  <mliska@suse.cz>
+
+       PR other/87735
+       * libgcov-profiler.c: Revert.
+
 2018-10-24  Martin Liska  <mliska@suse.cz>
 
        * libgcov-profiler.c: Start from 1 in order to distinguish

diff --git a/libgcc/libgcov-profiler.c b/libgcc/libgcov-profiler.c
index 47c00ee4b4a105b6e8597960512cce5a3ad3dfae..7a5e50009ce15032c312cb7593bab052a5e2021d 100644 (file)
--- a/libgcc/libgcov-profiler.c
+++ b/libgcc/libgcov-profiler.c
@@ -335,7 +335,7 @@ __gcov_indirect_call_profiler_v2 (gcov_type value, void* cur_func)
 #ifdef L_gcov_time_profiler
 
 /* Counter for first visit of each function.  */
-gcov_type __gcov_time_profiler_counter ATTRIBUTE_HIDDEN = 1;
+gcov_type __gcov_time_profiler_counter ATTRIBUTE_HIDDEN;
 
 #endif