On 2014-02-07 14:03:59 +0200, Martin Storsjö wrote: > On Fri, 7 Feb 2014, Janne Grunau wrote: > > >On 2014-02-07 12:06:56 +0200, Martin Storsjö wrote: > >>Don't rely on the fact that an unprefixed label currently exists. > >>--- > >> libavcodec/arm/fmtconvert_neon.S | 2 +- > >> libavcodec/arm/h264idct_neon.S | 16 ++++++++-------- > >> libavcodec/arm/hpeldsp_armv6.S | 4 ++-- > >> libavcodec/arm/mdct_neon.S | 2 +- > >> libavcodec/arm/mpegvideo_neon.S | 2 +- > >> libavcodec/arm/videodsp_armv5te.S | 2 +- > >> libavcodec/arm/vp8dsp_armv6.S | 16 ++++++++-------- > >> libavresample/arm/audio_convert_neon.S | 4 ++-- > >> 8 files changed, 24 insertions(+), 24 deletions(-) > >> > >>diff --git a/libavcodec/arm/fmtconvert_neon.S > >>b/libavcodec/arm/fmtconvert_neon.S > >>index 41a095a..e11e82c 100644 > >>--- a/libavcodec/arm/fmtconvert_neon.S > >>+++ b/libavcodec/arm/fmtconvert_neon.S > >>@@ -70,7 +70,7 @@ function ff_float_to_int16_interleave_neon, export=1 > >> cmp r3, #2 > >> itt lt > >> ldrlt r1, [r1] > >>- blt ff_float_to_int16_neon > >>+ blt X(ff_float_to_int16_neon) > >> bne 4f > >> > >> ldr r3, [r1] > >>diff --git a/libavcodec/arm/h264idct_neon.S b/libavcodec/arm/h264idct_neon.S > >>index 3e5321c..f588f3e 100644 > >>--- a/libavcodec/arm/h264idct_neon.S > >>+++ b/libavcodec/arm/h264idct_neon.S > >>@@ -113,8 +113,8 @@ function ff_h264_idct_add16_neon, export=1 > >> movne lr, #0 > >> cmp lr, #0 > >> ite ne > >>- adrne lr, ff_h264_idct_dc_add_neon + CONFIG_THUMB > >>- adreq lr, ff_h264_idct_add_neon + CONFIG_THUMB > >>+ adrne lr, X(ff_h264_idct_dc_add_neon) + CONFIG_THUMB > >>+ adreq lr, X(ff_h264_idct_add_neon) + CONFIG_THUMB > > > >does this still does the right thing when X(ff_h264_idct_add_neon) is > >declared as .thumb_func when targeting ios? It probably does since > >ff_h264_idct_add_neon should already be declared as thumb after my > >'.func' -> '.thumb_func' patch in gas-preprocessor. > > Yes, prior to this patch both ff_h264_idct_dc_add_neon and > _ff_h264_idct_dc_add_neon are marked with .thumb_func, so this > shouldn't change anything with regard to that. Excellent point > though.
Tested, the '+ CONFIG_THUMB' is still required since for some reason the thumb bit is not set in this context although the symbol is declared as .thumb_func. patch ok Janne _______________________________________________ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel
