checkasm: arm: Don't start new const blocks for each string

Message ID 1468698673-50203-1-git-send-email-martin@martin.st
State Committed
Commit 446353ea1844410d8c19d2eb494592abb55a7b13
Headers show

Commit Message

Martin Storsjö July 16, 2016, 7:51 p.m.
Each const block needs to be terminated by one endconst
invocation so either call endconst after each, or just
declare plain labels to the later strings.

This fixes errors such as this, on some binutils versions:

checkasm.S:38: Error: Macro `endconst' was already defined
---
 tests/checkasm/arm/checkasm.S | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Janne Grunau July 17, 2016, 8:51 a.m. | #1
On 2016-07-16 22:51:13 +0300, Martin Storsjö wrote:
> Each const block needs to be terminated by one endconst
> invocation so either call endconst after each, or just
> declare plain labels to the later strings.
> 
> This fixes errors such as this, on some binutils versions:
> 
> checkasm.S:38: Error: Macro `endconst' was already defined
> ---
>  tests/checkasm/arm/checkasm.S | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/checkasm/arm/checkasm.S b/tests/checkasm/arm/checkasm.S
> index 989f613..5aa92c5 100644
> --- a/tests/checkasm/arm/checkasm.S
> +++ b/tests/checkasm/arm/checkasm.S
> @@ -35,9 +35,9 @@ endconst
>  
>  const error_message_fpscr
>      .asciz "failed to preserve register FPSCR"
> -const error_message_gpr
> +error_message_gpr:
>      .asciz "failed to preserve register r%d"
> -const error_message_vfp
> +error_message_vfp:
>      .asciz "failed to preserve register d%d"
>  endconst

ok, sigh, two different build errors in a single commit

Janne

Patch

diff --git a/tests/checkasm/arm/checkasm.S b/tests/checkasm/arm/checkasm.S
index 989f613..5aa92c5 100644
--- a/tests/checkasm/arm/checkasm.S
+++ b/tests/checkasm/arm/checkasm.S
@@ -35,9 +35,9 @@  endconst
 
 const error_message_fpscr
     .asciz "failed to preserve register FPSCR"
-const error_message_gpr
+error_message_gpr:
     .asciz "failed to preserve register r%d"
-const error_message_vfp
+error_message_vfp:
     .asciz "failed to preserve register d%d"
 endconst