comparison DEPENDENCIES/generic/include/boost/predef/architecture/arm.h @ 101:c530137014c0

Update Boost headers (1.58.0)
author Chris Cannam
date Mon, 07 Sep 2015 11:12:49 +0100
parents 2665513ce2d3
children
comparison
equal deleted inserted replaced
100:793467b5e61c 101:c530137014c0
1 /* 1 /*
2 Copyright Redshift Software, Inc. 2008-2013 2 Copyright Rene Rivera 2008-2013
3 Copyright Franz Detro 2014
4 Copyright (c) Microsoft Corporation 2014
3 Distributed under the Boost Software License, Version 1.0. 5 Distributed under the Boost Software License, Version 1.0.
4 (See accompanying file LICENSE_1_0.txt or copy at 6 (See accompanying file LICENSE_1_0.txt or copy at
5 http://www.boost.org/LICENSE_1_0.txt) 7 http://www.boost.org/LICENSE_1_0.txt)
6 */ 8 */
7 9
18 20
19 [table 21 [table
20 [[__predef_symbol__] [__predef_version__]] 22 [[__predef_symbol__] [__predef_version__]]
21 23
22 [[`__arm__`] [__predef_detection__]] 24 [[`__arm__`] [__predef_detection__]]
25 [[`__arm64`] [__predef_detection__]]
23 [[`__thumb__`] [__predef_detection__]] 26 [[`__thumb__`] [__predef_detection__]]
24 [[`__TARGET_ARCH_ARM`] [__predef_detection__]] 27 [[`__TARGET_ARCH_ARM`] [__predef_detection__]]
25 [[`__TARGET_ARCH_THUMB`] [__predef_detection__]] 28 [[`__TARGET_ARCH_THUMB`] [__predef_detection__]]
29 [[`_M_ARM`] [__predef_detection__]]
26 30
31 [[`__arm64`] [8.0.0]]
27 [[`__TARGET_ARCH_ARM`] [V.0.0]] 32 [[`__TARGET_ARCH_ARM`] [V.0.0]]
28 [[`__TARGET_ARCH_THUMB`] [V.0.0]] 33 [[`__TARGET_ARCH_THUMB`] [V.0.0]]
34 [[`_M_ARM`] [V.0.0]]
29 ] 35 ]
30 */ 36 */
31 37
32 #define BOOST_ARCH_ARM BOOST_VERSION_NUMBER_NOT_AVAILABLE 38 #define BOOST_ARCH_ARM BOOST_VERSION_NUMBER_NOT_AVAILABLE
33 39
34 #if defined(__arm__) || defined(__thumb__) || \ 40 #if defined(__arm__) || defined(__arm64) || defined(__thumb__) || \
35 defined(__TARGET_ARCH_ARM) || defined(__TARGET_ARCH_THUMB) 41 defined(__TARGET_ARCH_ARM) || defined(__TARGET_ARCH_THUMB) || \
42 defined(_M_ARM)
36 # undef BOOST_ARCH_ARM 43 # undef BOOST_ARCH_ARM
44 # if !defined(BOOST_ARCH_ARM) && defined(__arm64)
45 # define BOOST_ARCH_ARM BOOST_VERSION_NUMBER(8,0,0)
46 # endif
37 # if !defined(BOOST_ARCH_ARM) && defined(__TARGET_ARCH_ARM) 47 # if !defined(BOOST_ARCH_ARM) && defined(__TARGET_ARCH_ARM)
38 # define BOOST_ARCH_ARM BOOST_VERSION_NUMBER(__TARGET_ARCH_ARM,0,0) 48 # define BOOST_ARCH_ARM BOOST_VERSION_NUMBER(__TARGET_ARCH_ARM,0,0)
39 # endif 49 # endif
40 # if !defined(BOOST_ARCH_ARM) && defined(__TARGET_ARCH_THUMB) 50 # if !defined(BOOST_ARCH_ARM) && defined(__TARGET_ARCH_THUMB)
41 # define BOOST_ARCH_ARM BOOST_VERSION_NUMBER(__TARGET_ARCH_THUMB,0,0) 51 # define BOOST_ARCH_ARM BOOST_VERSION_NUMBER(__TARGET_ARCH_THUMB,0,0)
52 # endif
53 # if !defined(BOOST_ARCH_ARM) && defined(_M_ARM)
54 # define BOOST_ARCH_ARM BOOST_VERSION_NUMBER(_M_ARM,0,0)
42 # endif 55 # endif
43 # if !defined(BOOST_ARCH_ARM) 56 # if !defined(BOOST_ARCH_ARM)
44 # define BOOST_ARCH_ARM BOOST_VERSION_NUMBER_AVAILABLE 57 # define BOOST_ARCH_ARM BOOST_VERSION_NUMBER_AVAILABLE
45 # endif 58 # endif
46 #endif 59 #endif