From: Eric Botcazou <ebotcazou@adacore.com>
Date: Thu, 13 Sep 2018 10:14:39 +0000 (+0000)
Subject: backport: s-osinte-solaris.ads (upad64_t): New private type.
X-Git-Tag: releases/gcc-7.4.0~162
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5d5bf9962f3831664b130452e2b827e8dd9217b;p=thirdparty%2Fgcc.git

backport: s-osinte-solaris.ads (upad64_t): New private type.

	Backport from mainline
	2018-07-31  Eric Botcazou  <ebotcazou@adacore.com>

	* s-osinte-solaris.ads (upad64_t): New private type.
	(mutex_t): Use it for 'lock' and 'data' components.
	(cond_t): Likewise for 'data' and use single 'flags' component.

From-SVN: r264266
---

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index fe6c3e1e6ff9..7cefa12f305f 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,12 @@
+2018-09-13  Eric Botcazou  <ebotcazou@adacore.com>
+
+	Backport from mainline
+	2018-07-31  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* s-osinte-solaris.ads (upad64_t): New private type.
+	(mutex_t): Use it for 'lock' and 'data' components.
+	(cond_t): Likewise for 'data' and use single 'flags' component.
+
 2018-07-17  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* gcc-interface/decl.c (choices_to_gnu): Rename parameters.  Deal with
diff --git a/gcc/ada/s-osinte-solaris.ads b/gcc/ada/s-osinte-solaris.ads
index b4baa6d49988..b1b197abd2ce 100644
--- a/gcc/ada/s-osinte-solaris.ads
+++ b/gcc/ada/s-osinte-solaris.ads
@@ -536,17 +536,18 @@ private
    end record;
    pragma Convention (C, record_type_3);
 
+   type upad64_t is new Interfaces.Unsigned_64;
+
    type mutex_t is record
       flags : record_type_3;
-      lock  : String (1 .. 8);
-      data  : String (1 .. 8);
+      lock  : upad64_t;
+      data  : upad64_t;
    end record;
    pragma Convention (C, mutex_t);
 
    type cond_t is record
-      flag  : array_type_9;
-      Xtype : unsigned_long;
-      data  : String (1 .. 8);
+      flags : record_type_3;
+      data  : upad64_t;
    end record;
    pragma Convention (C, cond_t);