diff options
| author | Christopher Ferris <cferris@google.com> | 2013-10-02 17:03:44 -0700 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2013-10-02 23:14:01 -0700 |
| commit | aec1b3540aa74128af8e2162db79334c7f8ce888 (patch) | |
| tree | 514303258c0985558ac6389b154bd1c1a6ddedda /libc/arch-arm | |
| parent | 00a816e5874153ae3103af869182a81b31445388 (diff) | |
| download | bionic-aec1b3540aa74128af8e2162db79334c7f8ce888.zip bionic-aec1b3540aa74128af8e2162db79334c7f8ce888.tar.gz bionic-aec1b3540aa74128af8e2162db79334c7f8ce888.tar.bz2 | |
Remove the __ARM_FEATURE_DSP check.
The check for __ARM_FEATURE_DSP being defined is pointless since it
is always defined.
Bug: 10971279
Merge from internal master.
(cherry-picked from d2642fa70cfbd77286514e1123fcd280d7f7047f)
Change-Id: If23ab3271f4da0c38cd531ffdc9a7e5eed6ec5dc
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 |