From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: Re: [PATCH v5 01/19] HACK Date: Wed, 13 Nov 2013 20:15:37 +0000 Message-ID: <1384373737.7059.0.camel@dagon.hellion.org.uk> References: <1384366234.29080.8.camel@kazak.uk.xensource.com> <1384366285-29277-1-git-send-email-ian.campbell@citrix.com> <5283C1B5.3030808@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <5283C1B5.3030808@linaro.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Julien Grall Cc: stefano.stabellini@eu.citrix.com, tim@xen.org, xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org On Wed, 2013-11-13 at 18:15 +0000, Julien Grall wrote: > I guess it's not part of the series ? :) I'm not having much luck with git send-email recently, am I! This is a workaround for a bug in the aarch64 glibc which leaks these symbols when including standard headers. I've filed a bug in launchpad ages ago... > > On 11/13/2013 06:11 PM, Ian Campbell wrote: > > --- > > xen/include/public/arch-arm.h | 11 ++++++++++- > > 1 file changed, 10 insertions(+), 1 deletion(-) > > > > diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h > > index 746df8e..7d452d8 100644 > > --- a/xen/include/public/arch-arm.h > > +++ b/xen/include/public/arch-arm.h > > @@ -218,7 +218,16 @@ typedef uint64_t xen_callback_t; > > #define PSR_MODE_SYS 0x1f > > > > /* 64 bit modes */ > > -#ifdef CONFIG_ARM_64 > > +#ifdef __aarch64__ > > +#undef PSR_MODE_BIT > > +#undef PSR_MODE_EL3h > > +#undef PSR_MODE_EL3t > > +#undef PSR_MODE_EL2h > > +#undef PSR_MODE_EL2t > > +#undef PSR_MODE_EL1h > > +#undef PSR_MODE_EL1t > > +#undef PSR_MODE_EL0t > > + > > #define PSR_MODE_BIT 0x10 /* Set iff AArch32 */ > > #define PSR_MODE_EL3h 0x0d > > #define PSR_MODE_EL3t 0x0c > > >