diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 7bddd601a15..3c14d9e7ba0 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,12 @@
+2009-04-29  Vincent Celier  <celier@adacore.com>
+
+	* prj-part.adb (Parse_Single_Project): Do not attempt to find a
+	project extending an abstract project.
+
+2009-04-29  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* targparm.ads: Fix oversight.
+
 2009-04-29  Ed Schonberg  <schonberg@adacore.com>
 
 	* lib-xref.adb (Output_Overridden_Op): Follow several levels of
diff --git a/gcc/ada/prj-part.adb b/gcc/ada/prj-part.adb
index 1390f476737..afc546fd3e0 100644
--- a/gcc/ada/prj-part.adb
+++ b/gcc/ada/prj-part.adb
@@ -1096,14 +1096,14 @@ package body Prj.Part is
                                 (A_Project_Name_And_Node.Node, In_Tree);
 
                      Prj  : Project_Node_Id :=
-                              Extending_Project_Of (Decl, In_Tree);
+                              A_Project_Name_And_Node.Node;
 
                   begin
+                     while
+                       Extending_Project_Of (Decl, In_Tree) /= Empty_Node
                      loop
-                        Decl := Project_Declaration_Of (Prj, In_Tree);
-                        exit when Extending_Project_Of (Decl, In_Tree) =
-                          Empty_Node;
                         Prj := Extending_Project_Of (Decl, In_Tree);
+                        Decl := Project_Declaration_Of (Prj, In_Tree);
                      end loop;
 
                      A_Project_Name_And_Node.Node := Prj;
diff --git a/gcc/ada/targparm.ads b/gcc/ada/targparm.ads
index ff4cd15f7bc..55f56652608 100644
--- a/gcc/ada/targparm.ads
+++ b/gcc/ada/targparm.ads
@@ -446,7 +446,7 @@ package Targparm is
    -- Control of Stack Checking --
    -------------------------------
 
-   --  GNAT provides two methods of implementing exceptions:
+   --  GNAT provides three methods of implementing exceptions:
 
    --    GCC Probing Mechanism