commit 6d175f40931be11bc002c517be2df3dc3e926d52
author Nicolas Capens <capn@google.com> Fri Mar 20 13:23:01 2015 -0700
committer Nicolas Capens <capn@google.com> Mon Mar 23 15:27:05 2015 +0000
tree dbb22136dfa2fe1e3144c463205e342986354cf8
parent 4c5b1a353de0e41572a325d76a8c21a0257220a9

Remove symbols not available on Android

Change-Id: I35296240662157fb4d0172fd386d82ab038634ca
Reviewed-on: https://swiftshader-review.googlesource.com/2668
Tested-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

src/LLVM/lib/ExecutionEngine/JIT/Intercept.cpp

diff --git a/src/LLVM/lib/ExecutionEngine/JIT/Intercept.cpp b/src/LLVM/lib/ExecutionEngine/JIT/Intercept.cpp
index 2251a8e..a81882c 100644
--- a/src/LLVM/lib/ExecutionEngine/JIT/Intercept.cpp
+++ b/src/LLVM/lib/ExecutionEngine/JIT/Intercept.cpp
@@ -65,9 +65,6 @@
     sys::DynamicLibrary::AddSymbol("fstat", (void*)(intptr_t)fstat);
     sys::DynamicLibrary::AddSymbol("lstat", (void*)(intptr_t)lstat);
     sys::DynamicLibrary::AddSymbol("stat64", (void*)(intptr_t)stat64);
-    sys::DynamicLibrary::AddSymbol("\x1stat64", (void*)(intptr_t)stat64);
-    sys::DynamicLibrary::AddSymbol("\x1open64", (void*)(intptr_t)open64);
-    sys::DynamicLibrary::AddSymbol("\x1lseek64", (void*)(intptr_t)lseek64);
     sys::DynamicLibrary::AddSymbol("fstat64", (void*)(intptr_t)fstat64);
     sys::DynamicLibrary::AddSymbol("lstat64", (void*)(intptr_t)lstat64);
     sys::DynamicLibrary::AddSymbol("atexit", (void*)(intptr_t)atexit);

src/LLVM/lib/Support/DynamicLibrary.cpp

diff --git a/src/LLVM/lib/Support/DynamicLibrary.cpp b/src/LLVM/lib/Support/DynamicLibrary.cpp
index fb02c07..bd68083 100644
--- a/src/LLVM/lib/Support/DynamicLibrary.cpp
+++ b/src/LLVM/lib/Support/DynamicLibrary.cpp
@@ -160,7 +160,7 @@
 // On linux we have a weird situation. The stderr/out/in symbols are both
 // macros and global variables because of standards requirements. So, we
 // boldly use the EXPLICIT_SYMBOL macro without checking for a #define first.
-#if defined(__linux__)
+#if defined(__linux__) && !defined(__ANDROID__)
   {
     EXPLICIT_SYMBOL(stderr);
     EXPLICIT_SYMBOL(stdout);