1 files changed, 39 insertions, 19 deletions
diff --git a/gcc/ada/libgnat/a-tideio.adb b/gcc/ada/libgnat/a-tideio.adb
index 0624c2c..f71cf2d 100644
--- a/gcc/ada/libgnat/a-tideio.adb
+++ b/gcc/ada/libgnat/a-tideio.adb
@@ -29,11 +29,35 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
+with Interfaces;
 with Ada.Text_IO.Decimal_Aux;
+with System.Img_Decimal_32;  use System.Img_Decimal_32;
+with System.Img_Decimal_64;  use System.Img_Decimal_64;
+with System.Val_Decimal_32;  use System.Val_Decimal_32;
+with System.Val_Decimal_64;  use System.Val_Decimal_64;
 
 package body Ada.Text_IO.Decimal_IO is
 
-   package Aux renames Ada.Text_IO.Decimal_Aux;
+   subtype Int32 is Interfaces.Integer_32;
+   subtype Int64 is Interfaces.Integer_64;
+
+   package Aux32 is new
+     Ada.Text_IO.Decimal_Aux
+       (Int32,
+        Scan_Decimal32,
+        Set_Image_Decimal32);
+
+   package Aux64 is new
+     Ada.Text_IO.Decimal_Aux
+       (Int64,
+        Scan_Decimal64,
+        Set_Image_Decimal64);
+
+   Need64 : constant Boolean := Num'Size > 32;
+   --  Throughout this generic body, we distinguish between the case where type
+   --  Int32 is acceptable and where type Int64 is needed. This Boolean is used
+   --  to test for these cases and since it is a constant, only code for the
+   --  relevant case will be included in the instance.
 
    Scale : constant Integer := Num'Scale;
 
@@ -49,10 +73,10 @@ package body Ada.Text_IO.Decimal_IO is
       pragma Unsuppress (Range_Check);
 
    begin
-      if Num'Size > Integer'Size then
-         Item := Num'Fixed_Value (Aux.Get_LLD (File, Width, Scale));
+      if Need64 then
+         Item := Num'Fixed_Value (Aux64.Get (File, Width, Scale));
       else
-         Item := Num'Fixed_Value (Aux.Get_Dec (File, Width, Scale));
+         Item := Num'Fixed_Value (Aux32.Get (File, Width, Scale));
       end if;
 
    exception
@@ -75,12 +99,10 @@ package body Ada.Text_IO.Decimal_IO is
       pragma Unsuppress (Range_Check);
 
    begin
-      if Num'Size > Integer'Size then
-         Item := Num'Fixed_Value
-                   (Aux.Gets_LLD (From, Last'Unrestricted_Access, Scale));
+      if Need64 then
+         Item := Num'Fixed_Value (Aux64.Gets (From, Last, Scale));
       else
-         Item := Num'Fixed_Value
-                   (Aux.Gets_Dec (From, Last'Unrestricted_Access, Scale));
+         Item := Num'Fixed_Value (Aux32.Gets (From, Last, Scale));
       end if;
 
    exception
@@ -99,13 +121,12 @@ package body Ada.Text_IO.Decimal_IO is
       Exp  : Field := Default_Exp)
    is
    begin
-      if Num'Size > Integer'Size then
-         Aux.Put_LLD
-           (File, Long_Long_Integer'Integer_Value (Item),
-            Fore, Aft, Exp, Scale);
+      if Need64 then
+         Aux64.Put
+           (File, Int64'Integer_Value (Item), Fore, Aft, Exp, Scale);
       else
-         Aux.Put_Dec
-           (File, Integer'Integer_Value (Item), Fore, Aft, Exp, Scale);
+         Aux32.Put
+           (File, Int32'Integer_Value (Item), Fore, Aft, Exp, Scale);
       end if;
    end Put;
 
@@ -126,11 +147,10 @@ package body Ada.Text_IO.Decimal_IO is
       Exp  : Field := Default_Exp)
    is
    begin
-      if Num'Size > Integer'Size then
-         Aux.Puts_LLD
-           (To, Long_Long_Integer'Integer_Value (Item), Aft, Exp, Scale);
+      if Need64 then
+         Aux64.Puts (To, Int64'Integer_Value (Item), Aft, Exp, Scale);
       else
-         Aux.Puts_Dec (To, Integer'Integer_Value (Item), Aft, Exp, Scale);
+         Aux32.Puts (To, Int32'Integer_Value (Item), Aft, Exp, Scale);
       end if;
    end Put;