boostorg/predef
1
0
Fork 1
mirror of https://github.com/boostorg/predef.git synced 2025-07-30 19:57:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add detection of ARM from __aarch64__ predef.

Browse Source 
Fixes #94
This commit is contained in:
Rene Rivera
2019-01-07 16:28:30 -06:00
parent c53294180d
commit eb682657a2
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/boost/predef/architecture/arm.h
View File

@ -28,6 +28,7 @@ http://www.boost.org/LICENSE_1_0.txt)
[[`__TARGET_ARCH_THUMB`] [__predef_detection__]] [[`__TARGET_ARCH_THUMB`] [__predef_detection__]]
[[`_M_ARM`] [__predef_detection__]] [[`_M_ARM`] [__predef_detection__]]
[[`_M_ARM64`] [__predef_detection__]] [[`_M_ARM64`] [__predef_detection__]]
[[`__aarch64__`] [__predef_detection__]]
[[`__arm64`] [8.0.0]] [[`__arm64`] [8.0.0]]
[[`__TARGET_ARCH_ARM`] [V.0.0]] [[`__TARGET_ARCH_ARM`] [V.0.0]]
@ -35,6 +36,7 @@ http://www.boost.org/LICENSE_1_0.txt)
[[`__ARM_ARCH`] [V.0.0]] [[`__ARM_ARCH`] [V.0.0]]
[[`_M_ARM`] [V.0.0]] [[`_M_ARM`] [V.0.0]]
[[`_M_ARM64`] [8.0.0]] [[`_M_ARM64`] [8.0.0]]
[[`__aarch64__`] [8.0.0]]
] ]
*/ */
@ -43,7 +45,8 @@ http://www.boost.org/LICENSE_1_0.txt)
#if defined(__arm__) || defined(__arm64) || defined(__thumb__) || \ #if defined(__arm__) || defined(__arm64) || defined(__thumb__) || \
defined(__TARGET_ARCH_ARM) || defined(__TARGET_ARCH_THUMB) || \ defined(__TARGET_ARCH_ARM) || defined(__TARGET_ARCH_THUMB) || \
defined(__ARM_ARCH) || \ defined(__ARM_ARCH) || \
defined(_M_ARM) || defined(_M_ARM64) defined(_M_ARM) || defined(_M_ARM64) || \
defined(__aarch64__)
# undef BOOST_ARCH_ARM # undef BOOST_ARCH_ARM
# if !defined(BOOST_ARCH_ARM) && defined(__arm64) # if !defined(BOOST_ARCH_ARM) && defined(__arm64)
# define BOOST_ARCH_ARM BOOST_VERSION_NUMBER(8,0,0) # define BOOST_ARCH_ARM BOOST_VERSION_NUMBER(8,0,0)
@ -63,6 +66,9 @@ http://www.boost.org/LICENSE_1_0.txt)
# if !defined(BOOST_ARCH_ARM) && defined(_M_ARM) # if !defined(BOOST_ARCH_ARM) && defined(_M_ARM)
# define BOOST_ARCH_ARM BOOST_VERSION_NUMBER(_M_ARM,0,0) # define BOOST_ARCH_ARM BOOST_VERSION_NUMBER(_M_ARM,0,0)
# endif # endif
# if !defined(BOOST_ARCH_ARM) && defined(__aarch64__)
# define BOOST_ARCH_ARM BOOST_VERSION_NUMBER(8,0,0)
# endif
# if !defined(BOOST_ARCH_ARM) # if !defined(BOOST_ARCH_ARM)
# define BOOST_ARCH_ARM BOOST_VERSION_NUMBER_AVAILABLE # define BOOST_ARCH_ARM BOOST_VERSION_NUMBER_AVAILABLE
# endif # endif