From 3239d72683c6ebd12d002a73ba8de539403c3cd6 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Thu, 25 Oct 2018 17:36:12 +0200 Subject: [PATCH] Revert partially changes from r265454 (PR other/87735). 2018-10-25 Martin Liska 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 PR other/87735 * libgcov-profiler.c: Revert. From-SVN: r265494 --- gcc/testsuite/ChangeLog | 7 +++++++ gcc/testsuite/gcc.dg/tree-prof/time-profiler-1.c | 2 +- gcc/testsuite/gcc.dg/tree-prof/time-profiler-2.c | 4 ++-- gcc/testsuite/gcc.dg/tree-prof/time-profiler-3.c | 2 +- libgcc/ChangeLog | 5 +++++ libgcc/libgcov-profiler.c | 2 +- 6 files changed, 17 insertions(+), 5 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ef5adb8f926..4271212d8f7 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2018-10-25 Martin Liska + + 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 * 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 a622df23ce6..455f923f3f4 100644 --- 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 497b585388e..e6eaeb99810 100644 --- 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 69daf237483..69ce0260828 100644 --- 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 73c6f59ae1e..44fe7327ca4 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,8 @@ +2018-10-25 Martin Liska + + PR other/87735 + * libgcov-profiler.c: Revert. + 2018-10-24 Martin Liska * libgcov-profiler.c: Start from 1 in order to distinguish diff --git a/libgcc/libgcov-profiler.c b/libgcc/libgcov-profiler.c index 47c00ee4b4a..7a5e50009ce 100644 --- 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 -- 2.30.2