tcg-arm: Simplify logic in detecting the ARM ISA in use
GCC 4.8 defines a handy __ARM_ARCH symbol that we can use, which will make us nicely forward compatible with ARMv8 AArch32. Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
parent
fb82273851
commit
cb91021a47
|
@ -22,50 +22,34 @@
|
||||||
* THE SOFTWARE.
|
* THE SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#if defined(__ARM_ARCH_7__) || \
|
/* The __ARM_ARCH define is provided by gcc 4.8. Construct it otherwise. */
|
||||||
defined(__ARM_ARCH_7A__) || \
|
#ifndef __ARM_ARCH
|
||||||
defined(__ARM_ARCH_7EM__) || \
|
# if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \
|
||||||
defined(__ARM_ARCH_7M__) || \
|
|| defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) \
|
||||||
defined(__ARM_ARCH_7R__)
|
|| defined(__ARM_ARCH_7EM__)
|
||||||
#define USE_ARMV7_INSTRUCTIONS
|
# define __ARM_ARCH 7
|
||||||
|
# elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \
|
||||||
|
|| defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) \
|
||||||
|
|| defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__)
|
||||||
|
# define __ARM_ARCH 6
|
||||||
|
# elif defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5E__) \
|
||||||
|
|| defined(__ARM_ARCH_5T__) || defined(__ARM_ARCH_5TE__) \
|
||||||
|
|| defined(__ARM_ARCH_5TEJ__)
|
||||||
|
# define __ARM_ARCH 5
|
||||||
|
# else
|
||||||
|
# define __ARM_ARCH 4
|
||||||
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(USE_ARMV7_INSTRUCTIONS) || \
|
#if defined(__ARM_ARCH_5T__) \
|
||||||
defined(__ARM_ARCH_6J__) || \
|
|| defined(__ARM_ARCH_5TE__) || defined(__ARM_ARCH_5TEJ__)
|
||||||
defined(__ARM_ARCH_6K__) || \
|
# define use_armv5t_instructions 1
|
||||||
defined(__ARM_ARCH_6T2__) || \
|
|
||||||
defined(__ARM_ARCH_6Z__) || \
|
|
||||||
defined(__ARM_ARCH_6ZK__)
|
|
||||||
#define USE_ARMV6_INSTRUCTIONS
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(USE_ARMV6_INSTRUCTIONS) || \
|
|
||||||
defined(__ARM_ARCH_5T__) || \
|
|
||||||
defined(__ARM_ARCH_5TE__) || \
|
|
||||||
defined(__ARM_ARCH_5TEJ__)
|
|
||||||
#define USE_ARMV5T_INSTRUCTIONS
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef USE_ARMV5T_INSTRUCTIONS
|
|
||||||
static const int use_armv5t_instructions = 1;
|
|
||||||
#else
|
#else
|
||||||
static const int use_armv5t_instructions = 0;
|
# define use_armv5t_instructions use_armv6_instructions
|
||||||
#endif
|
#endif
|
||||||
#undef USE_ARMV5_INSTRUCTIONS
|
|
||||||
|
|
||||||
#ifdef USE_ARMV6_INSTRUCTIONS
|
#define use_armv6_instructions (__ARM_ARCH >= 6)
|
||||||
static const int use_armv6_instructions = 1;
|
#define use_armv7_instructions (__ARM_ARCH >= 7)
|
||||||
#else
|
|
||||||
static const int use_armv6_instructions = 0;
|
|
||||||
#endif
|
|
||||||
#undef USE_ARMV6_INSTRUCTIONS
|
|
||||||
|
|
||||||
#ifdef USE_ARMV7_INSTRUCTIONS
|
|
||||||
static const int use_armv7_instructions = 1;
|
|
||||||
#else
|
|
||||||
static const int use_armv7_instructions = 0;
|
|
||||||
#endif
|
|
||||||
#undef USE_ARMV7_INSTRUCTIONS
|
|
||||||
|
|
||||||
#ifndef use_idiv_instructions
|
#ifndef use_idiv_instructions
|
||||||
bool use_idiv_instructions;
|
bool use_idiv_instructions;
|
||||||
|
|
Loading…
Reference in a new issue