diff options
| author | Christopher Ferris <cferris@google.com> | 2013-10-02 23:27:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-02 23:27:06 -0700 |
| commit | de7ed18df0f22e1b91bc16072956af8a0d9abaa3 (patch) | |
| tree | fa7fdbd9e5e459c93fc35e16a7afd460eebe1ebb /libc/arch-arm | |
| parent | fa9fb5cb01986ac77ea4f7c54b2f419ac47989d3 (diff) | |
| parent | 0292c1c81dfed23a32d46fb0b089b7eccb87e21e (diff) | |
| download | bionic-de7ed18df0f22e1b91bc16072956af8a0d9abaa3.zip bionic-de7ed18df0f22e1b91bc16072956af8a0d9abaa3.tar.gz bionic-de7ed18df0f22e1b91bc16072956af8a0d9abaa3.tar.bz2 | |
am 0292c1c8: am 3901b1bd: Merge "Remove the __ARM_FEATURE_DSP check."
* commit '0292c1c81dfed23a32d46fb0b089b7eccb87e21e':
Remove the __ARM_FEATURE_DSP check.
Diffstat (limited to 'libc/arch-arm')
| -rw-r--r-- | libc/arch-arm/cortex-a15/bionic/strcmp.S | 11 | ||||
| -rw-r--r-- | libc/arch-arm/cortex-a9/bionic/strcmp.S | 11 | ||||
| -rw-r--r-- | libc/arch-arm/krait/bionic/strcmp.S | 11 |
3 files changed, 0 insertions, 33 deletions
diff --git a/libc/arch-arm/cortex-a15/bionic/strcmp.S b/libc/arch-arm/cortex-a15/bionic/strcmp.S index 13b329f..422be86 100644 --- a/libc/arch-arm/cortex-a15/bionic/strcmp.S +++ b/libc/arch-arm/cortex-a15/bionic/strcmp.S @@ -145,19 +145,8 @@ ENTRY(strcmp) .macro magic_find_zero_bytes w1 /* Macro to find all-zero bytes in w1, result is in ip. */ -#if (defined (__ARM_FEATURE_DSP)) uadd8 ip, \w1, r6 sel ip, r7, r6 -#else /* not defined (__ARM_FEATURE_DSP) */ - /* __ARM_FEATURE_DSP is not defined for some Cortex-M processors. - Coincidently, these processors only have Thumb-2 mode, where we can use the - the (large) magic constant available directly as an immediate in instructions. - Note that we cannot use the magic constant in ARM mode, where we need - to create the constant in a register. */ - sub ip, \w1, #0x01010101 - bic ip, ip, \w1 - and ip, ip, #0x80808080 -#endif /* not defined (__ARM_FEATURE_DSP) */ .endm /* magic_find_zero_bytes */ .macro setup_return w1 w2 diff --git a/libc/arch-arm/cortex-a9/bionic/strcmp.S b/libc/arch-arm/cortex-a9/bionic/strcmp.S index 232df75..24a4157 100644 --- a/libc/arch-arm/cortex-a9/bionic/strcmp.S +++ b/libc/arch-arm/cortex-a9/bionic/strcmp.S @@ -145,19 +145,8 @@ ENTRY(strcmp) .macro magic_find_zero_bytes w1 /* Macro to find all-zero bytes in w1, result is in ip. */ -#if (defined (__ARM_FEATURE_DSP)) uadd8 ip, \w1, r6 sel ip, r7, r6 -#else /* not defined (__ARM_FEATURE_DSP) */ - /* __ARM_FEATURE_DSP is not defined for some Cortex-M processors. - Coincidently, these processors only have Thumb-2 mode, where we can use the - the (large) magic constant available directly as an immediate in instructions. - Note that we cannot use the magic constant in ARM mode, where we need - to create the constant in a register. */ - sub ip, \w1, #0x01010101 - bic ip, ip, \w1 - and ip, ip, #0x80808080 -#endif /* not defined (__ARM_FEATURE_DSP) */ .endm /* magic_find_zero_bytes */ .macro setup_return w1 w2 diff --git a/libc/arch-arm/krait/bionic/strcmp.S b/libc/arch-arm/krait/bionic/strcmp.S index d4cf3f4..e78bc9c 100644 --- a/libc/arch-arm/krait/bionic/strcmp.S +++ b/libc/arch-arm/krait/bionic/strcmp.S @@ -145,19 +145,8 @@ ENTRY(strcmp) .macro magic_find_zero_bytes w1 /* Macro to find all-zero bytes in w1, result is in ip. */ -#if (defined (__ARM_FEATURE_DSP)) uadd8 ip, \w1, r6 sel ip, r7, r6 -#else /* not defined (__ARM_FEATURE_DSP) */ - /* __ARM_FEATURE_DSP is not defined for some Cortex-M processors. - Coincidently, these processors only have Thumb-2 mode, where we can use the - the (large) magic constant available directly as an immediate in instructions. - Note that we cannot use the magic constant in ARM mode, where we need - to create the constant in a register. */ - sub ip, \w1, #0x01010101 - bic ip, ip, \w1 - and ip, ip, #0x80808080 -#endif /* not defined (__ARM_FEATURE_DSP) */ .endm /* magic_find_zero_bytes */ .macro setup_return w1 w2 |