Bring back IA64 architecture.

2025-07-31 12:17:13 +02:00 · 2013-04-22 17:15:32 -05:00
parent e15832480d
commit bbff5c0fcf
5 changed files with 163 additions and 95 deletions
--- a/doc/html/index.html
+++ b/doc/html/index.html
@@ -59,7 +59,7 @@
 </table></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: April 21, 2013 at 19:51:26 GMT</small></p></td>
+<td align="left"><p><small>Last revised: April 22, 2013 at 14:00:37 GMT</small></p></td>
 <td align="right"><div class="copyright-footer"></div></td>
 </tr></table>
 <hr>
--- a/doc/html/predef/reference/boost_arch_architecture_macros.html
+++ b/doc/html/predef/reference/boost_arch_architecture_macros.html
@@ -392,6 +392,105 @@
 </table></div>
 <h5>
 <a name="predef.reference.boost_arch_architecture_macros.h4"></a>
+        <span class="phrase"><a name="predef.reference.boost_arch_architecture_macros.boost_arch_ia64"></a></span><a class="link" href="boost_arch_architecture_macros.html#predef.reference.boost_arch_architecture_macros.boost_arch_ia64"><code class="computeroutput"><span class="identifier">BOOST_ARCH_IA64</span></code></a>
+      </h5>
+<p>
+        <a href="http://en.wikipedia.org/wiki/Ia64" target="_top">Intel Itanium 64</a> architecture.
+      </p>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+                <p>
+                  Symbol
+                </p>
+              </th>
+<th>
+                <p>
+                  Version
+                </p>
+              </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">__ia64__</span></code>
+                </p>
+              </td>
+<td>
+                <p>
+                  <span class="bold"><strong>detection</strong></span>
+                </p>
+              </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">_IA64</span></code>
+                </p>
+              </td>
+<td>
+                <p>
+                  <span class="bold"><strong>detection</strong></span>
+                </p>
+              </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">__IA64__</span></code>
+                </p>
+              </td>
+<td>
+                <p>
+                  <span class="bold"><strong>detection</strong></span>
+                </p>
+              </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">__ia64</span></code>
+                </p>
+              </td>
+<td>
+                <p>
+                  <span class="bold"><strong>detection</strong></span>
+                </p>
+              </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">_M_IA64</span></code>
+                </p>
+              </td>
+<td>
+                <p>
+                  <span class="bold"><strong>detection</strong></span>
+                </p>
+              </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">__itanium__</span></code>
+                </p>
+              </td>
+<td>
+                <p>
+                  <span class="bold"><strong>detection</strong></span>
+                </p>
+              </td>
+</tr>
+</tbody>
+</table></div>
+<h5>
+<a name="predef.reference.boost_arch_architecture_macros.h5"></a>
        <span class="phrase"><a name="predef.reference.boost_arch_architecture_macros.boost_arch_m68k"></a></span><a class="link" href="boost_arch_architecture_macros.html#predef.reference.boost_arch_architecture_macros.boost_arch_m68k"><code class="computeroutput"><span class="identifier">BOOST_ARCH_M68K</span></code></a>
      </h5>
 <p>
@@ -658,7 +757,7 @@
 </tbody>
 </table></div>
 <h5>
-<a name="predef.reference.boost_arch_architecture_macros.h5"></a>
+<a name="predef.reference.boost_arch_architecture_macros.h6"></a>
        <span class="phrase"><a name="predef.reference.boost_arch_architecture_macros.boost_arch_mips"></a></span><a class="link" href="boost_arch_architecture_macros.html#predef.reference.boost_arch_architecture_macros.boost_arch_mips"><code class="computeroutput"><span class="identifier">BOOST_ARCH_MIPS</span></code></a>
      </h5>
 <p>
@@ -842,7 +941,7 @@
 </tbody>
 </table></div>
 <h5>
-<a name="predef.reference.boost_arch_architecture_macros.h6"></a>
+<a name="predef.reference.boost_arch_architecture_macros.h7"></a>
        <span class="phrase"><a name="predef.reference.boost_arch_architecture_macros.boost_arch_parisk"></a></span><a class="link" href="boost_arch_architecture_macros.html#predef.reference.boost_arch_architecture_macros.boost_arch_parisk"><code class="computeroutput"><span class="identifier">BOOST_ARCH_PARISK</span></code></a>
      </h5>
 <p>
@@ -1002,7 +1101,7 @@
 </tbody>
 </table></div>
 <h5>
-<a name="predef.reference.boost_arch_architecture_macros.h7"></a>
+<a name="predef.reference.boost_arch_architecture_macros.h8"></a>
        <span class="phrase"><a name="predef.reference.boost_arch_architecture_macros.boost_arch_ppc"></a></span><a class="link" href="boost_arch_architecture_macros.html#predef.reference.boost_arch_architecture_macros.boost_arch_ppc"><code class="computeroutput"><span class="identifier">BOOST_ARCH_PPC</span></code></a>
      </h5>
 <p>
@@ -1209,7 +1308,7 @@
 </tbody>
 </table></div>
 <h5>
-<a name="predef.reference.boost_arch_architecture_macros.h8"></a>
+<a name="predef.reference.boost_arch_architecture_macros.h9"></a>
        <span class="phrase"><a name="predef.reference.boost_arch_architecture_macros.boost_arch_pyramid"></a></span><a class="link" href="boost_arch_architecture_macros.html#predef.reference.boost_arch_architecture_macros.boost_arch_pyramid"><code class="computeroutput"><span class="identifier">BOOST_ARCH_PYRAMID</span></code></a>
      </h5>
 <p>
@@ -1246,7 +1345,7 @@
 </tr></tbody>
 </table></div>
 <h5>
-<a name="predef.reference.boost_arch_architecture_macros.h9"></a>
+<a name="predef.reference.boost_arch_architecture_macros.h10"></a>
        <span class="phrase"><a name="predef.reference.boost_arch_architecture_macros.boost_arch_rs6000"></a></span><a class="link" href="boost_arch_architecture_macros.html#predef.reference.boost_arch_architecture_macros.boost_arch_rs6000"><code class="computeroutput"><span class="identifier">BOOST_ARCH_RS6000</span></code></a>
      </h5>
 <p>
@@ -1333,7 +1432,7 @@
 </tbody>
 </table></div>
 <h5>
-<a name="predef.reference.boost_arch_architecture_macros.h10"></a>
+<a name="predef.reference.boost_arch_architecture_macros.h11"></a>
        <span class="phrase"><a name="predef.reference.boost_arch_architecture_macros.boost_arch_sparc"></a></span><a class="link" href="boost_arch_architecture_macros.html#predef.reference.boost_arch_architecture_macros.boost_arch_sparc"><code class="computeroutput"><span class="identifier">BOOST_ARCH_SPARC</span></code></a>
      </h5>
 <p>
@@ -1408,7 +1507,7 @@
 </tbody>
 </table></div>
 <h5>
-<a name="predef.reference.boost_arch_architecture_macros.h11"></a>
+<a name="predef.reference.boost_arch_architecture_macros.h12"></a>
        <span class="phrase"><a name="predef.reference.boost_arch_architecture_macros.boost_arch_sh"></a></span><a class="link" href="boost_arch_architecture_macros.html#predef.reference.boost_arch_architecture_macros.boost_arch_sh"><code class="computeroutput"><span class="identifier">BOOST_ARCH_SH</span></code></a>
      </h5>
 <p>
@@ -1520,7 +1619,7 @@
 </tbody>
 </table></div>
 <h5>
-<a name="predef.reference.boost_arch_architecture_macros.h12"></a>
+<a name="predef.reference.boost_arch_architecture_macros.h13"></a>
        <span class="phrase"><a name="predef.reference.boost_arch_architecture_macros.boost_arch_sys370"></a></span><a class="link" href="boost_arch_architecture_macros.html#predef.reference.boost_arch_architecture_macros.boost_arch_sys370"><code class="computeroutput"><span class="identifier">BOOST_ARCH_SYS370</span></code></a>
      </h5>
 <p>
@@ -1571,7 +1670,7 @@
 </tbody>
 </table></div>
 <h5>
-<a name="predef.reference.boost_arch_architecture_macros.h13"></a>
+<a name="predef.reference.boost_arch_architecture_macros.h14"></a>
        <span class="phrase"><a name="predef.reference.boost_arch_architecture_macros.boost_arch_sys390"></a></span><a class="link" href="boost_arch_architecture_macros.html#predef.reference.boost_arch_architecture_macros.boost_arch_sys390"><code class="computeroutput"><span class="identifier">BOOST_ARCH_SYS390</span></code></a>
      </h5>
 <p>
@@ -1622,7 +1721,7 @@
 </tbody>
 </table></div>
 <h5>
-<a name="predef.reference.boost_arch_architecture_macros.h14"></a>
+<a name="predef.reference.boost_arch_architecture_macros.h15"></a>
        <span class="phrase"><a name="predef.reference.boost_arch_architecture_macros.boost_arch_x86"></a></span><a class="link" href="boost_arch_architecture_macros.html#predef.reference.boost_arch_architecture_macros.boost_arch_x86"><code class="computeroutput"><span class="identifier">BOOST_ARCH_X86</span></code></a>
      </h5>
 <p>
@@ -1631,7 +1730,7 @@
        or <code class="computeroutput"><span class="identifier">BOOST_ARCH_X86_64</span></code> is detected.
      </p>
 <h5>
-<a name="predef.reference.boost_arch_architecture_macros.h15"></a>
+<a name="predef.reference.boost_arch_architecture_macros.h16"></a>
        <span class="phrase"><a name="predef.reference.boost_arch_architecture_macros.boost_arch_z"></a></span><a class="link" href="boost_arch_architecture_macros.html#predef.reference.boost_arch_architecture_macros.boost_arch_z"><code class="computeroutput"><span class="identifier">BOOST_ARCH_Z</span></code></a>
      </h5>
 <p>
@@ -1669,7 +1768,7 @@
 </tr></tbody>
 </table></div>
 <h5>
-<a name="predef.reference.boost_arch_architecture_macros.h16"></a>
+<a name="predef.reference.boost_arch_architecture_macros.h17"></a>
        <span class="phrase"><a name="predef.reference.boost_arch_architecture_macros.boost_arch_x86_32"></a></span><a class="link" href="boost_arch_architecture_macros.html#predef.reference.boost_arch_architecture_macros.boost_arch_x86_32"><code class="computeroutput"><span class="identifier">BOOST_ARCH_X86_32</span></code></a>
      </h5>
 <p>
@@ -1901,7 +2000,7 @@
 </tbody>
 </table></div>
 <h5>
-<a name="predef.reference.boost_arch_architecture_macros.h17"></a>
+<a name="predef.reference.boost_arch_architecture_macros.h18"></a>
        <span class="phrase"><a name="predef.reference.boost_arch_architecture_macros.boost_arch_x86_64"></a></span><a class="link" href="boost_arch_architecture_macros.html#predef.reference.boost_arch_architecture_macros.boost_arch_x86_64"><code class="computeroutput"><span class="identifier">BOOST_ARCH_X86_64</span></code></a>
      </h5>
 <p>
@@ -1950,78 +2049,6 @@
              </td>
 </tr>
 <tr>
-<td>
-                <p>
-                  <code class="computeroutput"><span class="identifier">__ia64__</span></code>
-                </p>
-              </td>
-<td>
-                <p>
-                  <span class="bold"><strong>detection</strong></span>
-                </p>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  <code class="computeroutput"><span class="identifier">_IA64</span></code>
-                </p>
-              </td>
-<td>
-                <p>
-                  <span class="bold"><strong>detection</strong></span>
-                </p>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  <code class="computeroutput"><span class="identifier">__IA64__</span></code>
-                </p>
-              </td>
-<td>
-                <p>
-                  <span class="bold"><strong>detection</strong></span>
-                </p>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  <code class="computeroutput"><span class="identifier">__ia64</span></code>
-                </p>
-              </td>
-<td>
-                <p>
-                  <span class="bold"><strong>detection</strong></span>
-                </p>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  <code class="computeroutput"><span class="identifier">_M_IA64</span></code>
-                </p>
-              </td>
-<td>
-                <p>
-                  <span class="bold"><strong>detection</strong></span>
-                </p>
-              </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  <code class="computeroutput"><span class="identifier">__itanium__</span></code>
-                </p>
-              </td>
-<td>
-                <p>
-                  <span class="bold"><strong>detection</strong></span>
-                </p>
-              </td>
-</tr>
-<tr>
 <td>
                <p>
                  <code class="computeroutput"><span class="identifier">__amd64__</span></code>
--- 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 <boost/predef/architecture/arm.h>
 #include <boost/predef/architecture/blackfin.h>
 #include <boost/predef/architecture/convex.h>
+#include <boost/predef/architecture/ia64.h>
 #include <boost/predef/architecture/m68k.h>
 #include <boost/predef/architecture/mips.h>
 #include <boost/predef/architecture/parisc.h>
--- a/include/boost/predef/architecture/ia64.h
+++ 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 <boost/predef/version_number.h>
+#include <boost/predef/make.h>
+
+/*`
+[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/detail/test.h>
+BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_IA64,BOOST_ARCH_IA64_NAME)
+
+#endif
--- 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