提交 f2f0a76c 编写于 作者: 李寅

Merge branch 'arm_linux' into 'master'

Fix ARM Linux toolchain

See merge request !816
...@@ -268,22 +268,27 @@ bool OpenCLLibrary::Load() { ...@@ -268,22 +268,27 @@ bool OpenCLLibrary::Load() {
return true; return true;
} }
// Add customized OpenCL search path here
const std::vector<std::string> paths = { const std::vector<std::string> paths = {
"libOpenCL.so", "libOpenCL.so",
#if defined(__aarch64__) #if defined(__aarch64__)
// Qualcomm Adreno // Qualcomm Adreno with Android
"/system/vendor/lib64/libOpenCL.so", "/system/vendor/lib64/libOpenCL.so",
"/system/lib64/libOpenCL.so", "/system/lib64/libOpenCL.so",
// Mali // Mali with Android
"/system/vendor/lib64/egl/libGLES_mali.so", "/system/vendor/lib64/egl/libGLES_mali.so",
"/system/lib64/egl/libGLES_mali.so", "/system/lib64/egl/libGLES_mali.so",
// Typical Linux board
"/usr/lib/aarch64-linux-gnu/libOpenCL.so",
#else #else
// Qualcomm Adreno // Qualcomm Adreno with Android
"/system/vendor/lib/libOpenCL.so", "/system/vendor/lib/libOpenCL.so",
"/system/lib/libOpenCL.so", "/system/lib/libOpenCL.so",
// Mali // Mali with Android
"/system/vendor/lib/egl/libGLES_mali.so", "/system/vendor/lib/egl/libGLES_mali.so",
"/system/lib/egl/libGLES_mali.so", "/system/lib/egl/libGLES_mali.so",
// Typical Linux board
"/usr/lib/arm-linux-gnueabihf/libOpenCL.so",
#endif #endif
}; };
......
...@@ -14,7 +14,7 @@ toolchain { ...@@ -14,7 +14,7 @@ toolchain {
compiler: "gcc" compiler: "gcc"
host_system_name: "aarch64" host_system_name: "aarch64"
needsPic: true needsPic: true
supports_gold_linker: false supports_gold_linker: true
supports_incremental_linker: false supports_incremental_linker: false
supports_fission: false supports_fission: false
supports_interface_shared_objects: false supports_interface_shared_objects: false
......
...@@ -14,7 +14,7 @@ toolchain { ...@@ -14,7 +14,7 @@ toolchain {
compiler: "gcc" compiler: "gcc"
host_system_name: "armeabi-v7a" host_system_name: "armeabi-v7a"
needsPic: true needsPic: true
supports_gold_linker: false supports_gold_linker: true
supports_incremental_linker: false supports_incremental_linker: false
supports_fission: false supports_fission: false
supports_interface_shared_objects: false supports_interface_shared_objects: false
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册