From aec1b3540aa74128af8e2162db79334c7f8ce888 Mon Sep 17 00:00:00 2001 From: Christopher Ferris Date: Wed, 2 Oct 2013 17:03:44 -0700 Subject: [PATCH] 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 --- libc/arch-arm/cortex-a15/bionic/strcmp.S | 11 ----------- libc/arch-arm/cortex-a9/bionic/strcmp.S | 11 ----------- libc/arch-arm/krait/bionic/strcmp.S | 11 ----------- 3 files changed, 33 deletions(-) diff --git a/libc/arch-arm/cortex-a15/bionic/strcmp.S b/libc/arch-arm/cortex-a15/bionic/strcmp.S index 13b329f4f..422be863d 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 232df75b6..24a4157bd 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 d4cf3f42e..e78bc9cfd 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