boostorg/predef
1
0
Fork 1
mirror of https://github.com/boostorg/predef.git synced 2025-08-02 13:04:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4 from MSOpenTech/windowsarm

Browse Source 
Adding checking for _M_ARM macro for Windows.
This commit is contained in:
Rene Rivera
2014-05-22 13:41:43 -05:00
parent 699b660086 f94637d9f4
commit 94b886bde0
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
/* /*
Copyright Rene Rivera 2008-2013 Copyright Rene Rivera 2008-2013
Copyright Franz Detro 2014 Copyright Franz Detro 2014
Copyright (c) Microsoft Corporation 2014
Distributed under the Boost Software License, Version 1.0. Distributed under the Boost Software License, Version 1.0.
(See accompanying file LICENSE_1_0.txt or copy at (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt) http://www.boost.org/LICENSE_1_0.txt)
@@ -25,17 +26,20 @@ http://www.boost.org/LICENSE_1_0.txt)
[[`__thumb__`] [__predef_detection__]] [[`__thumb__`] [__predef_detection__]]
[[`__TARGET_ARCH_ARM`] [__predef_detection__]] [[`__TARGET_ARCH_ARM`] [__predef_detection__]]
[[`__TARGET_ARCH_THUMB`] [__predef_detection__]] [[`__TARGET_ARCH_THUMB`] [__predef_detection__]]
[[`_M_ARM'] [__predef_detection__]]
[[`__arm64`] [8.0.0]] [[`__arm64`] [8.0.0]]
[[`__TARGET_ARCH_ARM`] [V.0.0]] [[`__TARGET_ARCH_ARM`] [V.0.0]]
[[`__TARGET_ARCH_THUMB`] [V.0.0]] [[`__TARGET_ARCH_THUMB`] [V.0.0]]
[[`_M_ARM`] [V.0.0]]
] ]
*/ */
#define BOOST_ARCH_ARM BOOST_VERSION_NUMBER_NOT_AVAILABLE #define BOOST_ARCH_ARM BOOST_VERSION_NUMBER_NOT_AVAILABLE
#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(_M_ARM)
# 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)
@@ -46,6 +50,9 @@ http://www.boost.org/LICENSE_1_0.txt)
# if !defined(BOOST_ARCH_ARM) && defined(__TARGET_ARCH_THUMB) # if !defined(BOOST_ARCH_ARM) && defined(__TARGET_ARCH_THUMB)
# define BOOST_ARCH_ARM BOOST_VERSION_NUMBER(__TARGET_ARCH_THUMB,0,0) # define BOOST_ARCH_ARM BOOST_VERSION_NUMBER(__TARGET_ARCH_THUMB,0,0)
# endif # endif
# 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) # if !defined(BOOST_ARCH_ARM)
# define BOOST_ARCH_ARM BOOST_VERSION_NUMBER_AVAILABLE # define BOOST_ARCH_ARM BOOST_VERSION_NUMBER_AVAILABLE
# endif # endif