bsps/arm: Do not use __ARM_ARCH_7A__

This would lead to link-time errors in case less specialized compiler
machine options are used, e.g. to run the GCC test suite.
This commit is contained in:
Sebastian Huber
2015-07-31 09:55:22 +02:00
parent 9e9e61d27d
commit d0733bb871

View File

@@ -30,10 +30,7 @@
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
#if defined( __ARM_ARCH_7A__ ) static inline arm_release_id arm_errata_get_processor_release(void)
static arm_release_id arm_errata_get_processor_release(
void
)
{ {
const uint32_t MIDR = arm_cp15_get_id_code(); const uint32_t MIDR = arm_cp15_get_id_code();
const uint8_t REVISION = (MIDR & 0xF00000U) >> 20; const uint8_t REVISION = (MIDR & 0xF00000U) >> 20;
@@ -44,14 +41,10 @@ static arm_release_id arm_errata_get_processor_release(
PATCH_LEVEL PATCH_LEVEL
); );
} }
#endif /* #if defined( __ARM_ARCH_7A__ ) */
#if defined( __ARM_ARCH_7A__ ) static bool inline arm_errata_is_applicable_processor_errata_764369(void)
#if ( defined( RTEMS_SMP ) )
static bool arm_errata_is_applicable_processor_errata_764369(
void
)
{ {
#if defined(RTEMS_SMP)
const arm_release_id RELEASE = arm_errata_get_processor_release(); const arm_release_id RELEASE = arm_errata_get_processor_release();
bool is_applicable = false; bool is_applicable = false;
@@ -84,16 +77,12 @@ static bool arm_errata_is_applicable_processor_errata_764369(
} }
return is_applicable; return is_applicable;
}
#else #else
#define arm_errata_is_applicable_processor_errata_764369() false return false;
#endif /* ( defined( RTEMS_SMP ) ) */ #endif
#endif /* #if defined( __ARM_ARCH_7A__ ) */ }
#if defined( __ARM_ARCH_7A__ ) static inline bool arm_errata_is_applicable_processor_errata_775420(void)
static bool arm_errata_is_applicable_processor_errata_775420(
void
)
{ {
const arm_release_id RELEASE = arm_errata_get_processor_release(); const arm_release_id RELEASE = arm_errata_get_processor_release();
bool is_applicable = false; bool is_applicable = false;
@@ -123,7 +112,6 @@ static bool arm_errata_is_applicable_processor_errata_775420(
return is_applicable; return is_applicable;
} }
#endif /* #if defined( __ARM_ARCH_7A__ ) */
#ifdef __cplusplus #ifdef __cplusplus
} }