m68k: avoid pointer to integer conversion warning

diff --git a/ChangeLog b/ChangeLog
index afc58cd..ff239f8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-13  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * sysdeps/m68k/jmpbuf-unwind.h (_JMPBUF_UNWINDS, _jmpbuf_sp): Cast
+       __sp to uintptr_t.
+
 2014-06-13  Andi Kleen  <ak@linux.intel.com>
 
         * sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S: Remove.

diff --git a/sysdeps/m68k/jmpbuf-unwind.h b/sysdeps/m68k/jmpbuf-unwind.h
index 8739abb..c0c62bc 100644 (file)
--- a/sysdeps/m68k/jmpbuf-unwind.h
+++ b/sysdeps/m68k/jmpbuf-unwind.h
@@ -23,7 +23,7 @@
 /* Test if longjmp to JMPBUF would unwind the frame
    containing a local variable at ADDRESS.  */
 #define _JMPBUF_UNWINDS(jmpbuf, address, demangle)             \
-  ((void *) (address) < (void *) demangle ((jmpbuf)->__sp))
+  ((void *) (address) < (void *) demangle ((uintptr_t) (jmpbuf)->__sp))
 
 #define _JMPBUF_CFA_UNWINDS_ADJ(_jmpbuf, _context, _adj) \
   _JMPBUF_UNWINDS_ADJ (_jmpbuf, (void *) _Unwind_GetCFA (_context), _adj)
@@ -31,7 +31,7 @@
 static inline uintptr_t __attribute__ ((unused))
 _jmpbuf_sp (__jmp_buf regs)
 {
-  uintptr_t sp = regs[0].__sp;
+  uintptr_t sp = (uintptr_t) regs[0].__sp;
 #ifdef PTR_DEMANGLE
   PTR_DEMANGLE (sp);
 #endif