From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752828AbcF2INp (ORCPT <rfc822;w@1wt.eu>);
	Wed, 29 Jun 2016 04:13:45 -0400
Received: from mx2.suse.de ([195.135.220.15]:60317 "EHLO mx2.suse.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751334AbcF2INn (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Wed, 29 Jun 2016 04:13:43 -0400
From: Andreas Schwab <schwab@suse.de>
To: Yury Norov <ynorov@caviumnetworks.com>
Cc: <libc-alpha@sourceware.org>, <linux-kernel@vger.kernel.org>,
        <arnd@arndb.de>, <catalin.marinas@arm.com>, <marcus.shawcroft@arm.com>,
        <philb@gnu.org>, <davem@davemloft.net>, <szabolcs.nagy@arm.com>,
        <maxim.kuvyrkov@linaro.org>, <joseph@codesourcery.com>,
        <pinskia@gmail.com>, <bamvor.zhangjian@huawei.com>,
        <fweimer@redhat.com>, <Prasun.Kapoor@cavium.com>,
        <cmetcalf@mellanox.com>, <hjl.tools@gmail.com>,
        <adhemerval.zanella@linaro.org>
Subject: Re: [PATCH 21/23] [AARCH64] Make __SIZEOF_SEM_T 16 for ILP32
References: <1467131978-669-1-git-send-email-ynorov@caviumnetworks.com>
	<1467131978-669-22-git-send-email-ynorov@caviumnetworks.com>
X-Yow: First, I'm going to give you all the ANSWERS to today's test..
 So just plug in your SONY WALKMANS and relax!!
Date: Wed, 29 Jun 2016 09:55:19 +0200
In-Reply-To: <1467131978-669-22-git-send-email-ynorov@caviumnetworks.com>
	(Yury Norov's message of "Tue, 28 Jun 2016 19:39:36 +0300")
Message-ID: <mvmh9ccig48.fsf@hawking.suse.de>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The same can be done for the pthread types, following the x32 example.

Andreas.

diff --git a/sysdeps/aarch64/nptl/bits/pthreadtypes.h b/sysdeps/aarch64/nptl/bits/pthreadtypes.h
index 13984a7..49bb402 100644
--- a/sysdeps/aarch64/nptl/bits/pthreadtypes.h
+++ b/sysdeps/aarch64/nptl/bits/pthreadtypes.h
@@ -21,16 +21,27 @@
 
 #include <endian.h>
 
-#define __SIZEOF_PTHREAD_ATTR_T        64
-#define __SIZEOF_PTHREAD_MUTEX_T       48
-#define __SIZEOF_PTHREAD_MUTEXATTR_T    8
-#define __SIZEOF_PTHREAD_COND_T        48
-#define __SIZEOF_PTHREAD_COND_COMPAT_T 48
-#define __SIZEOF_PTHREAD_CONDATTR_T     8
-#define __SIZEOF_PTHREAD_RWLOCK_T      56
-#define __SIZEOF_PTHREAD_RWLOCKATTR_T   8
-#define __SIZEOF_PTHREAD_BARRIER_T     32
-#define __SIZEOF_PTHREAD_BARRIERATTR_T  8
+#if __ILP32__
+# define __SIZEOF_PTHREAD_ATTR_T        32
+# define __SIZEOF_PTHREAD_MUTEX_T       32
+# define __SIZEOF_PTHREAD_MUTEXATTR_T    4
+# define __SIZEOF_PTHREAD_COND_T        48
+# define __SIZEOF_PTHREAD_CONDATTR_T     4
+# define __SIZEOF_PTHREAD_RWLOCK_T      44
+# define __SIZEOF_PTHREAD_RWLOCKATTR_T   8
+# define __SIZEOF_PTHREAD_BARRIER_T     20
+# define __SIZEOF_PTHREAD_BARRIERATTR_T  4
+#else
+# define __SIZEOF_PTHREAD_ATTR_T        64
+# define __SIZEOF_PTHREAD_MUTEX_T       48
+# define __SIZEOF_PTHREAD_MUTEXATTR_T    8
+# define __SIZEOF_PTHREAD_COND_T        48
+# define __SIZEOF_PTHREAD_CONDATTR_T     8
+# define __SIZEOF_PTHREAD_RWLOCK_T      56
+# define __SIZEOF_PTHREAD_RWLOCKATTR_T   8
+# define __SIZEOF_PTHREAD_BARRIER_T     32
+# define __SIZEOF_PTHREAD_BARRIERATTR_T  8
+#endif
 
 
 /* Thread identifiers.  The structure of the attribute type is not
-- 
2.9.0

-- 
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."