From 5d8818ddcb2cfac8b0cf17f025a25e3ff3aa13bc Mon Sep 17 00:00:00 2001 From: Tim Blechmann Date: Tue, 12 Jun 2018 20:40:29 +0800 Subject: [PATCH] architecture: add support for __ARM_ARCH macro (#74) gcc-6 defines __ARM_ARCH --- include/boost/predef/architecture/arm.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/boost/predef/architecture/arm.h b/include/boost/predef/architecture/arm.h index 76f9f94..96f89c8 100644 --- a/include/boost/predef/architecture/arm.h +++ b/include/boost/predef/architecture/arm.h @@ -32,6 +32,7 @@ http://www.boost.org/LICENSE_1_0.txt) [[`__arm64`] [8.0.0]] [[`__TARGET_ARCH_ARM`] [V.0.0]] [[`__TARGET_ARCH_THUMB`] [V.0.0]] + [[`__ARM_ARCH`] [V.0.0]] [[`_M_ARM`] [V.0.0]] [[`_M_ARM64`] [8.0.0]] ] @@ -41,6 +42,7 @@ 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) # undef BOOST_ARCH_ARM # if !defined(BOOST_ARCH_ARM) && defined(__arm64) @@ -52,6 +54,9 @@ http://www.boost.org/LICENSE_1_0.txt) # if !defined(BOOST_ARCH_ARM) && defined(__TARGET_ARCH_THUMB) # define BOOST_ARCH_ARM BOOST_VERSION_NUMBER(__TARGET_ARCH_THUMB,0,0) # endif +# if !defined(BOOST_ARCH_ARM) && defined(__ARM_ARCH) +# define BOOST_ARCH_ARM BOOST_VERSION_NUMBER(__ARM_ARCH,0,0) +# endif # if !defined(BOOST_ARCH_ARM) && defined(_M_ARM64) # define BOOST_ARCH_ARM BOOST_VERSION_NUMBER(8,0,0) # endif