From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59996) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WftBD-0004oF-FQ for qemu-devel@nongnu.org; Thu, 01 May 2014 11:45:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WftB5-0006r4-0i for qemu-devel@nongnu.org; Thu, 01 May 2014 11:45:47 -0400 Received: from mail-qa0-x236.google.com ([2607:f8b0:400d:c00::236]:46343) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WftB4-0006qu-Nk for qemu-devel@nongnu.org; Thu, 01 May 2014 11:45:38 -0400 Received: by mail-qa0-f54.google.com with SMTP id s7so3068044qap.41 for ; Thu, 01 May 2014 08:45:38 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Thu, 1 May 2014 08:44:31 -0700 Message-Id: <1398959087-23590-11-git-send-email-rth@twiddle.net> In-Reply-To: <1398959087-23590-1-git-send-email-rth@twiddle.net> References: <1398959087-23590-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH 10/26] tcg-ppc64: Use the correct test in tcg_out_call List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: av1474@comtv.ru The correct test uses the _CALL_AIX macro, not a host-specific macro. Signed-off-by: Richard Henderson --- tcg/ppc64/tcg-target.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tcg/ppc64/tcg-target.c b/tcg/ppc64/tcg-target.c index a198a70..31c3a7a 100644 --- a/tcg/ppc64/tcg-target.c +++ b/tcg/ppc64/tcg-target.c @@ -1089,9 +1089,7 @@ void ppc_tb_set_jmp_target(uintptr_t jmp_addr, uintptr_t addr) static void tcg_out_call(TCGContext *s, tcg_insn_unit *target) { -#ifdef __APPLE__ - tcg_out_b(s, LK, target); -#else +#ifdef _CALL_AIX /* Look through the descriptor. If the branch is in range, and we don't have to spend too much effort on building the toc. */ void *tgt = ((void **)target)[0]; @@ -1117,6 +1115,8 @@ static void tcg_out_call(TCGContext *s, tcg_insn_unit *target) tcg_out_ld(s, TCG_TYPE_PTR, TCG_REG_R2, TCG_REG_R2, ofs + SZP); tcg_out32(s, BCCTR | BO_ALWAYS | LK); } +#else + tcg_out_b(s, LK, target); #endif } -- 1.9.0