From bbff5c0fcf4bb03ee0baca329513d12af9a38e2b Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 22 Apr 2013 17:15:32 -0500 Subject: [PATCH] Bring back IA64 architecture. --- doc/html/index.html | 2 +- .../boost_arch_architecture_macros.html | 197 ++++++++++-------- include/boost/predef/architecture.h | 1 + include/boost/predef/architecture/ia64.h | 49 +++++ include/boost/predef/architecture/x86/64.h | 9 - 5 files changed, 163 insertions(+), 95 deletions(-) create mode 100644 include/boost/predef/architecture/ia64.h diff --git a/doc/html/index.html b/doc/html/index.html index f7f4b57..1f1f7bc 100644 --- a/doc/html/index.html +++ b/doc/html/index.html @@ -59,7 +59,7 @@ - +

Last revised: April 21, 2013 at 19:51:26 GMT

Last revised: April 22, 2013 at 14:00:37 GMT
diff --git a/doc/html/predef/reference/boost_arch_architecture_macros.html b/doc/html/predef/reference/boost_arch_architecture_macros.html index 5b36c61..98b87f3 100644 --- a/doc/html/predef/reference/boost_arch_architecture_macros.html +++ b/doc/html/predef/reference/boost_arch_architecture_macros.html @@ -392,6 +392,105 @@
+ BOOST_ARCH_IA64 +
+

+ Intel Itanium 64 architecture. +

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

+ Symbol +

+ 		+

+ Version +

+
+

+ __ia64__ +

+ 		+

+ detection +

+
+

+ _IA64 +

+ 		+

+ detection +

+
+

+ __IA64__ +

+ 		+

+ detection +

+
+

+ __ia64 +

+ 		+

+ detection +

+
+

+ _M_IA64 +

+ 		+

+ detection +

+
+

+ __itanium__ +

+ 		+

+ detection +

+
+
+ BOOST_ARCH_M68K

@@ -658,7 +757,7 @@

- + BOOST_ARCH_MIPS

@@ -842,7 +941,7 @@

- + BOOST_ARCH_PARISK

@@ -1002,7 +1101,7 @@

- + BOOST_ARCH_PPC

@@ -1209,7 +1308,7 @@

- + BOOST_ARCH_PYRAMID

@@ -1246,7 +1345,7 @@

- + BOOST_ARCH_RS6000

@@ -1333,7 +1432,7 @@

- + BOOST_ARCH_SPARC

@@ -1408,7 +1507,7 @@

- + BOOST_ARCH_SH

@@ -1520,7 +1619,7 @@

- + BOOST_ARCH_SYS370

@@ -1571,7 +1670,7 @@

- + BOOST_ARCH_SYS390

@@ -1622,7 +1721,7 @@

- + BOOST_ARCH_X86

@@ -1631,7 +1730,7 @@ or BOOST_ARCH_X86_64 is detected.

- + BOOST_ARCH_Z

@@ -1669,7 +1768,7 @@

- + BOOST_ARCH_X86_32

@@ -1901,7 +2000,7 @@

- + BOOST_ARCH_X86_64

@@ -1950,78 +2049,6 @@ - -

- __ia64__ -

- - -

- detection -

- - - - -

- _IA64 -

- - -

- detection -

- - - - -

- __IA64__ -

- - -

- detection -

- - - - -

- __ia64 -

- - -

- detection -

- - - - -

- _M_IA64 -

- - -

- detection -

- - - - -

- __itanium__ -

- - -

- detection -

- - -

__amd64__ diff --git a/include/boost/predef/architecture.h b/include/boost/predef/architecture.h index 40bc596..9eda25e 100644 --- a/include/boost/predef/architecture.h +++ b/include/boost/predef/architecture.h @@ -12,6 +12,7 @@ http://www.boost.org/LICENSE_1_0.txt) #include #include #include +#include #include #include #include diff --git a/include/boost/predef/architecture/ia64.h b/include/boost/predef/architecture/ia64.h new file mode 100644 index 0000000..918e27f --- /dev/null +++ b/include/boost/predef/architecture/ia64.h @@ -0,0 +1,49 @@ +/* +Copyright Redshift Software, Inc. 2008-2013 +Distributed under the Boost Software License, Version 1.0. +(See accompanying file LICENSE_1_0.txt or copy at +http://www.boost.org/LICENSE_1_0.txt) +*/ + +#ifndef BOOST_PREDEF_ARCHITECTURE_IA64_H +#define BOOST_PREDEF_ARCHITECTURE_IA64_H + +#include +#include + +/*` +[heading `BOOST_ARCH_IA64`] + +[@http://en.wikipedia.org/wiki/Ia64 Intel Itanium 64] architecture. + +[table + [[__predef_symbol__] [__predef_version__]] + + [[`__ia64__`] [__predef_detection__]] + [[`_IA64`] [__predef_detection__]] + [[`__IA64__`] [__predef_detection__]] + [[`__ia64`] [__predef_detection__]] + [[`_M_IA64`] [__predef_detection__]] + [[`__itanium__`] [__predef_detection__]] + ] + */ + +#define BOOST_ARCH_IA64 BOOST_VERSION_NUMBER_NOT_AVAILABLE + +#if defined(__ia64__) || defined(_IA64) || \ + defined(__IA64__) || defined(__ia64) || \ + defined(_M_IA64) || defined(__itanium__) +# undef BOOST_ARCH_IA64 +# define BOOST_ARCH_IA64 BOOST_VERSION_NUMBER_AVAILABLE +#endif + +#if BOOST_ARCH_IA64 +# define BOOST_ARCH_IA64_AVAILABLE +#endif + +#define BOOST_ARCH_IA64_NAME "Intel Itanium 64" + +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_IA64,BOOST_ARCH_IA64_NAME) + +#endif diff --git a/include/boost/predef/architecture/x86/64.h b/include/boost/predef/architecture/x86/64.h index 718faa3..0bee9c9 100644 --- a/include/boost/predef/architecture/x86/64.h +++ b/include/boost/predef/architecture/x86/64.h @@ -21,12 +21,6 @@ http://www.boost.org/LICENSE_1_0.txt) [[`__x86_64`] [__predef_detection__]] [[`__x86_64__`] [__predef_detection__]] - [[`__ia64__`] [__predef_detection__]] - [[`_IA64`] [__predef_detection__]] - [[`__IA64__`] [__predef_detection__]] - [[`__ia64`] [__predef_detection__]] - [[`_M_IA64`] [__predef_detection__]] - [[`__itanium__`] [__predef_detection__]] [[`__amd64__`] [__predef_detection__]] [[`__amd64`] [__predef_detection__]] [[`_M_X64`] [__predef_detection__]] @@ -36,9 +30,6 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_ARCH_X86_64 BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__x86_64) || defined(__x86_64__) || \ - defined(__ia64__) || defined(_IA64) || \ - defined(__IA64__) || defined(__ia64) || \ - defined(_M_IA64) || defined(__itanium__) || \ defined(__amd64__) || defined(__amd64) || \ defined(_M_X64) # undef BOOST_ARCH_X86_64