diff mbox

[COMMITTED] MicroBlaze: Fix integer-pointer conversion warning

Message ID 9e91b3c8f3404be1a83d5b8e5194304f@BY2FFO11FD003.protection.gbl
State Committed
Headers

Commit Message

David Holsgrove Jan. 9, 2015, 7:48 a.m. UTC 
  2015-01-06  David Holsgrove <david.holsgrove@xilinx.com>

    * sysdeps/microblaze/nptl/tls.h (TLS_INIT_TP): Use NULL instead
      of 0.

Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
---
 ChangeLog                     | 5 +++++
 sysdeps/microblaze/nptl/tls.h | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
diff mbox

Patch

diff --git a/ChangeLog b/ChangeLog
index 0ad34c3..834e23c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@ 
+2015-01-09  David Holsgrove  <david.holsgrove@xilinx.com>
+
+	* sysdeps/microblaze/nptl/tls.h (TLS_INIT_TP): Use NULL instead
+	of 0.
+
 2015-01-08  Roland McGrath  <roland@hack.frob.com>
 
 	* sysdeps/pthread/timer_routines.c: Fix <pthreadP.h> 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