From 773eb6d2fea1bd5cd2f116317e103f49e403e530 Mon Sep 17 00:00:00 2001 From: Liangliang He Date: Thu, 27 Sep 2018 16:47:20 +0800 Subject: [PATCH] Fix ARM Linux toolchain --- mace/core/runtime/opencl/opencl_wrapper.cc | 13 +++++++++---- tools/aarch64_compiler/CROSSTOOL | 2 +- tools/arm_compiler/CROSSTOOL | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/mace/core/runtime/opencl/opencl_wrapper.cc b/mace/core/runtime/opencl/opencl_wrapper.cc index a7fd447e..f7706cff 100644 --- a/mace/core/runtime/opencl/opencl_wrapper.cc +++ b/mace/core/runtime/opencl/opencl_wrapper.cc @@ -268,22 +268,27 @@ bool OpenCLLibrary::Load() { return true; } + // Add customized OpenCL search path here const std::vector paths = { "libOpenCL.so", #if defined(__aarch64__) - // Qualcomm Adreno + // Qualcomm Adreno with Android "/system/vendor/lib64/libOpenCL.so", "/system/lib64/libOpenCL.so", - // Mali + // Mali with Android "/system/vendor/lib64/egl/libGLES_mali.so", "/system/lib64/egl/libGLES_mali.so", + // Typical Linux board + "/usr/lib/aarch64-linux-gnu/libOpenCL.so", #else - // Qualcomm Adreno + // Qualcomm Adreno with Android "/system/vendor/lib/libOpenCL.so", "/system/lib/libOpenCL.so", - // Mali + // Mali with Android "/system/vendor/lib/egl/libGLES_mali.so", "/system/lib/egl/libGLES_mali.so", + // Typical Linux board + "/usr/lib/arm-linux-gnueabihf/libOpenCL.so", #endif }; diff --git a/tools/aarch64_compiler/CROSSTOOL b/tools/aarch64_compiler/CROSSTOOL index dbc3ac55..0180cc1e 100644 --- a/tools/aarch64_compiler/CROSSTOOL +++ b/tools/aarch64_compiler/CROSSTOOL @@ -14,7 +14,7 @@ toolchain { compiler: "gcc" host_system_name: "aarch64" needsPic: true - supports_gold_linker: false + supports_gold_linker: true supports_incremental_linker: false supports_fission: false supports_interface_shared_objects: false diff --git a/tools/arm_compiler/CROSSTOOL b/tools/arm_compiler/CROSSTOOL index 82237dd3..592fb12c 100644 --- a/tools/arm_compiler/CROSSTOOL +++ b/tools/arm_compiler/CROSSTOOL @@ -14,7 +14,7 @@ toolchain { compiler: "gcc" host_system_name: "armeabi-v7a" needsPic: true - supports_gold_linker: false + supports_gold_linker: true supports_incremental_linker: false supports_fission: false supports_interface_shared_objects: false -- GitLab