aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnaud Charlet <charlet@gcc.gnu.org>2009-04-29 15:24:07 +0200
committerArnaud Charlet <charlet@gcc.gnu.org>2009-04-29 15:24:07 +0200
commit0ec21a5bb7586e74425f162f1527b508309f3345 (patch)
tree0a68bfb28114885ac60dc40a49fb44ba8cdabe42
parent96b20738216dfdf39b57c2a6eddff7c42c33f091 (diff)
downloadgcc-0ec21a5bb7586e74425f162f1527b508309f3345.zip
gcc-0ec21a5bb7586e74425f162f1527b508309f3345.tar.gz
gcc-0ec21a5bb7586e74425f162f1527b508309f3345.tar.bz2
[multiple changes]
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. From-SVN: r146965
-rw-r--r--gcc/ada/ChangeLog9
-rw-r--r--gcc/ada/prj-part.adb8
-rw-r--r--gcc/ada/targparm.ads2
3 files changed, 14 insertions, 5 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 7bddd60..3c14d9e 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 1390f47..afc546f 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 ff4cd15..55f5665 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