From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26274 invoked by alias); 8 Jan 2013 14:59:07 -0000 Received: (qmail 26214 invoked by uid 22791); 8 Jan 2013 14:59:05 -0000 X-SWARE-Spam-Status: No, hits=-5.0 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from smtp.gentoo.org (HELO smtp.gentoo.org) (140.211.166.183) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 08 Jan 2013 14:58:57 +0000 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 7674133DA7B; Tue, 8 Jan 2013 14:58:56 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Cc: hjl.tools@gmail.com, jan.kratochvil@redhat.com Subject: [PATCH] gdb: x86: fix x32 builds with inline asm Date: Tue, 08 Jan 2013 14:59:00 -0000 Message-Id: <1357657280-24150-1-git-send-email-vapier@gentoo.org> X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2013-01/txt/msg00129.txt.bz2 The inline assembly fails with x32 targets due to pushq used with a 32bit register. Since the assembler can do the right thing with a "push" insn and a 32bit or 64bit register (i.e. it'll pushl or pushq as needed), just use that insn. Signed-off-by: Mike Frysinger 2012-01-08 Mike Frysinger * common/linux-ptrace.c (linux_ptrace_test_ret_to_nx): Change pushl to push in i386 inline asm and %esp to sp. Delete __i386__ check and __x86_64__ inline asm. --- Note: I'm not 100% on the "sp" constraint. Seems to work, and reading the gcc constraints list looks like it aliases sp/esp/rsp to the same thing. gdb/common/linux-ptrace.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/gdb/common/linux-ptrace.c b/gdb/common/linux-ptrace.c index 761ef59..abb502c 100644 --- a/gdb/common/linux-ptrace.c +++ b/gdb/common/linux-ptrace.c @@ -103,21 +103,11 @@ linux_ptrace_test_ret_to_nx (void) strerror (errno)); else { -#if defined __i386__ - asm volatile ("pushl %0;" - ".globl linux_ptrace_test_ret_to_nx_instr;" - "linux_ptrace_test_ret_to_nx_instr:" - "ret" - : : "r" (return_address) : "%esp", "memory"); -#elif defined __x86_64__ - asm volatile ("pushq %0;" + asm volatile ("push %0;" ".globl linux_ptrace_test_ret_to_nx_instr;" "linux_ptrace_test_ret_to_nx_instr:" "ret" - : : "r" (return_address) : "%rsp", "memory"); -#else -# error "!__i386__ && !__x86_64__" -#endif + : : "r" (return_address) : "sp", "memory"); gdb_assert_not_reached ("asm block did not terminate"); } -- 1.8.0.2