Subject: [Boost-commit] svn:boost r77538 - trunk/boost/context
From: oliver.kowalke_at_[hidden]
Date: 2012-03-25 03:17:30
Author: olli
Date: 2012-03-25 03:17:28 EDT (Sun, 25 Mar 2012)
New Revision: 77538
URL: http://svn.boost.org/trac/boost/changeset/77538
Log:
context: fix for icc - test for x86_64 before i386
Text files modified:
trunk/boost/context/fcontext.hpp | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
Modified: trunk/boost/context/fcontext.hpp
==============================================================================
--- trunk/boost/context/fcontext.hpp (original)
+++ trunk/boost/context/fcontext.hpp 2012-03-25 03:17:28 EDT (Sun, 25 Mar 2012)
@@ -20,8 +20,17 @@
# include BOOST_ABI_PREFIX
#endif
+// x86_64
+#if defined(__x86_64__) || defined(__x86_64) \
+ || defined(__amd64__) || defined(__amd64) \
+ || defined(_M_X64) || defined(_M_AMD64)
+# if defined(BOOST_WINDOWS)
+# include <boost/context/detail/fcontext_x86_64_win.hpp>
+# else
+# include <boost/context/detail/fcontext_x86_64.hpp>
+# endif
// i386
-#if defined(i386) || defined(__i386__) || defined(__i386) \
+#elif defined(i386) || defined(__i386__) || defined(__i386) \
|| defined(__i486__) || defined(__i586__) || defined(__i686__) \
|| defined(__X86__) || defined(_X86_) || defined(__THW_INTEL__) \
|| defined(__I86__) || defined(__INTEL__) || defined(__IA32__) \
@@ -29,17 +38,9 @@
# if defined(BOOST_WINDOWS)
# include <boost/context/detail/fcontext_i386_win.hpp>
# else
+# error "wrong platform"
# include <boost/context/detail/fcontext_i386.hpp>
# endif
-// x86_64
-#elif defined(__x86_64__) || defined(__x86_64) \
- || defined(__amd64__) || defined(__amd64) \
- || defined(_M_X64) || defined(_M_AMD64)
-# if defined(BOOST_WINDOWS)
-# include <boost/context/detail/fcontext_x86_64_win.hpp>
-# else
-# include <boost/context/detail/fcontext_x86_64.hpp>
-# endif
// arm
#elif defined(__arm__) || defined(__thumb__) || defined(__TARGET_ARCH_ARM) \
|| defined(__TARGET_ARCH_THUMB) || defined(_ARM)