From eb682657a2fcf11e8422c9a49781c1796d6c6ce4 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 7 Jan 2019 16:28:30 -0600 Subject: [PATCH] Add detection of ARM from `__aarch64__` predef. Fixes #94 --- include/boost/predef/architecture/arm.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/boost/predef/architecture/arm.h b/include/boost/predef/architecture/arm.h index 96f89c8..8b10b40 100644 --- a/include/boost/predef/architecture/arm.h +++ b/include/boost/predef/architecture/arm.h @@ -28,6 +28,7 @@ http://www.boost.org/LICENSE_1_0.txt) [[`__TARGET_ARCH_THUMB`] [__predef_detection__]] [[`_M_ARM`] [__predef_detection__]] [[`_M_ARM64`] [__predef_detection__]] + [[`__aarch64__`] [__predef_detection__]] [[`__arm64`] [8.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]] [[`_M_ARM`] [V.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__) || \ defined(__TARGET_ARCH_ARM) || defined(__TARGET_ARCH_THUMB) || \ defined(__ARM_ARCH) || \ - defined(_M_ARM) || defined(_M_ARM64) + defined(_M_ARM) || defined(_M_ARM64) || \ + defined(__aarch64__) # undef BOOST_ARCH_ARM # if !defined(BOOST_ARCH_ARM) && defined(__arm64) # 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) # define BOOST_ARCH_ARM BOOST_VERSION_NUMBER(_M_ARM,0,0) # endif +# if !defined(BOOST_ARCH_ARM) && defined(__aarch64__) +# define BOOST_ARCH_ARM BOOST_VERSION_NUMBER(8,0,0) +# endif # if !defined(BOOST_ARCH_ARM) # define BOOST_ARCH_ARM BOOST_VERSION_NUMBER_AVAILABLE # endif