From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:41943)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <rth7680@gmail.com>) id 1UcI8R-0004iZ-1f
	for qemu-devel@nongnu.org; Tue, 14 May 2013 12:31:34 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <rth7680@gmail.com>) id 1UcI8N-00089v-6g
	for qemu-devel@nongnu.org; Tue, 14 May 2013 12:31:30 -0400
Received: from mail-gh0-f175.google.com ([209.85.160.175]:59201)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <rth7680@gmail.com>) id 1UcI8N-00089f-2q
	for qemu-devel@nongnu.org; Tue, 14 May 2013 12:31:27 -0400
Received: by mail-gh0-f175.google.com with SMTP id z19so132161ghb.6
	for <qemu-devel@nongnu.org>; Tue, 14 May 2013 09:31:26 -0700 (PDT)
Sender: Richard Henderson <rth7680@gmail.com>
Message-ID: <519266DA.4080704@twiddle.net>
Date: Tue, 14 May 2013 09:31:22 -0700
From: Richard Henderson <rth@twiddle.net>
MIME-Version: 1.0
References: <1368505980-17151-1-git-send-email-john.rigby@linaro.org>
	<1368505980-17151-10-git-send-email-john.rigby@linaro.org>
In-Reply-To: <1368505980-17151-10-git-send-email-john.rigby@linaro.org>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH v4 09/12] linux-user: Add signal handling
 for AArch64
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: John Rigby <john.rigby@linaro.org>
Cc: 'Peter Maydell <peter.maydell@linaro.org>, Riku Voipio <riku.voipio@iki.fi>, Andreas Schwab <schwab@suse.de>, qemu-devel@nongnu.org, 'Alexander Graf <agraf@suse.de>

On 05/13/2013 09:32 PM, John Rigby wrote:
> +#ifdef TARGET_AARCH64
> +   return state->sp;
> +#else
>     return state->regs[13];
> +#endif

Merge error.  You changed that to xreg[31].


r~