Minor tidy-up

Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
This commit is contained in:
Dave Rodgman 2023-05-24 19:43:13 +01:00
parent ffbb7c5edc
commit 6adaca6062

View file

@ -670,11 +670,7 @@
* x !=0, which we can detect using __OPTIMIZE__ (which is also defined by * x !=0, which we can detect using __OPTIMIZE__ (which is also defined by
* clang and armcc5 under the same conditions). * clang and armcc5 under the same conditions).
*/ */
#if defined(__thumb__) && !defined(__thumb2__) // Thumb 1 (not Thumb 2) ISA
//#if defined(__ARM_ARCH)
//#if __ARM_ARCH >= 6
#if defined(__thumb__) && !defined(__thumb2__) // Thumb1 (not Thumb 2) ISA
// Only supported by gcc, when optimisation is enabled; only option A works // Only supported by gcc, when optimisation is enabled; only option A works
#if defined(__OPTIMIZE__) && !defined(__ARMCC_VERSION) #if defined(__OPTIMIZE__) && !defined(__ARMCC_VERSION)
@ -685,7 +681,7 @@
#if !defined(__ARMCC_VERSION) && !defined(__OPTIMIZE__) #if !defined(__ARMCC_VERSION) && !defined(__OPTIMIZE__)
// gcc -O0: only option B builds // gcc -O0: only option B builds
#if defined (__ARM_FEATURE_DSP) && (__ARM_FEATURE_DSP == 1) #if (__ARM_ARCH >= 6) && defined (__ARM_FEATURE_DSP) && (__ARM_FEATURE_DSP == 1)
#define ARM_OPTION_B #define ARM_OPTION_B
#endif #endif
#else #else
@ -698,18 +694,16 @@
// any option builds. A does not seem to work; B is about 2x faster than C (under emulation). // any option builds. A does not seem to work; B is about 2x faster than C (under emulation).
#define ARM_OPTION_B_OR_C #define ARM_OPTION_B_OR_C
#endif #endif /* Arm ISA selection */
#if defined(ARM_OPTION_B_OR_C) #if defined(ARM_OPTION_B_OR_C)
// Prefer B, if we have the right features for it
#if (__ARM_ARCH >= 6) && defined (__ARM_FEATURE_DSP) && (__ARM_FEATURE_DSP == 1) #if (__ARM_ARCH >= 6) && defined (__ARM_FEATURE_DSP) && (__ARM_FEATURE_DSP == 1)
#define ARM_OPTION_B #define ARM_OPTION_B
#else #else
#define ARM_OPTION_C #define ARM_OPTION_C
#endif #endif
#endif #endif /* defined(ARM_OPTION_B_OR_C) */
//#endif
//#endif
#if defined(ARM_OPTION_A) #if defined(ARM_OPTION_A)