From 9b50ba1c2e5a238a9044aed074398ca68e0d87f9 Mon Sep 17 00:00:00 2001 From: Markus Scherer Date: Tue, 14 Mar 2017 18:12:19 +0000 Subject: [PATCH] ICU-13032 turn off the aliasing barrier for PNaCl which does not allow this specific inline assembler instruction X-SVN-Rev: 39795 --- icu4c/source/common/unicode/char16ptr.h | 2 +- icu4c/source/common/unicode/platform.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/icu4c/source/common/unicode/char16ptr.h b/icu4c/source/common/unicode/char16ptr.h index 4035ce9bbbc..27efa5da2d0 100644 --- a/icu4c/source/common/unicode/char16ptr.h +++ b/icu4c/source/common/unicode/char16ptr.h @@ -26,7 +26,7 @@ U_NAMESPACE_BEGIN */ #ifdef U_ALIASING_BARRIER // Use the predefined value. -#elif defined(__clang__) || defined(__GNUC__) +#elif (defined(__clang__) || defined(__GNUC__)) && U_PLATFORM != U_PF_BROWSER_NATIVE_CLIENT # define U_ALIASING_BARRIER(ptr) asm volatile("" : : "rm"(ptr) : "memory") #endif diff --git a/icu4c/source/common/unicode/platform.h b/icu4c/source/common/unicode/platform.h index b553b6878da..e6d449b57ab 100644 --- a/icu4c/source/common/unicode/platform.h +++ b/icu4c/source/common/unicode/platform.h @@ -150,7 +150,7 @@ # define U_PLATFORM U_PF_ANDROID /* Android wchar_t support depends on the API level. */ # include -#elif defined(__native_client__) +#elif defined(__pnacl__) || defined(__native_client__) # define U_PLATFORM U_PF_BROWSER_NATIVE_CLIENT #elif defined(linux) || defined(__linux__) || defined(__linux) # define U_PLATFORM U_PF_LINUX