3 files changed, 14 insertions, 4 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 044dd3a..b5e1cb9 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2011-02-09  Eric Botcazou  <ebotcazou@adacore.com>
+
+	PR middle-end/47646
+	* gnat.dg/uninit_func.adb: Adjust dg directive.
+
+2011-02-09  Dominique Dhumieres  <dominiq@lps.ens.fr>
+
+	PR middle-end/47646
+	* obj-c++.dg/attributes/method-noreturn-1.mm: Adjust dg directives.
+
 2011-02-09  Janus Weil  <janus@gcc.gnu.org>
 
 	PR fortran/47637
diff --git a/gcc/testsuite/gnat.dg/uninit_func.adb b/gcc/testsuite/gnat.dg/uninit_func.adb
index 9c9ee34..ff5427a 100644
--- a/gcc/testsuite/gnat.dg/uninit_func.adb
+++ b/gcc/testsuite/gnat.dg/uninit_func.adb
@@ -2,12 +2,12 @@
 -- { dg-options "-O -Wall" }
 
 function uninit_func (A, B : Boolean) return Boolean is
-   C : Boolean; -- { dg-warning "may be used uninitialized" }
+   C : Boolean;
 begin
    if A then
       C := False;
    elsif B then
       C := True;
    end if;
-   return C;
+   return C; -- { dg-warning "may be used uninitialized" }
 end;
diff --git a/gcc/testsuite/obj-c++.dg/attributes/method-noreturn-1.mm b/gcc/testsuite/obj-c++.dg/attributes/method-noreturn-1.mm
index af051a6..717d6e6 100644
--- a/gcc/testsuite/obj-c++.dg/attributes/method-noreturn-1.mm
+++ b/gcc/testsuite/obj-c++.dg/attributes/method-noreturn-1.mm
@@ -18,11 +18,11 @@
 + (id) method1
 {
   return self;  /* { dg-warning "function declared .noreturn. has a .return. statement" } */
-}               /* { dg-warning ".noreturn. function does return" } */
+}               /* { dg-warning ".noreturn. function does return" "" { target *-*-* } 20 } */
 - (id) method2
 {
   return self;  /* { dg-warning "function declared .noreturn. has a .return. statement" } */
-}               /* { dg-warning ".noreturn. function does return" } */
+}               /* { dg-warning ".noreturn. function does return" "" { target *-*-* } 24 } */
 + (id) method3
 {
   abort ();