summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Holsgrove <david.holsgrove@xilinx.com>2014-12-24 11:55:49 +1000
committerDavid Holsgrove <david.holsgrove@xilinx.com>2015-01-09 14:30:11 +1000
commitcaff764e8c3cddb21b62601773bdae4806a9c541 (patch)
tree3f6a7945d387c33d536c2ff2e4a305f55bb85003
parentc97d27f1bb551cb084836463c98be9bb41fd4ae3 (diff)
downloadglibc-caff764e8c3cddb21b62601773bdae4806a9c541.tar.gz
glibc-caff764e8c3cddb21b62601773bdae4806a9c541.tar.xz
glibc-caff764e8c3cddb21b62601773bdae4806a9c541.zip
MicroBlaze: Fix integer-pointer conversion warning
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>
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/microblaze/nptl/tls.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0ad34c309e..834e23c6da 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 5b13c82eb2..fb4a71a8c3 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