diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/common/linux-ptrace.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8ba8772..3928ac6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2012-01-08 Mike Frysinger <vapier@gentoo.org> + + * common/linux-ptrace.c (linux_ptrace_test_ret_to_nx) [__x86_64__]: + Cast return_address to 64bits. + 2013-01-08 Hui Zhu <hui_zhu@mentor.com> * printcmd.c: Remove define of function output_command. diff --git a/gdb/common/linux-ptrace.c b/gdb/common/linux-ptrace.c index 761ef59..886be80 100644 --- a/gdb/common/linux-ptrace.c +++ b/gdb/common/linux-ptrace.c @@ -114,7 +114,8 @@ linux_ptrace_test_ret_to_nx (void) ".globl linux_ptrace_test_ret_to_nx_instr;" "linux_ptrace_test_ret_to_nx_instr:" "ret" - : : "r" (return_address) : "%rsp", "memory"); + : : "r" ((uint64_t) (uintptr_t) return_address) + : "%rsp", "memory"); #else # error "!__i386__ && !__x86_64__" #endif |