re PR ada/82384 (s-taprop.adb failed to compile for x32)

	PR ada/82384
	* libgnarl/s-linux__x32.ads (suseconds_t): New subtype.
	(time_t): Change from derived type to subtype.
	(timeval): Use suseconds_t for tv_usec.
	* libgnarl/s-osinte__x32.adb (To_Timespec): Remove use type clause.

From-SVN: r253366

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 848b88faec3cc612eeca4203e10f61237388a228..86ff9ed9465b4ebf3af32d524508c01877945516 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,12 @@
+2017-10-02  Eric Botcazou  <ebotcazou@adacore.com>
+            Pierre-Marie de Rodat  <derodat@adacore.com>
+
+       PR ada/82384
+       * libgnarl/s-linux__x32.ads (suseconds_t): New subtype.
+       (time_t): Change from derived type to subtype.
+       (timeval): Use suseconds_t for tv_usec.
+       * libgnarl/s-osinte__x32.adb (To_Timespec): Remove use type clause.
+
 2017-10-02  Richard Sandiford  <richard.sandiford@linaro.org>
 
        * gcc-interface/decl.c (annotate_value): Use wi::to_widest when
@@ -16,7 +25,7 @@
        * doc/gnat_ugn/building_executable_programs_with_gnat.rst,
        doc/gnat_ugn/the_gnat_compilation_model.rst: Avoid use of single colon
        in comment markup.
-       * gnat_ugn.texi: Regenerate.
+       * gnat_ugn.texi: Regenerate.
 
 2017-09-29  Justin Squirek  <squirek@adacore.com>
 

diff --git a/gcc/ada/libgnarl/s-linux__x32.ads b/gcc/ada/libgnarl/s-linux__x32.ads
index 823d806ea844ede02618f75bc825041f245d8760..ad9a7b9fc30131bcf8da946d11424d78950a49b0 100644 (file)
--- a/gcc/ada/libgnarl/s-linux__x32.ads
+++ b/gcc/ada/libgnarl/s-linux__x32.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                  S p e c                                 --
 --                                                                          --
---             Copyright (C) 2013-2017, Free Software Foundation, Inc.      --
+--          Copyright (C) 2013-2017, Free Software Foundation, Inc.         --
 --
 --                                                                          --
 -- GNARL is free software; you can  redistribute it  and/or modify it under --
@@ -45,8 +45,9 @@ package System.Linux is
    -- Time --
    ----------
 
-   type time_t       is new Long_Long_Integer;
-   subtype clockid_t is Interfaces.C.int;
+   subtype suseconds_t is Long_Long_Integer;
+   subtype time_t      is Long_Long_Integer;
+   subtype clockid_t   is Interfaces.C.int;
 
    type timespec is record
       tv_sec  : time_t;
@@ -56,7 +57,7 @@ package System.Linux is
 
    type timeval is record
       tv_sec  : time_t;
-      tv_usec : Long_Long_Integer;
+      tv_usec : suseconds_t;
    end record;
    pragma Convention (C, timeval);
 

diff --git a/gcc/ada/libgnarl/s-osinte__x32.adb b/gcc/ada/libgnarl/s-osinte__x32.adb
index a2874be3d69d28edef53c92334bf7bfd9062e6af..6bb80cd6d0f1ae3e47b0279ff17fe51789eb5a78 100644 (file)
--- a/gcc/ada/libgnarl/s-osinte__x32.adb
+++ b/gcc/ada/libgnarl/s-osinte__x32.adb
@@ -90,7 +90,6 @@ package body System.OS_Interface is
       S : time_t;
       F : Duration;
 
-      use type System.Linux.time_t;
    begin
       S := time_t (Long_Long_Integer (D));
       F := D - Duration (S);