Skip to content

Commit 4ae82ca

Browse files
committed
tcg/arm: Simplify use_armv5t_instructions
According to the Arm ARM DDI 0406C, section A1.3, the valid variants are ARMv5T, ARMv5TE, ARMv5TEJ -- there is no ARMv5 without Thumb. Therefore simplify the test from preprocessor ifdefs to base architecture revision. Retain the "t" in the name to minimize churn. Reviewed-by: Peter Maydell <[email protected]> Signed-off-by: Richard Henderson <[email protected]>
1 parent 326b966 commit 4ae82ca

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

tcg/arm/tcg-target.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,7 @@
2828

2929
extern int arm_arch;
3030

31-
#if defined(__ARM_ARCH_5T__) \
32-
|| defined(__ARM_ARCH_5TE__) || defined(__ARM_ARCH_5TEJ__)
33-
# define use_armv5t_instructions 1
34-
#else
35-
# define use_armv5t_instructions use_armv6_instructions
36-
#endif
37-
31+
#define use_armv5t_instructions (__ARM_ARCH >= 5 || arm_arch >= 5)
3832
#define use_armv6_instructions (__ARM_ARCH >= 6 || arm_arch >= 6)
3933
#define use_armv7_instructions (__ARM_ARCH >= 7 || arm_arch >= 7)
4034

0 commit comments

Comments
 (0)