[multiple changes]

2009-04-10  Thomas Quinot  <quinot@adacore.com>

	* sem_prag.adb: Minor reformatting

2009-04-10  Vincent Celier  <celier@adacore.com>

	* prj-nmsc.adb:
	(Check_Library_Attributes): For a project qualified as a library project
	that is not a library project, indicate in the error message which
	attributes are missing (Library_Dir and/or Library_Name).

From-SVN: r145885

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 4afdf325c5073c10b941483eb8ba7c07e9d1d431..afdf19d336f79919f8fab35e9f9523cdb2c193f2 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,14 @@
+2009-04-10  Thomas Quinot  <quinot@adacore.com>
+
+       * sem_prag.adb: Minor reformatting
+
+2009-04-10  Vincent Celier  <celier@adacore.com>
+
+       * prj-nmsc.adb:
+       (Check_Library_Attributes): For a project qualified as a library project
+       that is not a library project, indicate in the error message which
+       attributes are missing (Library_Dir and/or Library_Name).
+
 2009-04-10  Bob Duff  <duff@adacore.com>
 
        * exp_ch5.adb, exp_ch9.adb: Avoid use of No_Position in Sloc of

diff --git a/gcc/ada/prj-nmsc.adb b/gcc/ada/prj-nmsc.adb
index 3de151f9583ec43931ffa0908ce799fae2e7fb9f..3d6737109e6e9c75979ab966572fc2675f5f97c9 100644 (file)
--- a/gcc/ada/prj-nmsc.adb
+++ b/gcc/ada/prj-nmsc.adb
@@ -3871,10 +3871,19 @@ package body Prj.Nmsc is
 
             when Library =>
                if not Data.Library then
-                  Error_Msg
-                    (Project, In_Tree,
-                     "not a library project",
-                     Data.Location);
+                  if Data.Library_Dir = No_Path_Information then
+                     Error_Msg
+                       (Project, In_Tree,
+                        "\attribute Library_Dir not declared",
+                        Data.Location);
+                  end if;
+
+                  if Data.Library_Name = No_Name then
+                     Error_Msg
+                       (Project, In_Tree,
+                        "\attribute Library_Name not declared",
+                        Data.Location);
+                  end if;
                end if;
 
             when others =>

diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
index 544c6090922a58bd2cb8976a4afbbc9652a796c4..51d117d60565e5724ffa9b73b57811cd572b947c 100644 (file)
--- a/gcc/ada/sem_prag.adb
+++ b/gcc/ada/sem_prag.adb
@@ -11169,7 +11169,7 @@ package body Sem_Prag is
 
             Arg := Expression (Arg1);
 
-            --  The expression is used in the call to create_task, and must
+            --  The expression is used in the call to Create_Task, and must
             --  be expanded there, not in the context of the current spec.
 
             Preanalyze_And_Resolve (New_Copy_Tree (Arg), Standard_String);