Index: include/limits
===================================================================
--- include/limits
+++ include/limits
@@ -237,7 +237,7 @@
     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;
Index: test/language.support/support.limits/limits/numeric.limits.members/traps.pass.cpp
===================================================================
--- test/language.support/support.limits/limits/numeric.limits.members/traps.pass.cpp
+++ 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;