fix -fbranch-probabilities and adjust testsuite

From-SVN: r178289

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b45a332576270a1304143bcb38be8d086d2c7a7b..105cfce613a9097cd67eb84f0a813a1e6e21c2c3 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-30  Christian Bruel  <christian.bruel@st.com>
+
+       * coverage.c (coverage_init): Check flag_branch_probabilities instead of
+       flag_profile_use.
+       
 2011-08-29  Michael Meissner  <meissner@linux.vnet.ibm.com>
 
        * config/rs6000/rs6000.opt (-msave-toc-indirect): Change default

diff --git a/gcc/coverage.c b/gcc/coverage.c
index 1a992973f7838aaae31d9585c80199af1d0309b7..24e0e3d87f2ac3b1553b030468b7561469b56d07 100644 (file)
--- a/gcc/coverage.c
+++ b/gcc/coverage.c
@@ -1056,7 +1056,7 @@ coverage_init (const char *filename)
   strcpy (bbg_file_name, filename);
   strcat (bbg_file_name, GCOV_NOTE_SUFFIX);
 
-  if (flag_profile_use)
+  if (flag_branch_probabilities)
     read_counts_file ();
 }
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fe0a6aa11e2200d1e48bbc86c8ddf658716d1620..95c78825a1e150bbb1e488b40236fea3b652365b 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-30  Christian Bruel  <christian.bruel@st.com>
+
+       * g++.dg/bprob/bprob.exp (feedback_options): Set -fbranch-probabilities.
+       * gcc.misc-tests/bprob.exp (feedback_options): Likewise.
+       
 2011-08-29  Jason Merrill  <jason@redhat.com>
 
        PR c++/50224

diff --git a/gcc/testsuite/g++.dg/bprob/bprob.exp b/gcc/testsuite/g++.dg/bprob/bprob.exp
index 8a46cf7beef443329d62df71d355b13213e926c3..3f75a2e647d8a446172ce4baf8abcc9dcd354212 100644 (file)
--- a/gcc/testsuite/g++.dg/bprob/bprob.exp
+++ b/gcc/testsuite/g++.dg/bprob/bprob.exp
@@ -51,7 +51,7 @@ if $tracelevel then {
 load_lib profopt.exp
 
 set profile_options "-fprofile-arcs"
-set feedback_options "-fprofile-use"
+set feedback_options "-fbranch-probabilities"
 
 # Main loop.
 foreach profile_option $profile_options feedback_option $feedback_options {

diff --git a/gcc/testsuite/gcc.misc-tests/bprob.exp b/gcc/testsuite/gcc.misc-tests/bprob.exp
index c05eced541b3d112af2dc5d7c5a220ac092152a6..e579b36bed0457c66052559dcaaa70c6fbf85a02 100644 (file)
--- a/gcc/testsuite/gcc.misc-tests/bprob.exp
+++ b/gcc/testsuite/gcc.misc-tests/bprob.exp
@@ -48,7 +48,7 @@ if $tracelevel then {
 load_lib profopt.exp
 
 set profile_options "-fprofile-arcs"
-set feedback_options "-fprofile-use"
+set feedback_options "-fbranch-probabilities"
 
 foreach profile_option $profile_options feedback_option $feedback_options {
     foreach src [lsort [glob -nocomplain $srcdir/$subdir/bprob-*.c]] {