diff mbox series

[v2,1/3] ARM: fix argument count to match macro definition

Message ID 591c1d362838b8a83e1fdfea37f7b48fd85dbf44.1546551693.git.stefan@agner.ch (mailing list archive)
State Mainlined, archived
Commit baf2df8e15be22b8bd24bdd6fd4575b6641bcfd1
Headers show
Series ARM: trivial assembly fixes to enable LLVM as | expand

Commit Message

Stefan Agner Jan. 3, 2019, 9:48 p.m. UTC 
The macro str8w takes 10 arguments, abort being the 10th. In this
particular instantiation the abort argument is passed as 11th
argument leading to an error when using LLVM's integrated
assembler:
  <instantiation>:46:47: error: too many positional arguments
    str8w r0, r3, r4, r5, r6, r7, r8, r9, ip, , abort=19f
                                                ^
  arch/arm/lib/copy_template.S:277:5: note: while in macro instantiation
  18: forward_copy_shift pull=24 push=8
      ^

The argument is not used in the macro hence this does not change
code generation.

Signed-off-by: Stefan Agner <stefan@agner.ch>
---
 arch/arm/lib/copy_template.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Nicolas Pitre Jan. 5, 2019, 4:05 p.m. UTC | #1 
On Thu, 3 Jan 2019, Stefan Agner wrote:

> The macro str8w takes 10 arguments, abort being the 10th. In this
> particular instantiation the abort argument is passed as 11th
> argument leading to an error when using LLVM's integrated
> assembler:
>   <instantiation>:46:47: error: too many positional arguments
>     str8w r0, r3, r4, r5, r6, r7, r8, r9, ip, , abort=19f
>                                                 ^
>   arch/arm/lib/copy_template.S:277:5: note: while in macro instantiation
>   18: forward_copy_shift pull=24 push=8
>       ^
> 
> The argument is not used in the macro hence this does not change
> code generation.
> 
> Signed-off-by: Stefan Agner <stefan@agner.ch>

Reviewed-by: Nicolas Pitre <nico@linaro.org>

> ---
>  arch/arm/lib/copy_template.S | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/lib/copy_template.S b/arch/arm/lib/copy_template.S
> index 652e4d98cd47..2d54491b0e22 100644
> --- a/arch/arm/lib/copy_template.S
> +++ b/arch/arm/lib/copy_template.S
> @@ -241,7 +241,7 @@
>  		orr	r9, r9, ip, lspush #\push
>  		mov	ip, ip, lspull #\pull
>  		orr	ip, ip, lr, lspush #\push
> -		str8w	r0, r3, r4, r5, r6, r7, r8, r9, ip, , abort=19f
> +		str8w	r0, r3, r4, r5, r6, r7, r8, r9, ip, abort=19f
>  		bge	12b
>  	PLD(	cmn	r2, #96			)
>  	PLD(	bge	13b			)
> -- 
> 2.20.1
> 
>
diff mbox series

Patch

diff --git a/arch/arm/lib/copy_template.S b/arch/arm/lib/copy_template.S
index 652e4d98cd47..2d54491b0e22 100644
--- a/arch/arm/lib/copy_template.S
+++ b/arch/arm/lib/copy_template.S
@@ -241,7 +241,7 @@ 
 		orr	r9, r9, ip, lspush #\push
 		mov	ip, ip, lspull #\pull
 		orr	ip, ip, lr, lspush #\push
-		str8w	r0, r3, r4, r5, r6, r7, r8, r9, ip, , abort=19f
+		str8w	r0, r3, r4, r5, r6, r7, r8, r9, ip, abort=19f
 		bge	12b
 	PLD(	cmn	r2, #96			)
 	PLD(	bge	13b			)