From: David Holsgrove <david.holsgrove@xilinx.com>
Date: Mon, 29 Dec 2014 03:54:19 +0000 (+1000)
Subject: MicroBlaze: Avoid pointer to integer conversion warning
X-Git-Tag: glibc-2.21~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf71e44f1b127335da33d3845f21b62fa17c3108;p=thirdparty%2Fglibc.git

MicroBlaze: Avoid pointer to integer conversion warning

2015-01-06  David Holsgrove <david.holsgrove@xilinx.com>

  * sysdeps/microblaze/jmpbuf-unwind.h (_jmpbuf_sp): Declare SP as void
    pointer and cast to uintptr_t.

Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
---

diff --git a/ChangeLog b/ChangeLog
index 2a925cd2a83..65664015fdc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-09  David Holsgrove  <david.holsgrove@xilinx.com>
+
+	* sysdeps/microblaze/jmpbuf-unwind.h (_jmpbuf_sp): Declare SP as void
+	pointer and cast to uintptr_t.
+
 2015-01-09  David Holsgrove  <david.holsgrove@xilinx.com>
 
 	* sysdeps/microblaze/nptl/tls.h (__microblaze_get_thread_area): Function
diff --git a/sysdeps/microblaze/jmpbuf-unwind.h b/sysdeps/microblaze/jmpbuf-unwind.h
index 000390ce5cb..de96ee2308d 100644
--- a/sysdeps/microblaze/jmpbuf-unwind.h
+++ b/sysdeps/microblaze/jmpbuf-unwind.h
@@ -32,11 +32,11 @@
 static inline uintptr_t __attribute__ ((unused))
 _jmpbuf_sp (__jmp_buf regs)
 {
-  uintptr_t sp = regs[0].__sp;
+  void *sp = (void *) regs[0].__sp;
 #ifdef PTR_DEMANGLE
   PTR_DEMANGLE (sp);
 #endif
-  return sp;
+  return (uintptr_t) sp;
 }
 
 #define _JMPBUF_UNWINDS_ADJ(_jmpbuf, _address, _adj) \