From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756699AbbI2WQf (ORCPT ); Tue, 29 Sep 2015 18:16:35 -0400 Received: from mail-bl2on0100.outbound.protection.outlook.com ([65.55.169.100]:37475 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756344AbbI2WQK (ORCPT ); Tue, 29 Sep 2015 18:16:10 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Yuri.Norov@caviumnetworks.com; From: Yury Norov To: , , , , , CC: , , , , , Yury Norov Subject: [PATCH v5 06/23] arm64:uapi: set __BITS_PER_LONG correctly for ILP32 and LP64 Date: Wed, 30 Sep 2015 01:14:03 +0300 Message-ID: <1443564860-31208-7-git-send-email-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1443564860-31208-1-git-send-email-ynorov@caviumnetworks.com> References: <1443564860-31208-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [91.78.158.8] X-ClientProxiedBy: DB5PR02CA0030.eurprd02.prod.outlook.com (25.161.237.40) To BY2PR07MB613.namprd07.prod.outlook.com (10.141.222.144) X-Microsoft-Exchange-Diagnostics: 1;BY2PR07MB613;2:lkr+QU1urlm7lfxELLHr5V/TBP88qbXHTVVvELwfw7xwtqbR6tOBojMhjvJr0wjIxtU5cpw/GqM3eQ4UyBx+9CXd17wj685k6K4p1Bp2tiGk6akeJ2NJBT9yO0t53xuaXsuPk0Cz4L+iYh9ITBXouCQd4Ie9GBhXSed+9wqj17U=;3:LygelIrfx+sTAT4TUy9OeLIRTXZ+ttHTit6oJSowytIOOC49kFE05BSDWDVR9Ga3xLIHjjCZGIG9Y2++8o0cN1y0a5Kh/oi8D4W+WA66DJMPq+QaoVpI0jdul9iM0hqGUYJzVFVzhO2wy/8GN2s6DQ==;25:2SYD85h7j1B2FthJgrx/WsBdV9A9nYorzG5F6VOw2AHfy+8Dz2F9LBKu0OS+aqoWyIui+vnzzIxKK4f6uslv/xmKPnO/+LHBlXdq5y+zCEJXpZ6iLKC57Bv334xO8IrMAKjhLvi+lme8hYcc0NMF4tgb9BCUvRF6PTXaV6UTnvBKqjiNoq+/syGpMLsKJlk3SsTD3wtnC8p2qFV7GK4s9TdLhxifv/rwV5qm2U6jofUiVPVIh+KAVD/YIxBovbyGhN5gjpOha2/CXjL97Ek4lg== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR07MB613; X-Microsoft-Exchange-Diagnostics: 1;BY2PR07MB613;20:r1Xxe6DwprVk8o/nHichMVXsAtpp2sMX2QCH7EHgVnNaZy9F43a7w6JsM8/uz2yk5RHC/Op9SeR+xA8/WjgeiwRMCqvu4dzq6yKGcoKdy+xC6mF2AqQ+cio1DB4zzG5P+FfvzM5hDR7WnjFnQUcwZiwZVa01RZO6d0TV1FCba4X/KXcfz0bgQtYHw3anw73f4+QtF499ZbV/ose8BFRLlSQmLqDuw93qk/4IbdGilgMBjT2fG3ZxBTpD7KpT48tCpqlxYQ+ZoOEgNzi/nSFlKpTZj1jw5yfmJBFvSROJa7Kg5ouJBrTp9ClMMtTCYjj3Dlxg524gYQuhlDS6OS/jQ1ACqW+MK+RyDVtL0L2KXW8PjaSv8dzt/0ZB0kOfUqnFQ3QxyZixmypXQtWF6oCmK1i5vIzrkP+B4mEYTV0o/7YCdi2xi43DhSi1GBaCCgkV7JqHds1IJEhduj7n8P9jzpcZq6WERJ15AatybDehFC4hOLoNUu2ND7y0qkObXUssb4+jP3fzAdylT+R3x5XXW4z2cjJtVMADclW3gX7HN37qeC2Nuh8bElZpvt5yMiyUocu7HTrCPSnXRtpFk1kUVozGctJHxp4CNgVhgjAbH0k= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(520078)(8121501046)(5005006)(3002001);SRVR:BY2PR07MB613;BCL:0;PCL:0;RULEID:;SRVR:BY2PR07MB613; X-Microsoft-Exchange-Diagnostics: 1;BY2PR07MB613;4:ZBWK2sznPzsdAxDdlsY7mITV5uxEI+8ClC6DjPiEDAKFwOWlmtsVGAL1SAdrpr6f2ZvjcQtAvuTok0sLHbg1PgMxU8w1OB9M8HoJHBZ87r7DOlYpGPHqTW+ZmDOudcxlwGuUy9lHZqtNi4+ma05vT30wuiB6QqIDpRq4UzFBeGblPr38wA4KazjopBDPkcN4sQTzhNlQBvhYnbRuGBJw97qtizaszreK2nuFB4fnY5smFsbxZqn7I6N3VwhaqhULk2ua7i0oswIHkAjb93WXUX65RXk9v2fbYy7lr90MJ4/u9V40JEt9EsOSkPClvRSVtvTFqs2HoEkGoZgEJq0qgygTvql451l2xJpz724OaFY= X-Forefront-PRVS: 0714841678 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6069001)(6009001)(189002)(199003)(76176999)(5001960100002)(5001770100001)(66066001)(64706001)(46102003)(47776003)(5001830100001)(5001860100001)(92566002)(107886002)(50986999)(36756003)(97736004)(81156007)(87976001)(4001540100001)(76506005)(42186005)(68736005)(189998001)(77096005)(2950100001)(48376002)(50226001)(5007970100001)(40100003)(101416001)(5004730100002)(62966003)(5003940100001)(2201001)(19580395003)(77156002)(106356001)(105586002)(229853001)(33646002)(122386002)(19580405001)(5008740100001)(50466002)(2101003)(4001430100001);DIR:OUT;SFP:1101;SCL:1;SRVR:BY2PR07MB613;H:localhost;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BY2PR07MB613;23:MpKlqoK/SxRarsM0lJuKLbWiOvRPuRsdpFnHEibD5K?= =?us-ascii?Q?8zrhlkMTq9VjiU7rQWmixvK8hzLvnN2t2fbknz/UhJHTxafIToE0eW5VU5S3?= =?us-ascii?Q?2yhkKcPESNwV4JRY9UjbFhvQhJC5Ft0B7ImQRv6QShlUc9XxXU6eyuif/n4K?= =?us-ascii?Q?el6JmC3h9SAnHEX3AhKfz3aJel7UQEC7Mz+p1mAzQEhWoFfVlzhMR9jzbu+B?= =?us-ascii?Q?4zekLxv1+A7C7XjL6LBWvw0v+TnIlyQRWMI0LIebts55LFjhq2tjq8VzPG81?= =?us-ascii?Q?wOLs3SbAI+F1HGy6im7DKnhWnltJ+pCnSlQglI1lODpqRqeHK3DZ5NdDtk2u?= =?us-ascii?Q?8c4vOrvZIpxVAN0GSyDTV8nHKYfBkFc0DRamTvXDv6+jl7boVrKSxzhwn1Lz?= =?us-ascii?Q?p+2cfaWJuTw+B9N59x3OoFHuBT89R+hruE8wsmDw8cFxEgg1LuJx3Eblm7ZP?= =?us-ascii?Q?1T7cy0E+Ug90K5jzpEcckyLvkXRLi/nYRpOwgj7V28OYuoKsyaU+G2J43yB6?= =?us-ascii?Q?I+eUX6yTCdMnoSzGm5rIn2OV5J+1L63iPWbXagZwl2Y45wf3bRMJGbszXf32?= =?us-ascii?Q?XoRc7ePlXdfQpnCwU0xLaf8P0YHGl0zXG0dwpSvZXd6AoYm/+tC62qtVuCa2?= =?us-ascii?Q?lS93W/5tmo8MHDAiH0U28L/Yqy3L7dgiQXebz4EtLwjTOYHFKVUqbJ8anwsR?= =?us-ascii?Q?sLg0HmqbgLADEMd1HQ2vEDo0OM6AKgipAEnpBnzL8F8RMiVwVJpva1w/qc09?= =?us-ascii?Q?bNvasHxXncwNtcsi8S1ansmW6/GIuC3I8Z5uzothrJ3ToAtlc/IlcgrSEv40?= =?us-ascii?Q?aHw4+fBpQotgmov8yzLZ0PhXjdZhUYvCY+UnNl5LQz2uTzcyPH6GU2qibIap?= =?us-ascii?Q?IGrhfZ9NFyegEeatm17+S1niiBnaGR/uyQX4h5DbeVfabnHDstIjxK3Pa4nV?= =?us-ascii?Q?S7suiJVlCc72H0OSCqjwEa7AMQW/L8q+7vslt0PcHsK9PR7/SCrWbot9kFDs?= =?us-ascii?Q?R/zu+v4V20qftC25OnQwm52d7ZE+wZOqVVpaHPjyNYvhIlqNN93rkv59WBRu?= =?us-ascii?Q?y3+3HtI9C6jAR/m+EVJAg0nqKHHKsIFWijTm12K8wv6sjZit4w9EV2cO6l2d?= =?us-ascii?Q?rjAVnWYA+B9PG3hKgcQmlS2cTWddeuze07ylvHS02rgUd6CM2zI7T8zuWgbJ?= =?us-ascii?Q?3haucIpYrRcQARqPZupsdTJhU/ub9G3pn2Vd+xq5UxaqoOUsVXuRB0k+3oqY?= =?us-ascii?Q?1L3w+tAykVEPTMnfexue1gyrk63Ejir54yBVdHzueN1jGnwkjUsKAuTOX1BP?= =?us-ascii?Q?ajdw6aF7uqD7ld/ATr7yo=3D?= X-Microsoft-Exchange-Diagnostics: 1;BY2PR07MB613;5:rqYt49yrtYMLvXYK/Eb+1g1BCR1nijl+HuzI+wVJAtOJFWvoaJpqTpblPVTqYw40qG237E9r0m0xPnjFBo+wB3/iryvahSgLy+GYGBu7RJUQctQSgBvJbQGaubGuTshKDA1n8mIPa2kg/uExjM95yw==;24:ScdHTNcEzl3eedmlOiaqp0lNDRg20kHJhhqLFNBD1yHVh8t814QcOpyKS4SjF8meFLVUP65Uwirl9z2Tty9hcmcVFOdMLKSd5AfF8fdDXbA=;20:O/tdJvorJrJMmQaaFGZ9qWs5sar/RrVAv6v7e+yVcasABa6lPC7CzpDDIXJBD6Vp+PiZxqc79B0OIby3A530eg== SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Sep 2015 22:16:07.2659 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR07MB613 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andrew Pinski Define __BITS_PER_LONG depending on the ABI used (i.e. check whether __ILP32__ or __LP64__ is defined). This is necessary for glibc to determine the appropriate type definitions for the system call interface. Signed-off-by: Philipp Tomsich Signed-off-by: Christoph Muellner Signed-off-by: Yury Norov diff --git a/arch/arm64/include/uapi/asm/bitsperlong.h b/arch/arm64/include/uapi/asm/bitsperlong.h index fce9c29..4265243 100644 --- a/arch/arm64/include/uapi/asm/bitsperlong.h +++ b/arch/arm64/include/uapi/asm/bitsperlong.h @@ -16,7 +16,14 @@ #ifndef __ASM_BITSPERLONG_H #define __ASM_BITSPERLONG_H -#define __BITS_PER_LONG 64 +#if defined(__LP64__) +/* Assuming __LP64__ will be defined for native ELF64's and not for ILP32. */ +# define __BITS_PER_LONG 64 +#elif defined(__ILP32__) +# define __BITS_PER_LONG 32 +#else +# error "Neither LP64 nor ILP32: unsupported ABI in asm/bitsperlong.h" +#endif #include -- 2.1.4