[FFmpeg-cvslog] checkasm: arm: Don't start new const blocks for each string

Martin Storsjö git at videolan.org
Tue Jan 24 20:33:40 EET 2017


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Sat Jul 16 22:31:02 2016 +0300| [446353ea1844410d8c19d2eb494592abb55a7b13] | committer: Martin Storsjö

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

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

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=446353ea1844410d8c19d2eb494592abb55a7b13
---

 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
 



More information about the ffmpeg-cvslog mailing list