Index: ppapi/native_client/src/trusted/plugin/arch_x86/sandbox_isa.cc |
diff --git a/ppapi/native_client/src/trusted/plugin/arch_x86/sandbox_isa.cc b/ppapi/native_client/src/trusted/plugin/arch_x86/sandbox_isa.cc |
index 3f5ab0db243fdb6ae6eea5860f2906f538e9f4b0..99e033925f97bcf974d6c96ea26bfeeb2c69c6c2 100644 |
--- a/ppapi/native_client/src/trusted/plugin/arch_x86/sandbox_isa.cc |
+++ b/ppapi/native_client/src/trusted/plugin/arch_x86/sandbox_isa.cc |
@@ -5,13 +5,14 @@ |
#include "native_client/src/trusted/platform_qualify/nacl_os_qualify.h" |
#include "ppapi/native_client/src/trusted/plugin/nexe_arch.h" |
-namespace { |
// The list of supported ISA strings for x86. See issue: |
// http://code.google.com/p/nativeclient/issues/detail?id=1040 for more |
// information. Note that these string are to be case-insensitive compared. |
-const char* const kNexeArchX86_32 = "x86-32"; |
-const char* const kNexeArchX86_64 = "x86-64"; |
-} // namespace |
+const char kNexeArchX86_64[] = "x86-64"; |
+#if !((NACL_ARCH(NACL_BUILD_ARCH) == NACL_x86 && NACL_BUILD_SUBARCH == 64) && \ |
+ (defined(NACL_LINUX) || defined(NACL_OSX))) |
+const char kNexeArchX86_32[] = "x86-32"; |
+#endif |
namespace plugin { |
const char* GetSandboxISA() { |