[multiple changes]

2010-10-05  Ed Schonberg  <schonberg@adacore.com>

	* sem_ch10.adb (Analyze_Task_Body_Stub): Diagnose duplicate stub for
	task.

2010-10-05  Vincent Celier  <celier@adacore.com>

	* gnatbind.adb: If the main library file is not for a suitable main
	program, change the error message.

2010-10-05  Vincent Celier  <celier@adacore.com>

	* a-direct.ads: Minor spelling error fixes in comments.
	* gnat_rm.texi: Add three entries in "Implementation Defined
	Characteristics" for the interpretations of the Form parameters in
	Ada.Directories.

From-SVN: r164980

gcc/ada/ChangeLog

+2010-10-05  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_ch10.adb (Analyze_Task_Body_Stub): Diagnose duplicate stub for
+	task.
+
+2010-10-05  Vincent Celier  <celier@adacore.com>
+
+	* gnatbind.adb: If the main library file is not for a suitable main
+	program, change the error message.
+
+2010-10-05  Vincent Celier  <celier@adacore.com>
+
+	* a-direct.ads: Minor spelling error fixes in comments.
+	* gnat_rm.texi: Add three entries in "Implementation Defined
+	Characteristics" for the interpretations of the Form parameters in
+	Ada.Directories.
+
 2010-10-05  Robert Dewar  <dewar@adacore.com>
 
 	* exp_ch3.adb, exp_ch5.adb, exp_disp.adb, exp_dist.adb, gnatlink.adb,

gcc/ada/a-direct.ads

@@ -178,39 +178,56 @@ package Ada.Directories is
    --  Source_Name (in the absence of Name_Error).
    --
    --  Interpretation of the Form parameter:
-   --  The Form parameter is case-insensitive.
-   --  Two fields are recognized in the Form parameter:
-   --    preserve=<value>
-   --    mode=<value>
-   --  <value> starts immediatey after the character '=' and ends with the
-   --  character immediatey preceding the next comma (',') or with the last
-   --  character of the parameter.
-   --  The only possible values for preserve= are:
-   --     no_attributes: do not try to preserve any file attributes. This is
-   --                    the default if no preserve= is found in Form.
-   --     all_attributes: try to preserve all file attributes (timestamps,
-   --                     access rights).
-   --     timestamps: preserve the timestamp of the copied file, but not the
-   --                 other file attributes.
-   --  The only possible values for mode= are:
-   --     copy: only do the copy if the destination file does not already
-   --           exist. If it already exist, Copy_File fails.
-   --     overwrite: copy the file in all cases. Overwite an aready existing
-   --                destination file.
-   --     append: append the original file to the destination file. If the
-   --             destination file does not exist, the destination file is
-   --             a copy of the source file.
-   --             When mode=append, the field preserve=, if it exists, is not
-   --             taken into account.
-   --  If the Form parameter includes one or both of the fields and the value
-   --  or values are incorrect, Copy_file fails with Use_Error.
-   --  Examples of correct Forms:
-   --     Form => "preserve=no_attributes,mode=overwrite" (the default)
-   --     Form => "mode=append"
-   --     Form => "mode=copy, preserve=all_attributes"
-   --  Examples of incorrect Forms
-   --     Form => "preserve=junk"
-   --     Form => "mode=internal, preserve=timestamps"
+   --
+   --    The Form parameter is case-insensitive
+   --
+   --    Two fields are recognized in the Form parameter:
+   --      preserve=<value>
+   --      mode=<value>
+   --
+   --      <value> starts immediately after the character '=' and ends with the
+   --      character immediately preceding the next comma (',') or with the
+   --      last character of the parameter.
+   --
+   --      The allowed values for preserve= are:
+   --
+   --        no_attributes:  Do not try to preserve any file attributes. This
+   --                        is the default if no preserve= is found in Form.
+   --
+   --        all_attributes: Try to preserve all file attributes (timestamps,
+   --                        access rights).
+   --
+   --        timestamps:     Preserve the timestamp of the copied file, but not
+   --                        the other file attributes.
+   --
+   --
+   --      The allowed values for mode= are:
+   --
+   --        copy:           Only copy if the destination file does not already
+   --                        exist. If it already exists, Copy_File will fail.
+   --
+   --        overwrite:      Copy the file in all cases. Overwite an already
+   --                        existing destination file.
+   --
+   --        append:         Append the original file to the destination file.
+   --                        If the destination file does not exist, the
+   --                        destination file is a copy of the source file.
+   --                        When mode=append, the field preserve=, if it
+   --                        exists, is not taken into account.
+   --
+   --    What is the default value for mode=???
+   --
+   --    If the Form parameter includes one or both of the fields and the value
+   --    or values are incorrect, Copy_file fails with Use_Error.
+   --
+   --    Examples of correct Forms:
+   --       Form => "preserve=no_attributes,mode=overwrite" (the default)
+   --       Form => "mode=append"
+   --       Form => "mode=copy, preserve=all_attributes"
+   --
+   --    Examples of incorrect Forms:
+   --       Form => "preserve=junk"
+   --       Form => "mode=internal, preserve=timestamps"
 
    ----------------------------------------
    -- File and directory name operations --

gcc/ada/gnatbind.adb

@@ -789,8 +789,20 @@ begin
         and then ALIs.Table (ALIs.First).Main_Program = None
         and then not No_Main_Subprogram
       then
-         Error_Msg_File_1 := Main_Lib_File;
-         Error_Msg ("{ does not contain a unit that can be a main program");
+         Get_Name_String
+           (Units.Table (ALIs.Table (ALIs.First).First_Unit).Uname);
+
+         declare
+            Unit_Name : String := Name_Buffer (1 .. Name_Len - 2);
+         begin
+            To_Mixed (Unit_Name);
+            Get_Name_String (ALIs.Table (ALIs.First).Sfile);
+            Add_Str_To_Name_Buffer (":1: ");
+            Add_Str_To_Name_Buffer (Unit_Name);
+            Add_Str_To_Name_Buffer (" cannot be used as a main program");
+            Write_Line (Name_Buffer (1 .. Name_Len));
+            Errors_Detected := Errors_Detected + 1;
+         end;
       end if;
 
       --  Perform consistency and correctness checks

gcc/ada/sem_ch10.adb

@@ -2272,7 +2272,16 @@ package body Sem_Ch10 is
       else
          Set_Scope (Defining_Entity (N), Current_Scope);
          Generate_Reference (Nam, Defining_Identifier (N), 'b');
-         Set_Has_Completion (Etype (Nam));
+
+         --  Check for duplicate stub, if so give message and terminate
+
+         if Has_Completion (Etype (Nam)) then
+            Error_Msg_N ("duplicate stub for task", N);
+            return;
+         else
+            Set_Has_Completion (Etype (Nam));
+         end if;
+
          Analyze_Proper_Body (N, Etype (Nam));
 
          --  Set elaboration flag to indicate that entity is callable. This