[libcxx] r222842 - libc++: integral types trap on PNaCl

[JF Bastien]

Author: jfb
Date: Wed Nov 26 11:51:58 2014
New Revision: 222842

URL: http://llvm.org/viewvc/llvm-project?rev=222842&view=rev
Log:
libc++: integral types trap on PNaCl

    Reviewers: dschuff, danalbert

    Subscribers: jfb, cfe-commits

    Differential Revision: http://reviews.llvm.org/D6411

Modified:
    libcxx/trunk/include/limits
    libcxx/trunk/test/language.support/support.limits/limits/numeric.limits.members/traps.pass.cpp

Modified: libcxx/trunk/include/limits
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/limits?rev=222842&r1=222841&r2=222842&view=diff
==============================================================================
--- libcxx/trunk/include/limits (original)
+++ libcxx/trunk/include/limits Wed Nov 26 11:51:58 2014
@@ -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;

Modified: libcxx/trunk/test/language.support/support.limits/limits/numeric.limits.members/traps.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/language.support/support.limits/limits/numeric.limits.members/traps.pass.cpp?rev=222842&r1=222841&r2=222842&view=diff
==============================================================================
--- libcxx/trunk/test/language.support/support.limits/limits/numeric.limits.members/traps.pass.cpp (original)
+++ libcxx/trunk/test/language.support/support.limits/limits/numeric.limits.members/traps.pass.cpp Wed Nov 26 11:51:58 2014
@@ -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;