summaryrefslogtreecommitdiff
path: root/libavcodec/arm
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2011-06-29 20:59:24 +0100
committerMans Rullgard <mans@mansr.com>2011-06-29 21:57:03 +0100
commita3e1f80e8ba28151ea5d84c15ecf454b8170aa13 (patch)
tree9e1c7816a30e1b54fd3ce39f2232ca28fec4826f /libavcodec/arm
parent0291ce840c0d2dd0fe79701e09f1d7a88def47a6 (diff)
ARM: remove check for PLD instruction
PLD is present in ARMv5TE and later, which is checked for separately. Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavcodec/arm')
-rw-r--r--libavcodec/arm/dsputil_arm.S7
1 files changed, 2 insertions, 5 deletions
diff --git a/libavcodec/arm/dsputil_arm.S b/libavcodec/arm/dsputil_arm.S
index eb20ad6d9e..136551f4c9 100644
--- a/libavcodec/arm/dsputil_arm.S
+++ b/libavcodec/arm/dsputil_arm.S
@@ -24,11 +24,6 @@
preserve8
-#if !HAVE_PLD
-.macro pld reg
-.endm
-#endif
-
#if HAVE_ARMV5TE
function ff_prefetch_arm, export=1
subs r2, r2, #1
@@ -37,6 +32,8 @@ function ff_prefetch_arm, export=1
bne ff_prefetch_arm
bx lr
endfunc
+#else
+#define pld @
#endif
.macro ALIGN_QWORD_D shift, Rd0, Rd1, Rd2, Rd3, Rn0, Rn1, Rn2, Rn3, Rn4