From 6317e9b85af993c206923188c2fd2019d8fa8d9e Mon Sep 17 00:00:00 2001 From: JF Bastien Date: Wed, 26 Nov 2014 17:51:58 +0000 Subject: [PATCH] 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 --- include/limits | 2 +- .../support.limits/limits/numeric.limits.members/traps.pass.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/limits b/include/limits index 1acf03e3..ce967ea1 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 03453634..af93e78c 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 -#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;