diff options
| author | WenHan Gu <Wenhan.gu@mediatek.com> | 2013-11-06 00:00:48 +0800 |
|---|---|---|
| committer | Logan Chien <tzuhsiang.chien@gmail.com> | 2014-09-16 00:03:43 +0800 |
| commit | a8d4d135b714ee06f4034e45c050732eea7481ac (patch) | |
| tree | 5ae1e86be611ae3bf13ed2ab9680bebdcf7f082c | |
| parent | d79a4e30883511579548f6ea6b1919f3241bc09e (diff) | |
| download | llvm-a8d4d135b714ee06f4034e45c050732eea7481ac.tar.gz | |
[ndk][conf] Patch for canadian cross build via NDK standalone.
| -rw-r--r-- | lib/ExecutionEngine/JIT/JITMemoryManager.cpp | 2 | ||||
| -rw-r--r-- | utils/unittest/googletest/include/gtest/internal/gtest-port.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/ExecutionEngine/JIT/JITMemoryManager.cpp b/lib/ExecutionEngine/JIT/JITMemoryManager.cpp index 584b93f8150..1660ce2a467 100644 --- a/lib/ExecutionEngine/JIT/JITMemoryManager.cpp +++ b/lib/ExecutionEngine/JIT/JITMemoryManager.cpp @@ -805,7 +805,9 @@ public: sys::DynamicLibrary::AddSymbol("lstat", (void*)(intptr_t)lstat); sys::DynamicLibrary::AddSymbol("stat64", (void*)(intptr_t)stat64); sys::DynamicLibrary::AddSymbol("\x1stat64", (void*)(intptr_t)stat64); +#ifndef __ANDROID__ sys::DynamicLibrary::AddSymbol("\x1open64", (void*)(intptr_t)open64); +#endif sys::DynamicLibrary::AddSymbol("\x1lseek64", (void*)(intptr_t)lseek64); sys::DynamicLibrary::AddSymbol("fstat64", (void*)(intptr_t)fstat64); sys::DynamicLibrary::AddSymbol("lstat64", (void*)(intptr_t)lstat64); diff --git a/utils/unittest/googletest/include/gtest/internal/gtest-port.h b/utils/unittest/googletest/include/gtest/internal/gtest-port.h index f5bfd4e1d2e..b4a239eb2a7 100644 --- a/utils/unittest/googletest/include/gtest/internal/gtest-port.h +++ b/utils/unittest/googletest/include/gtest/internal/gtest-port.h @@ -523,11 +523,11 @@ #ifndef GTEST_HAS_CLONE // The user didn't tell us, so we need to figure it out. -# if GTEST_OS_LINUX && !defined(__ia64__) +# if GTEST_OS_LINUX && !defined(__ia64__) && !defined(__ANDROID__) # define GTEST_HAS_CLONE 1 # else # define GTEST_HAS_CLONE 0 -# endif // GTEST_OS_LINUX && !defined(__ia64__) +# endif // GTEST_OS_LINUX && !defined(__ia64__) && !defined(__ANDROID__) #endif // GTEST_HAS_CLONE |