From: Christian Bruel <christian.bruel@st.com>
Date: Tue, 30 Aug 2011 11:18:49 +0000 (+0200)
Subject: fix -fbranch-probabilities and adjust testsuite
X-Git-Tag: releases/gcc-4.7.0~4127
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cb89a1716cbc3cee3a712a586ec0ebebbb5b750f;p=thirdparty%2Fgcc.git

fix -fbranch-probabilities and adjust testsuite

From-SVN: r178289
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b45a33257627..105cfce613a9 100644
--- 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 1a992973f783..24e0e3d87f2a 100644
--- 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 fe0a6aa11e22..95c78825a1e1 100644
--- 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 8a46cf7beef4..3f75a2e647d8 100644
--- 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 c05eced541b3..e579b36bed04 100644
--- 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]] {