[multiple changes]

2011-09-06  Yannick Moy  <moy@adacore.com>

	* sem_ch13.adb (Analyze_Aspect_Specifications): Call
	Set_Corresponding_Aspect when creating pragma from aspect.
	(Add_Predicates): Use new field Corresponding_Aspect.
	* sem_prag.adb (Analyze_Pragma): Make Pname hold source aspect
	name when present, for the purpose of issuing error messages;
	remove local procedure Error_Pragma_Arg_Alternate_Name.
	* sinfo.adb, sinfo.ads (Corresponding_Aspect): New field in
	N_Pragma node.
	(From_Dynamic_Predicate, From_Static_Predicate): Remove fields from
	N_Pragma node.

2011-09-06  Robert Dewar  <dewar@adacore.com>

	* checks.adb, s-except.ads, g-socket.adb: Minor reformatting.

2011-09-06  Hristian Kirtchev  <kirtchev@adacore.com>

	* exp_ch6.adb (Build_Heap_Allocator): Add new
	local variable Desig_Typ. Code and comment reformatting. Add
	machinery to ensure that the allocation uses a fat pointer when
	the type of the return object is a constrained array and the
	function return type is an unconstrained array.

2011-09-06  Vincent Celier  <celier@adacore.com>

	* make.adb, prj-part.adb, prj-nmsc.adb: Remove unused formal
	parameters in subprograms.

2011-09-06  Arnaud Charlet  <charlet@adacore.com>

	* s-taprop-mingw.adb (Finalize_TCB): Fix typo.

2011-09-06  Thomas Quinot  <quinot@adacore.com>

	* s-taprop-vxworks.adb, s-tpoaal.adb, s-tpopsp-vxworks.adb
	(System.Tasking.Primitive_Operations.Specific.Delete): Remove
	subprogram.
	(System.Tasking.Primitive_Operations.Specific.Set): If argument
	is null, destroy task specific data, to make API consistent with
	other platforms, and thus compatible with the shared version
	of s-tpoaal.adb.
	(System.Tasking.Primitive_Operations.ATCB_Allocation.Free_ATCB):
	Document the above assumption.

From-SVN: r178583

1 files changed, 2 insertions, 19 deletions

diff --git a/gcc/ada/make.adb b/gcc/ada/make.adb
index 13777bb..bf6a21a 100644
--- a/gcc/ada/make.adb
+++ b/gcc/ada/make.adb
@@ -608,8 +608,6 @@ package body Make is
 
    procedure Compute_Switches_For_Main
      (Main_Source_File  : in out File_Name_Type;
-      Main_Index        : Int;
-      Project_Node_Tree : Project_Node_Tree_Ref;
       Root_Environment  : in out Prj.Tree.Environment;
       Compute_Builder   : Boolean;
       Current_Work_Dir  : String);
@@ -744,10 +742,8 @@ package body Make is
    procedure Add_Switches
      (The_Package                      : Package_Id;
       File_Name                        : String;
-      Index                            : Int;
       Program                          : Make_Program_Type;
       Unknown_Switches_To_The_Compiler : Boolean := True;
-      Project_Node_Tree                : Project_Node_Tree_Ref;
       Env                              : in out Prj.Tree.Environment);
    procedure Add_Switch
      (S             : String_Access;
@@ -769,7 +765,6 @@ package body Make is
 
    procedure Check
      (Source_File    : File_Name_Type;
-      Source_Index   : Int;
       Is_Main_Source : Boolean;
       The_Args       : Argument_List;
       Lib_File       : File_Name_Type;
@@ -1276,10 +1271,8 @@ package body Make is
    procedure Add_Switches
      (The_Package                      : Package_Id;
       File_Name                        : String;
-      Index                            : Int;
       Program                          : Make_Program_Type;
       Unknown_Switches_To_The_Compiler : Boolean := True;
-      Project_Node_Tree                : Project_Node_Tree_Ref;
       Env                              : in out Prj.Tree.Environment)
    is
       Switches    : Variable_Value;
@@ -1445,7 +1438,6 @@ package body Make is
 
    procedure Check
      (Source_File    : File_Name_Type;
-      Source_Index   : Int;
       Is_Main_Source : Boolean;
       The_Args       : Argument_List;
       Lib_File       : File_Name_Type;
@@ -3445,7 +3437,6 @@ package body Make is
 
                   if not Force_Compilations then
                      Check (Source_File    => Source.File,
-                            Source_Index   => Source.Index,
                             Is_Main_Source => Source.File = Main_Source,
                             The_Args       => Args,
                             Lib_File       => Lib_File,
@@ -5206,8 +5197,6 @@ package body Make is
 
    procedure Compute_Switches_For_Main
      (Main_Source_File  : in out File_Name_Type;
-      Main_Index        : Int;
-      Project_Node_Tree : Project_Node_Tree_Ref;
       Root_Environment  : in out Prj.Tree.Environment;
       Compute_Builder   : Boolean;
       Current_Work_Dir  : String)
@@ -5349,10 +5338,8 @@ package body Make is
                end if;
 
                Add_Switches
-                 (Project_Node_Tree => Project_Node_Tree,
-                  Env               => Root_Environment,
+                 (Env               => Root_Environment,
                   File_Name         => Main_Unit_File_Name,
-                  Index             => Main_Index,
                   The_Package       => Binder_Package,
                   Program           => Binder);
             end if;
@@ -5367,10 +5354,8 @@ package body Make is
                end if;
 
                Add_Switches
-                 (Project_Node_Tree => Project_Node_Tree,
-                  Env               => Root_Environment,
+                 (Env               => Root_Environment,
                   File_Name         => Main_Unit_File_Name,
-                  Index             => Main_Index,
                   The_Package       => Linker_Package,
                   Program           => Linker);
             end if;
@@ -6029,8 +6014,6 @@ package body Make is
 
          Compute_Switches_For_Main
            (Main_Source_File,
-            Main_Index,
-            Project_Node_Tree,
             Root_Environment,
             Compute_Builder  => Is_First_Main,
             Current_Work_Dir => Current_Work_Dir.all);