about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/microblaze/jmpbuf-unwind.h4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2a925cd2a8..65664015fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 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
 	removed.
 	(READ_THREAD_POINTER): Use __microblaze_thread_area instead.
diff --git a/sysdeps/microblaze/jmpbuf-unwind.h b/sysdeps/microblaze/jmpbuf-unwind.h
index 000390ce5c..de96ee2308 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) \