Patchwork powerpc/kvm: fix build errors with older toolchains

login
register
mail settings
Submitter Nishanth Aravamudan
Date Aug. 3, 2011, 6:55 p.m.
Message ID <1312397755-15737-1-git-send-email-nacc@us.ibm.com>
Download mbox | patch
Permalink /patch/108316/
State Accepted
Commit 2c740c5841ba69aed216fdf7180f06e693165a7b
Delegated to: Benjamin Herrenschmidt
Headers show

Comments

Nishanth Aravamudan - Aug. 3, 2011, 6:55 p.m.
On a box with gcc 4.3.2, I see errors like:

arch/powerpc/kvm/book3s_hv_rmhandlers.S:1254: Error: Unrecognized opcode: stxvd2x
arch/powerpc/kvm/book3s_hv_rmhandlers.S:1316: Error: Unrecognized opcode: lxvd2x

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
---
 arch/powerpc/kvm/book3s_hv_rmhandlers.S |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Alexander Graf - Aug. 10, 2011, 2:58 p.m.
On 08/03/2011 08:55 PM, Nishanth Aravamudan wrote:
> On a box with gcc 4.3.2, I see errors like:
>
> arch/powerpc/kvm/book3s_hv_rmhandlers.S:1254: Error: Unrecognized opcode: stxvd2x
> arch/powerpc/kvm/book3s_hv_rmhandlers.S:1316: Error: Unrecognized opcode: lxvd2x

Paul, mind to ack?


Alex

> Signed-off-by: Nishanth Aravamudan<nacc@us.ibm.com>
> ---
>   arch/powerpc/kvm/book3s_hv_rmhandlers.S |    4 ++--
>   1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
> index 6dd3358..de29501 100644
> --- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S
> +++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
> @@ -1251,7 +1251,7 @@ BEGIN_FTR_SECTION
>   	reg = 0
>   	.rept	32
>   	li	r6,reg*16+VCPU_VSRS
> -	stxvd2x	reg,r6,r3
> +	STXVD2X(reg,r6,r3)
>   	reg = reg + 1
>   	.endr
>   FTR_SECTION_ELSE
> @@ -1313,7 +1313,7 @@ BEGIN_FTR_SECTION
>   	reg = 0
>   	.rept	32
>   	li	r7,reg*16+VCPU_VSRS
> -	lxvd2x	reg,r7,r4
> +	LXVD2X(reg,r7,r4)
>   	reg = reg + 1
>   	.endr
>   FTR_SECTION_ELSE
Benjamin Herrenschmidt - Aug. 10, 2011, 6:56 p.m.
On Wed, 2011-08-10 at 16:58 +0200, Alexander Graf wrote:
> On 08/03/2011 08:55 PM, Nishanth Aravamudan wrote:
> > On a box with gcc 4.3.2, I see errors like:
> >
> > arch/powerpc/kvm/book3s_hv_rmhandlers.S:1254: Error: Unrecognized opcode: stxvd2x
> > arch/powerpc/kvm/book3s_hv_rmhandlers.S:1316: Error: Unrecognized opcode: lxvd2x
> 
> Paul, mind to ack?

I merged it already :-) It was trivial & annoying enough.

Cheers,
Ben.

> 
> Alex
> 
> > Signed-off-by: Nishanth Aravamudan<nacc@us.ibm.com>
> > ---
> >   arch/powerpc/kvm/book3s_hv_rmhandlers.S |    4 ++--
> >   1 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
> > index 6dd3358..de29501 100644
> > --- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S
> > +++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
> > @@ -1251,7 +1251,7 @@ BEGIN_FTR_SECTION
> >   	reg = 0
> >   	.rept	32
> >   	li	r6,reg*16+VCPU_VSRS
> > -	stxvd2x	reg,r6,r3
> > +	STXVD2X(reg,r6,r3)
> >   	reg = reg + 1
> >   	.endr
> >   FTR_SECTION_ELSE
> > @@ -1313,7 +1313,7 @@ BEGIN_FTR_SECTION
> >   	reg = 0
> >   	.rept	32
> >   	li	r7,reg*16+VCPU_VSRS
> > -	lxvd2x	reg,r7,r4
> > +	LXVD2X(reg,r7,r4)
> >   	reg = reg + 1
> >   	.endr
> >   FTR_SECTION_ELSE
> 
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
Alexander Graf - Aug. 10, 2011, 9:46 p.m.
On 10.08.2011, at 20:56, Benjamin Herrenschmidt wrote:

> On Wed, 2011-08-10 at 16:58 +0200, Alexander Graf wrote:
>> On 08/03/2011 08:55 PM, Nishanth Aravamudan wrote:
>>> On a box with gcc 4.3.2, I see errors like:
>>> 
>>> arch/powerpc/kvm/book3s_hv_rmhandlers.S:1254: Error: Unrecognized opcode: stxvd2x
>>> arch/powerpc/kvm/book3s_hv_rmhandlers.S:1316: Error: Unrecognized opcode: lxvd2x
>> 
>> Paul, mind to ack?
> 
> I merged it already :-) It was trivial & annoying enough.

Alright then, I won't touch it :)


Alex

Patch

diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
index 6dd3358..de29501 100644
--- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S
+++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
@@ -1251,7 +1251,7 @@  BEGIN_FTR_SECTION
 	reg = 0
 	.rept	32
 	li	r6,reg*16+VCPU_VSRS
-	stxvd2x	reg,r6,r3
+	STXVD2X(reg,r6,r3)
 	reg = reg + 1
 	.endr
 FTR_SECTION_ELSE
@@ -1313,7 +1313,7 @@  BEGIN_FTR_SECTION
 	reg = 0
 	.rept	32
 	li	r7,reg*16+VCPU_VSRS
-	lxvd2x	reg,r7,r4
+	LXVD2X(reg,r7,r4)
 	reg = reg + 1
 	.endr
 FTR_SECTION_ELSE