[multiple changes]

2012-02-08  Vincent Celier  <celier@adacore.com>

	* gcc-interface/Make-lang.in: Add g-byorma.o to gnatbind objects
	(g-buorma is now imported by sinput).
	Update dependencies.
	* scn.adb (Initialize_Scanner): Call Check_For_BOM
	* sinput-p.adb (Source_File_Is_Subunit): Call Check_For_BOM
	* sinput.adb: New procedure Check_For_BOM
	* sinput.ads: New procedure Check_For_BOM

2012-02-08  Vincent Pucci  <pucci@adacore.com>

	* impunit.adb: Dimension package names updated
	* Makefile.rtl: s-dim added
	* sem_dim.adb (Is_Procedure_Put_Call): minor changes
	(Is_Dim_IO_Package_Instantiation): minor changes
	* sem_dim.ads: minor changes in comments
	* snames.ads-tmpl: Name_Dim added Name_Dim_Float_IO and
	Name_Dim_Integer_IO removed
	* s-dim.ads: New package. Define the dimension terminology.
	* s-diflio.adb, s-diinio.adb, s-dimkio.ads, s-dimmks.ads,
	* s-dmotpr.ads: Package names updated.
	* s-diflio.ads, s-diinio.ads: Documentation added and package
	names updated.

2012-02-08  Gary Dismukes  <dismukes@adacore.com>

	* gcc-interface/utils2.c (build_call_alloc_dealloc_proc): Revise test
	for storage pools to test for an underlying record type rather than
	testing Is_Tagged_Type, so that simple storage pools will be handled
	the same as normal Ada storage pools.

From-SVN: r184004

1 files changed, 17 insertions, 14 deletions

diff --git a/gcc/ada/sem_dim.adb b/gcc/ada/sem_dim.adb
index f016c30..bb81a47 100644
--- a/gcc/ada/sem_dim.adb
+++ b/gcc/ada/sem_dim.adb
@@ -2126,7 +2126,7 @@ package body Sem_Dim is
    -- Expand_Put_Call_With_Dimension_Symbol --
    -------------------------------------------
 
-   --  For procedure Put defined in System.Dim_Float_IO/System.Dim_Integer_IO,
+   --  For procedure Put defined in System.Dim.Float_IO/System.Dim.Integer_IO,
    --  the default string parameter must be rewritten to include the dimension
    --  symbols in the output of a dimensioned object.
 
@@ -2175,8 +2175,8 @@ package body Sem_Dim is
 
       function Is_Procedure_Put_Call return Boolean;
       --  Return True if the current call is a call of an instantiation of a
-      --  procedure Put defined in the package System.Dim_Float_IO and
-      --  System.Dim_Integer_IO.
+      --  procedure Put defined in the package System.Dim.Float_IO and
+      --  System.Dim.Integer_IO.
 
       function Item_Actual return Node_Id;
       --  Return the item actual parameter node in the put call
@@ -2240,16 +2240,17 @@ package body Sem_Dim is
             then
                Ent := Cunit_Entity (Get_Source_Unit (Ent));
 
-               --  Verify that the generic package is System.Dim_Float_IO or
-               --  System.Dim_Integer_IO.
+               --  Verify that the generic package is System.Dim.Float_IO or
+               --  System.Dim.Integer_IO.
 
                if Is_Library_Level_Entity (Ent) then
                   Package_Name := Chars (Ent);
 
-                  return
-                    Package_Name = Name_Dim_Float_IO
-                      or else
-                    Package_Name = Name_Dim_Integer_IO;
+                  if Package_Name = Name_Float_IO
+                    or else Package_Name = Name_Integer_IO
+                  then
+                     return Chars (Scope (Ent)) = Name_Dim;
+                  end if;
                end if;
             end if;
          end if;
@@ -2511,11 +2512,13 @@ package body Sem_Dim is
       if Is_Entity_Name (Gen_Id) then
          Ent := Entity (Gen_Id);
 
-         return
-           Is_Library_Level_Entity (Ent)
-             and then
-               (Chars (Ent) = Name_Dim_Float_IO
-                 or else Chars (Ent) = Name_Dim_Integer_IO);
+         if Is_Library_Level_Entity (Ent)
+           and then
+            (Chars (Ent) = Name_Float_IO
+               or else Chars (Ent) = Name_Integer_IO)
+         then
+            return Chars (Scope (Ent)) = Name_Dim;
+         end if;
       end if;
 
       return False;