gdb: x86: fix x32 builds with inline asm

We need to cast the pointer up to 64bits so that the push works on x32
targets.  For 64bit targets, this makes no difference.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8ba8772c244998a9063f99380bcb1bc0b543328e..3928ac63f882dd985b2f2874e6652c330fcc2831 100644 (file)
--- 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 761ef597bfe8cd4b71ba542fe605c83ba9e681ee..886be809d1d1aa46aa7ddf17bc2cac120051874c 100644 (file)
--- 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