summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJF Bastien <jfb@google.com>2014-11-26 17:51:58 +0000
committerJF Bastien <jfb@google.com>2014-11-26 17:51:58 +0000
commit6317e9b85af993c206923188c2fd2019d8fa8d9e (patch)
treef7ffc0f8f719f3f076895dadf0692c5a4206d879
parent6cb69ffa0a86c7c41d357a6e0dcb05c72308dd6b (diff)
libc++: integral types trap on PNaCl
Reviewers: dschuff, danalbert Subscribers: jfb, cfe-commits Differential Revision: http://reviews.llvm.org/D6411 git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@222842 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--include/limits2
-rw-r--r--test/language.support/support.limits/limits/numeric.limits.members/traps.pass.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/limits b/include/limits
index 1acf03e30..ce967ea1b 100644
--- a/include/limits
+++ b/include/limits
@@ -237,7 +237,7 @@ protected:
static _LIBCPP_CONSTEXPR const bool is_bounded = true;
static _LIBCPP_CONSTEXPR const bool is_modulo = !_VSTD::is_signed<_Tp>::value;
-#if __i386__ || __x86_64__
+#if defined(__i386__) || defined(__x86_64__) || defined(__pnacl__)
static _LIBCPP_CONSTEXPR const bool traps = true;
#else
static _LIBCPP_CONSTEXPR const bool traps = false;
diff --git a/test/language.support/support.limits/limits/numeric.limits.members/traps.pass.cpp b/test/language.support/support.limits/limits/numeric.limits.members/traps.pass.cpp
index 034536341..af93e78c0 100644
--- a/test/language.support/support.limits/limits/numeric.limits.members/traps.pass.cpp
+++ b/test/language.support/support.limits/limits/numeric.limits.members/traps.pass.cpp
@@ -13,7 +13,7 @@
#include <limits>
-#if (defined(__i386__) || defined(__x86_64__))
+#if defined(__i386__) || defined(__x86_64__) || defined(__pnacl__)
static const bool integral_types_trap = true;
#else
static const bool integral_types_trap = false;