2009-04-22 Robert Dewar <dewar@adacore.com>

	* lib-load.adb: Minor reformatting

2009-04-22  Arnaud Charlet  <charlet@adacore.com>

	* s-bitops.adb, s-bitops.ads (Raise_Error): Do not use Ada 05 syntax,
	since this unit is now part of bootstrap units, so must use Ada 95
	syntax only.

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

	* a-tasatt.adb: Minor reformatting

2009-04-22  Bob Duff  <duff@adacore.com>

	* s-stalib.ads: Remove "with System;" since we're inside System, so
	it's unnecessary.

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

	* prj-nmsc.adb (Add_Source): Always put the dependency file name in
	the source record, as there may be a dependency file even if no object
	file is created.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@146558 138bc75d-0d04-0410-961f-82ee72b054a4

7 files changed, 47 insertions, 26 deletions

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index ea30d6d834e..22d4eef8656 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,6 +1,27 @@
+2009-04-22  Arnaud Charlet  <charlet@adacore.com>
+
+	* s-bitops.adb, s-bitops.ads (Raise_Error): Do not use Ada 05 syntax,
+	since this unit is now part of bootstrap units, so must use Ada 95
+	syntax only.
+
+2009-04-22  Thomas Quinot  <quinot@adacore.com>
+
+	* a-tasatt.adb: Minor reformatting
+
+2009-04-22  Bob Duff  <duff@adacore.com>
+
+	* s-stalib.ads: Remove "with System;" since we're inside System, so
+	it's unnecessary.
+
+2009-04-22  Vincent Celier  <celier@adacore.com>
+
+	* prj-nmsc.adb (Add_Source): Always put the dependency file name in
+	the source record, as there may be a dependency file even if no object
+	file is created.
+
 2009-04-22  Robert Dewar  <dewar@adacore.com>
 
-	* lib-load.adb: MInor reformatting
+	* lib-load.adb: Minor reformatting
 
 	* lib-load.ads: Minor reformatting
 
diff --git a/gcc/ada/a-tasatt.adb b/gcc/ada/a-tasatt.adb
index 69c4b9bdf71..11db89e4648 100644
--- a/gcc/ada/a-tasatt.adb
+++ b/gcc/ada/a-tasatt.adb
@@ -7,7 +7,7 @@
 --                                 B o d y                                  --
 --                                                                          --
 --             Copyright (C) 1991-1994, Florida State University            --
---                     Copyright (C) 1995-2008, AdaCore                     --
+--                     Copyright (C) 1995-2009, AdaCore                     --
 --                                                                          --
 -- GNARL is free software; you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -42,15 +42,15 @@
 --  include:
 
 --  - It is vulnerable to bad Task_Id values, to the extent of possibly
---     trashing memory and crashing the runtime system.
+--    trashing memory and crashing the runtime system.
 
 --  - It requires dynamic storage allocation for each new attribute value,
---     except for types that happen to be the same size as System.Address, or
---     shorter.
+--    except for types that happen to be the same size as System.Address, or
+--    shorter.
 
---  -  Instantiations at other than the library level rely on being able to
---     do down-level calls to a procedure declared in the generic package body.
---     This makes it potentially vulnerable to compiler changes.
+--  - Instantiations at other than the library level rely on being able to
+--    do down-level calls to a procedure declared in the generic package body.
+--    This makes it potentially vulnerable to compiler changes.
 
 --  The main implementation issue here is that the connection from task to
 --  attribute is a potential source of dangling references.
@@ -249,8 +249,8 @@ package body Ada.Task_Attributes is
    -- Unchecked Conversions --
    ---------------------------
 
-   --  The following type corresponds to Dummy_Wrapper,
-   --  declared in System.Tasking.Task_Attributes.
+   --  The following type corresponds to Dummy_Wrapper, declared in
+   --  System.Tasking.Task_Attributes.
 
    type Wrapper;
    type Access_Wrapper is access all Wrapper;
@@ -399,9 +399,9 @@ package body Ada.Task_Attributes is
                P := P.Next;
             end loop;
 
-            --  Unlock the RTS here to follow the lock ordering rule
-            --  that prevent us from using new (i.e the Global_Lock) while
-            --  holding any other lock.
+            --  Unlock the RTS here to follow the lock ordering rule that
+            --  prevent us from using new (i.e the Global_Lock) while holding
+            --  any other lock.
 
             POP.Unlock_RTS;
             W := new Wrapper'
diff --git a/gcc/ada/lib-load.adb b/gcc/ada/lib-load.adb
index 0bce92577cd..d93b3d04e33 100644
--- a/gcc/ada/lib-load.adb
+++ b/gcc/ada/lib-load.adb
@@ -783,9 +783,9 @@ package body Lib.Load is
          Units.Table (Main_Unit).Version        := Source_Checksum (Sind);
 
       else
-         --  Duplicate information from instance unit, for the body
-         --  The unit node N has been rewritten as a body, but it was placed
-         --  in the units table when first loaded as a declaration.
+         --  Duplicate information from instance unit, for the body. The unit
+         --  node N has been rewritten as a body, but it was placed in the
+         --  units table when first loaded as a declaration.
 
          Units.Table (Units.Last) := Units.Table (Get_Cunit_Unit_Number (N));
          Units.Table (Units.Last).Cunit := N;
@@ -804,11 +804,10 @@ package body Lib.Load is
       Bunit : constant Node_Id := Cunit (Body_Unit);
 
    begin
-      --  The spec is irrelevant if the body is a subprogram body, and the
-      --  spec is other than a subprogram spec or generic subprogram spec.
-      --  Note that the names must be the same, we don't need to check that,
-      --  because we already know that from the fact that the file names are
-      --  the same.
+      --  The spec is irrelevant if the body is a subprogram body, and the spec
+      --  is other than a subprogram spec or generic subprogram spec. Note that
+      --  the names must be the same, we don't need to check that, because we
+      --  already know that from the fact that the file names are the same.
 
       return
          Nkind (Unit (Bunit)) = N_Subprogram_Body
diff --git a/gcc/ada/prj-nmsc.adb b/gcc/ada/prj-nmsc.adb
index 158e75bc174..7349467bce5 100644
--- a/gcc/ada/prj-nmsc.adb
+++ b/gcc/ada/prj-nmsc.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 2000-2008, Free Software Foundation, Inc.         --
+--          Copyright (C) 2000-2009, Free Software Foundation, Inc.         --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -643,13 +643,13 @@ package body Prj.Nmsc is
       Src_Data.Display_File        := Display_File;
       Src_Data.Dependency          := In_Tree.Languages_Data.Table
                                         (Lang_Id).Config.Dependency_Kind;
+      Src_Data.Dep_Name            := Dependency_Name
+                                        (File_Name, Src_Data.Dependency);
       Src_Data.Naming_Exception    := Naming_Exception;
 
       if Src_Data.Compiled and then Src_Data.Object_Exists then
          Src_Data.Object   :=
            Object_Name (File_Name, Config.Object_File_Suffix);
-         Src_Data.Dep_Name :=
-           Dependency_Name (File_Name, Src_Data.Dependency);
          Src_Data.Switches := Switches_Name (File_Name);
       end if;
 
diff --git a/gcc/ada/s-bitops.adb b/gcc/ada/s-bitops.adb
index 1cb875642a2..a49ffed7b88 100644
--- a/gcc/ada/s-bitops.adb
+++ b/gcc/ada/s-bitops.adb
@@ -209,7 +209,7 @@ package body System.Bit_Ops is
 
    procedure Raise_Error is
    begin
-      raise Constraint_Error with "unequal lengths in logical operation";
+      raise Constraint_Error;
    end Raise_Error;
 
 end System.Bit_Ops;
diff --git a/gcc/ada/s-bitops.ads b/gcc/ada/s-bitops.ads
index 8698866a12f..b7818097738 100644
--- a/gcc/ada/s-bitops.ads
+++ b/gcc/ada/s-bitops.ads
@@ -31,6 +31,8 @@
 
 --  Operations on packed bit strings
 
+pragma Compiler_Unit;
+
 with System;
 
 package System.Bit_Ops is
diff --git a/gcc/ada/s-stalib.ads b/gcc/ada/s-stalib.ads
index fb58642d01e..d77da263f16 100644
--- a/gcc/ada/s-stalib.ads
+++ b/gcc/ada/s-stalib.ads
@@ -50,7 +50,6 @@ pragma Polling (Off);
 --  We must turn polling off for this unit, because otherwise we get
 --  elaboration circularities with Ada.Exceptions if polling is on.
 
-with System;
 with Ada.Unchecked_Conversion;
 
 package System.Standard_Library is