From e2e4aa5db89b2425fb3c6be7c4a2fd02c778b028 Mon Sep 17 00:00:00 2001 From: Bin Li Date: Tue, 2 Apr 2019 16:31:40 +0800 Subject: [PATCH] Use ld gold to build binaries --- mace/examples/cli/BUILD.bazel | 2 ++ mace/tools/validation/BUILD.bazel | 10 ++++++++-- third_party/hta/BUILD.bazel | 1 - third_party/hta/arm64-v8a/libcdsprpc.so | Bin 7136 -> 0 bytes third_party/nnlib/BUILD.bazel | 1 - third_party/nnlib/arm64-v8a/libcdsprpc.so | Bin 7136 -> 0 bytes 6 files changed, 10 insertions(+), 4 deletions(-) delete mode 100755 third_party/hta/arm64-v8a/libcdsprpc.so delete mode 100755 third_party/nnlib/arm64-v8a/libcdsprpc.so diff --git a/mace/examples/cli/BUILD.bazel b/mace/examples/cli/BUILD.bazel index 693009e3..70db6722 100644 --- a/mace/examples/cli/BUILD.bazel +++ b/mace/examples/cli/BUILD.bazel @@ -18,6 +18,7 @@ cc_binary( "-DMACE_ENABLE_OPENCL", ]), linkopts = [ + "-fuse-ld=gold", "-lm", "-ldl", ] + if_openmp_enabled([ @@ -53,6 +54,7 @@ cc_binary( "-DMACE_ENABLE_OPENCL", ]), linkopts = [ + "-fuse-ld=gold", "-lm", "-ldl", ] + if_android([ diff --git a/mace/tools/validation/BUILD.bazel b/mace/tools/validation/BUILD.bazel index d85283ac..6793b898 100644 --- a/mace/tools/validation/BUILD.bazel +++ b/mace/tools/validation/BUILD.bazel @@ -10,7 +10,11 @@ cc_binary( ] + if_opencl_enabled([ "-DMACE_ENABLE_OPENCL", ]), - linkopts = if_openmp_enabled(["-fopenmp"]), + linkopts = [ + "-fuse-ld=gold", + ] + if_openmp_enabled([ + "-fopenmp", + ]), linkstatic = 1, deps = [ "//external:gflags_nothreads", @@ -29,7 +33,9 @@ cc_binary( ] + if_opencl_enabled([ "-DMACE_ENABLE_OPENCL", ]), - linkopts = if_openmp_enabled([ + linkopts = [ + "-fuse-ld=gold", + ] + if_openmp_enabled([ "-fopenmp", ]), linkstatic = 0, diff --git a/third_party/hta/BUILD.bazel b/third_party/hta/BUILD.bazel index 73854727..4f15e31c 100644 --- a/third_party/hta/BUILD.bazel +++ b/third_party/hta/BUILD.bazel @@ -17,7 +17,6 @@ cc_library( "armeabi-v7a/libhta_hexagon_runtime.so", "armeabi-v7a/libnpu.so", ]) + if_android_arm64([ - "arm64-v8a/libcdsprpc.so", "arm64-v8a/libhta_controller.so", "arm64-v8a/libhta_hexagon_runtime.so", "arm64-v8a/libnpu.so", diff --git a/third_party/hta/arm64-v8a/libcdsprpc.so b/third_party/hta/arm64-v8a/libcdsprpc.so deleted file mode 100755 index 57de01f4887197b0b510f395f828289d74597069..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7136 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