From patchwork Fri Jan 9 07:48:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Holsgrove X-Patchwork-Id: 4581 Received: (qmail 6571 invoked by alias); 9 Jan 2015 07:48:59 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 6555 invoked by uid 89); 9 Jan 2015 07:48:57 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.4 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 X-HELO: na01-bl2-obe.outbound.protection.outlook.com From: David Holsgrove To: CC: Subject: [COMMITTED PATCH] MicroBlaze: Fix integer-pointer conversion warning Date: Fri, 9 Jan 2015 17:48:34 +1000 X-RCIS-Action: ALLOW Message-ID: <9e91b3c8f3404be1a83d5b8e5194304f@BY2FFO11FD003.protection.gbl> X-EOPAttributedMessage: 0 Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.83 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.83; helo=xsj-pvapsmtpgw01; Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=david.holsgrove@xilinx.com; X-Forefront-Antispam-Report: CIP:149.199.60.83; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(438002)(377424004)(199003)(54534003)(189002)(50226001)(4396001)(2351001)(89996001)(21056001)(48376002)(87936001)(229853001)(106466001)(107046002)(50986999)(6806004)(108616004)(74316001)(19580405001)(19580395003)(31966008)(53416004)(46102003)(47776003)(86362001)(120916001)(64706001)(99396003)(20776003)(110136001)(92566001)(92726002)(104016003)(50466002)(77156002)(62966003)(450100001)(107986001)(24736002)(23106004); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2FFO11HUB068; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; MLV:sfv; PTR:unknown-60-83.xilinx.com; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Antispam: UriScan:; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;SRVR:BY2FFO11HUB068; X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA: BCL:0; PCL:0; RULEID:(601004); SRVR:BY2FFO11HUB068; X-Forefront-PRVS: 04519BA941 X-Exchange-Antispam-Report-CFA: BCL:0;PCL:0;RULEID:;SRVR:BY2FFO11HUB068; X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jan 2015 07:48:52.2506 (UTC) X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.83] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2FFO11HUB068 2015-01-06 David Holsgrove * sysdeps/microblaze/nptl/tls.h (TLS_INIT_TP): Use NULL instead of 0. Signed-off-by: David Holsgrove --- ChangeLog | 5 +++++ sysdeps/microblaze/nptl/tls.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0ad34c3..834e23c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-01-09 David Holsgrove + + * sysdeps/microblaze/nptl/tls.h (TLS_INIT_TP): Use NULL instead + of 0. + 2015-01-08 Roland McGrath * sysdeps/pthread/timer_routines.c: Fix include to use diff --git a/sysdeps/microblaze/nptl/tls.h b/sysdeps/microblaze/nptl/tls.h index 5b13c82..fb4a71a 100644 --- a/sysdeps/microblaze/nptl/tls.h +++ b/sysdeps/microblaze/nptl/tls.h @@ -99,7 +99,7 @@ static inline void *__microblaze_get_thread_area (void) /* Code to initially initialize the thread pointer. r21 is reserved for thread pointer. */ # define TLS_INIT_TP(tcbp) \ - ({ __asm __volatile ("or r21,r0,%0" : : "r" ((void *)tcbp)); 0; }) + ({ __asm __volatile ("or r21,r0,%0" : : "r" ((void *)tcbp)); NULL; }) # define TLS_DEFINE_INIT_TP(tp, pd) void *tp = (pd) + 1