diff options
| author | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-14 17:38:44 +0000 |
|---|---|---|
| committer | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-14 17:38:44 +0000 |
| commit | aaec817ec42956e6e08a87b22026183b5cd5f2fc (patch) | |
| tree | a0b16502f9b3c03dc446bd97523c71b144d1d9c3 /ppapi | |
| parent | 5eb219825a22c4873ff57d3380a0e48b84b8bbbb (diff) | |
| download | chromium_src-aaec817ec42956e6e08a87b22026183b5cd5f2fc.zip chromium_src-aaec817ec42956e6e08a87b22026183b5cd5f2fc.tar.gz chromium_src-aaec817ec42956e6e08a87b22026183b5cd5f2fc.tar.bz2 | |
NaCl: Remove the only use of NACL_ARCH_CPU_* #defines
Use NACL_BUILD_ARCH/SUBARCH instead, since that is the usual way of
checking the architecture in NaCl code.
BUG=none
TEST=trybots
Review URL: https://chromiumcodereview.appspot.com/10908254
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156827 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/native_client/src/trusted/plugin/arch_x86/sandbox_isa.cc | 3 |
1 files changed, 2 insertions, 1 deletions
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 d9f9c0c..f71c2be 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 @@ -15,7 +15,8 @@ const char* const kNexeArchX86_64 = "x86-64"; namespace plugin { const char* GetSandboxISA() { -#if defined(NACL_ARCH_CPU_X86_64) && (defined(NACL_LINUX) || defined(NACL_OSX)) +#if (NACL_ARCH(NACL_BUILD_ARCH) == NACL_x86 && NACL_BUILD_SUBARCH == 64) && \ + (defined(NACL_LINUX) || defined(NACL_OSX)) return kNexeArchX86_64; // 64-bit Linux or Mac. #else return NaClOsIs64BitWindows() == 1 |