diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7c2647e317..f676c3f3ea 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-29  Joel Brobecker  <brobecker@adacore.com>
+
+	* rs6000-nat.c (rs6000_ptrace32): Cast "addr" to "uintptr_t"
+	instead of "long long" in call to ptrace64.
+
 2013-08-29  Andrew Burgess  <aburgess@broadcom.com>
 
 	* mi/mi-interp.c (mi_command_loop): Change signature to match
diff --git a/gdb/rs6000-nat.c b/gdb/rs6000-nat.c
index 804b31680b..374976e25a 100644
--- a/gdb/rs6000-nat.c
+++ b/gdb/rs6000-nat.c
@@ -132,7 +132,7 @@ static int
 rs6000_ptrace32 (int req, int id, int *addr, int data, int *buf)
 {
 #ifdef HAVE_PTRACE64
-  int ret = ptrace64 (req, id, (long long) addr, data, buf);
+  int ret = ptrace64 (req, id, (uintptr_t) addr, data, buf);
 #else
   int ret = ptrace (req, id, (int *)addr, data, buf);
 #endif