From: Iain Buclaw <ibuclaw@gdcproject.org>
Date: Mon, 27 Apr 2020 21:51:50 +0000 (+0200)
Subject: libphobos: Fix struct layout of addrinfo on sparc-*-solaris*
X-Git-Tag: misc/first-auto-changelog-9~78
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=253b6edd2fc3499f1f2bd0f2d55cd47f852cfa09;p=thirdparty%2Fgcc.git

libphobos: Fix struct layout of addrinfo on sparc-*-solaris*

Comparing the struct addrinfo declarations in <netdb.h>

    struct addrinfo {
	...
    #ifdef __sparcv9
        int _ai_pad;
    #endif /* __sparcv9 */
	...
    };

In the extern(C) core.sys bindings, there's a mismatch here; the system
version has no _aid_pad member on 32-bit SPARC.

libphobos/ChangeLog:

	PR d/90718
	* libdruntime/core/sys/posix/netdb.d (Solaris): Include _ai_pad member
	in struct addrinfo only when targeting SPARC64.
---

diff --git a/libphobos/ChangeLog b/libphobos/ChangeLog
index af379c8c4c5d..67d02036def5 100644
--- a/libphobos/ChangeLog
+++ b/libphobos/ChangeLog
@@ -1,3 +1,9 @@
+2020-04-27  Iain Buclaw  <ibuclaw@gdcproject.org>
+
+	PR d/90718
+	* libdruntime/core/sys/posix/netdb.d (Solaris): Include _ai_pad member
+	in struct addrinfo only when targeting SPARC64.
+
 2020-04-27  Iain Buclaw  <ibuclaw@gdcproject.org>
 
 	PR d/90719
diff --git a/libphobos/libdruntime/core/sys/posix/netdb.d b/libphobos/libdruntime/core/sys/posix/netdb.d
index 327387f68ea3..f1251839b164 100644
--- a/libphobos/libdruntime/core/sys/posix/netdb.d
+++ b/libphobos/libdruntime/core/sys/posix/netdb.d
@@ -743,9 +743,7 @@ else version (Solaris)
         int ai_socktype;
         int ai_protocol;
 
-        version (SPARC)
-            int _ai_pad;
-        else version (SPARC64)
+        version (SPARC64)
             int _ai_pad;
 
         socklen_t ai_addrlen;