PLD is present in ARMv5TE and later, which is checked for separately.
Unified · Split
| @@ -1093,7 +1093,6 @@ HAVE_LIST=" · 1092 unmodified lines | |||
| 1093 | memalign | 1093 | memalign |
| 1094 | mkstemp | 1094 | mkstemp |
| 1095 | mmap | 1095 | mmap |
| 1096 | pld | ||
| 1097 | posix_memalign | 1096 | posix_memalign |
| 1098 | round | 1097 | round |
| 1099 | roundf | 1098 | roundf |
| @@ -2608,9 +2607,6 @@ EOF · 1508 unmodified lines | |||
| 2608 | warn "Compiler does not indicate floating-point ABI, guessing $fpabi." | 2607 | warn "Compiler does not indicate floating-point ABI, guessing $fpabi." |
| 2609 | fi | 2608 | fi |
| 2610 | 2609 | ||
| 2611 | # We have to check if pld is a nop and disable it. | ||
| 2612 | check_asm pld '"pld [r0]"' | ||
| 2613 | |||
| 2614 | enabled armv5te && check_asm armv5te '"qadd r0, r0, r0"' | 2610 | enabled armv5te && check_asm armv5te '"qadd r0, r0, r0"' |
| 2615 | enabled armv6 && check_asm armv6 '"sadd16 r0, r0, r0"' | 2611 | enabled armv6 && check_asm armv6 '"sadd16 r0, r0, r0"' |
| 2616 | enabled armv6t2 && check_asm armv6t2 '"movt r0, #0"' | 2612 | enabled armv6t2 && check_asm armv6t2 '"movt r0, #0"' |
| @@ -24,11 +24,6 @@ · 23 unmodified lines | |||
| 24 | 24 | ||
| 25 | preserve8 | 25 | preserve8 |
| 26 | 26 | ||
| 27 | #if !HAVE_PLD | ||
| 28 | .macro pld reg | ||
| 29 | .endm | ||
| 30 | #endif | ||
| 31 | |||
| 32 | #if HAVE_ARMV5TE | 27 | #if HAVE_ARMV5TE |
| 33 | function ff_prefetch_arm, export=1 | 28 | function ff_prefetch_arm, export=1 |
| 34 | subs r2, r2, #1 | 29 | subs r2, r2, #1 |
| @@ -37,6 +32,8 @@ function ff_prefetch_arm, export=1 · 2 unmodified lines | |||
| 37 | bne ff_prefetch_arm | 32 | bne ff_prefetch_arm |
| 38 | bx lr | 33 | bx lr |
| 39 | endfunc | 34 | endfunc |
| 35 | #else | ||
| 36 | #define pld @ | ||
| 40 | #endif | 37 | #endif |
| 41 | 38 | ||
| 42 | .macro ALIGN_QWORD_D shift, Rd0, Rd1, Rd2, Rd3, Rn0, Rn1, Rn2, Rn3, Rn4 | 39 | .macro ALIGN_QWORD_D shift, Rd0, Rd1, Rd2, Rd3, Rn0, Rn1, Rn2, Rn3, Rn4 |