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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@265494 138bc75d-0d04-0410-961f-82ee72b054a4
kprobinson · Oct 25, 2018 · 352bbfa · 352bbfa
1 parent 7632769
commit 352bbfa
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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