[gcc-4.9] Merge svn r213650 from google/gcc-4_9 branch

	Merge svn r213650 from google/gcc-4_9 branch. Tested with
arm,x86,mips,arm64,x86_64,mips64 build in liunux/windows.

Change-Id: I0c07f67d516074172aa393003eee664d01f2e0f2

3 files changed, 12 insertions, 11 deletions

diff --git a/gcc-4.9/gcc/testsuite/gcc.dg/pr26570.c b/gcc-4.9/gcc/testsuite/gcc.dg/pr26570.c
index 71c16f207..b1222578a 100644
--- a/gcc-4.9/gcc/testsuite/gcc.dg/pr26570.c
+++ b/gcc-4.9/gcc/testsuite/gcc.dg/pr26570.c
@@ -1,7 +1,8 @@
+/* { dg-message "note: file" "" } */
 /* { dg-do compile } */
 /* { dg-options "-O2 -fprofile-generate -fprofile-use -fopt-info" } */
 
 unsigned test (unsigned a, unsigned b)
 {
   return a / b;
-} /* { dg-message "note: \[^\n\]*execution counts estimated" } */
+} 
diff --git a/gcc-4.9/gcc/testsuite/gcc.dg/pr32773.c b/gcc-4.9/gcc/testsuite/gcc.dg/pr32773.c
index 19a90195a..c9bcb4392 100644
--- a/gcc-4.9/gcc/testsuite/gcc.dg/pr32773.c
+++ b/gcc-4.9/gcc/testsuite/gcc.dg/pr32773.c
@@ -1,3 +1,4 @@
+/* { dg-message "note: file" "" } */
 /* { dg-do compile } */
 /* { dg-options "-O -fprofile-use -fopt-info" } */
 /* { dg-options "-O -m4 -fprofile-use -fopt-info" { target sh-*-* } } */
@@ -6,4 +7,4 @@ void foo (int *p)
 {
   if (p)
     *p = 0;
-} /* { dg-message "note: \[^\n\]*execution counts estimated" } */
+} 
diff --git a/gcc-4.9/gcc/testsuite/gcc.dg/stack-usage-2.c b/gcc-4.9/gcc/testsuite/gcc.dg/stack-usage-2.c
index d3c17a84d..df7e55f05 100644
--- a/gcc-4.9/gcc/testsuite/gcc.dg/stack-usage-2.c
+++ b/gcc-4.9/gcc/testsuite/gcc.dg/stack-usage-2.c
@@ -1,33 +1,32 @@
 /* { dg-do compile } */
 /* { dg-options "-Wstack-usage=512" } */
 
-int foo1 (void)
+int foo1 (void)  /* { dg-bogus "stack usage" } */
 {
   char arr[16];
   arr[0] = 1;
   return 0;
-} /* { dg-bogus "stack usage" } */
+}
 
-int foo2 (void)
+int foo2 (void)  /* { dg-warning "stack usage is \[0-9\]* bytes" } */
 {
   char arr[1024];
   arr[0] = 1;
   return 0;
-} /* { dg-warning "stack usage is \[0-9\]* bytes" } */
+}
 
-int foo3 (void)
+int foo3 (void) /* { dg-warning "stack usage might be \[0-9\]* bytes" } */
 {
   char arr[1024] __attribute__((aligned (512)));
   arr[0] = 1;
   /* Force dynamic realignment of argument pointer.  */
   __builtin_apply ((void (*)()) foo2, 0, 0);
   return 0;
+}
 
-} /* { dg-warning "stack usage might be \[0-9\]* bytes" } */
-
-int foo4 (int n)
+int foo4 (int n) /* { dg-warning "stack usage might be unbounded" } */
 {
   char arr[n];
   arr[0] = 1;
   return 0;
-} /* { dg-warning "stack usage might be unbounded" } */
+}