diff options
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | libavcodec/armv4l/dsputil_arm_s.S | 7 |
2 files changed, 10 insertions, 0 deletions
@@ -748,6 +748,7 @@ HAVE_LIST=" memalign mkstemp mlib + pld ppc64 round roundf @@ -1561,6 +1562,8 @@ int main(void) { EOF fi +# We have to check if pld is a nop and disable it. +enabled armv4l && check_asm pld '"pld [r0]"' enabled armv5te && check_asm armv5te '"qadd r0, r0, r0"' enabled armv6 && check_asm armv6 '"sadd16 r0, r0, r0"' enabled iwmmxt && check_asm iwmmxt '"wunpckelub wr6, wr4"' diff --git a/libavcodec/armv4l/dsputil_arm_s.S b/libavcodec/armv4l/dsputil_arm_s.S index 56ffc04..ccd26ac 100644 --- a/libavcodec/armv4l/dsputil_arm_s.S +++ b/libavcodec/armv4l/dsputil_arm_s.S @@ -19,6 +19,13 @@ @ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA @ +#include "config.h" + +#ifndef HAVE_PLD +.macro pld reg +.endm +#endif + .macro ADJ_ALIGN_QUADWORD_D shift, Rd0, Rd1, Rd2, Rd3, Rn0, Rn1, Rn2, Rn3, Rn4 mov \Rd0, \Rn0, lsr #(\shift * 8) mov \Rd1, \Rn1, lsr #(\shift * 8) |
