From fc464111ac5c49791e44122e5946e521b25840bd Mon Sep 17 00:00:00 2001 From: Reuben Morais Date: Tue, 9 Jun 2020 18:48:42 +0200 Subject: [PATCH 1/3] Disable -soname linker parameter on iOS --- tensorflow/tensorflow.bzl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl index 4c93ab9ecd383c..c561d52faa2c41 100644 --- a/tensorflow/tensorflow.bzl +++ b/tensorflow/tensorflow.bzl @@ -613,6 +613,9 @@ def tf_cc_shared_object( "-Wl,-install_name,@rpath/" + soname, ], clean_dep("//tensorflow:windows"): [], + clean_dep("//tensorflow:ios"): [ + "-Wl,-install_name,@rpath/" + soname + ], "//conditions:default": [ "-Wl,-soname," + soname, ], From 0854bb5188a3150a4d75a1c71ee610b0d45cfcb1 Mon Sep 17 00:00:00 2001 From: Reuben Morais Date: Tue, 14 Jul 2020 22:32:52 +0200 Subject: [PATCH 2/3] Omit incompatible linker options in iOS builds --- tensorflow/lite/c/BUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/tensorflow/lite/c/BUILD b/tensorflow/lite/c/BUILD index f9549fc3571b51..c97cdc7bab2b52 100644 --- a/tensorflow/lite/c/BUILD +++ b/tensorflow/lite/c/BUILD @@ -26,6 +26,7 @@ tflite_cc_shared_object( "-Wl,-exported_symbols_list,$(location //tensorflow/lite/c:exported_symbols.lds)", ], "//tensorflow:windows": [], + "//tensorflow:ios": [], "//conditions:default": [ "-z defs", "-Wl,--version-script,$(location //tensorflow/lite/c:version_script.lds)", From 39ed4fa1142f60d0ec6601b17f91b84deffcbc66 Mon Sep 17 00:00:00 2001 From: Alexandre Lissy Date: Sat, 1 Aug 2020 05:14:01 +0200 Subject: [PATCH 3/3] Fix #3207: do not force -shared on the linkage --- .../linaro_toolchain_config.bzl | 17 ++++++++++++++++- .../linaro_toolchain_config.bzl | 17 ++++++++++++++++- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/tools/arm_compiler/linaro-gcc72-aarch64/linaro_toolchain_config.bzl b/tools/arm_compiler/linaro-gcc72-aarch64/linaro_toolchain_config.bzl index ead85fdf7bf47a..938e1fb976ac6f 100644 --- a/tools/arm_compiler/linaro-gcc72-aarch64/linaro_toolchain_config.bzl +++ b/tools/arm_compiler/linaro-gcc72-aarch64/linaro_toolchain_config.bzl @@ -150,6 +150,21 @@ def _impl(ctx): ], ) + shared_flag_feature = feature( + name = "shared_flag", + flag_sets = [ + flag_set( + actions = [ + ACTION_NAMES.cpp_link_dynamic_library, + ACTION_NAMES.cpp_link_nodeps_dynamic_library, + ACTION_NAMES.lto_index_for_dynamic_library, + ACTION_NAMES.lto_index_for_nodeps_dynamic_library, + ], + flag_groups = [flag_group(flags = ["-shared"])], + ), + ], + ) + sysroot_feature = feature( name = "sysroot", enabled = True, @@ -380,7 +395,6 @@ def _impl(ctx): "-Lexternal/LinaroAarch64Gcc72/aarch64-linux-gnu/libc/lib", "-Lexternal/LinaroAarch64Gcc72/aarch64-linux-gnu/libc/usr/lib", "-Bexternal/LinaroAarch64Gcc72/aarch64-linux-gnu/bin", - "-shared", ], ), ], @@ -407,6 +421,7 @@ def _impl(ctx): dbg_feature, user_compile_flags_feature, user_link_flags_feature, + shared_flag_feature, sysroot_feature, unfiltered_compile_flags_feature, ] diff --git a/tools/arm_compiler/linaro-gcc72-armeabi/linaro_toolchain_config.bzl b/tools/arm_compiler/linaro-gcc72-armeabi/linaro_toolchain_config.bzl index 79051704cb0c37..293cb1e5c8e595 100644 --- a/tools/arm_compiler/linaro-gcc72-armeabi/linaro_toolchain_config.bzl +++ b/tools/arm_compiler/linaro-gcc72-armeabi/linaro_toolchain_config.bzl @@ -150,6 +150,21 @@ def _impl(ctx): ], ) + shared_flag_feature = feature( + name = "shared_flag", + flag_sets = [ + flag_set( + actions = [ + ACTION_NAMES.cpp_link_dynamic_library, + ACTION_NAMES.cpp_link_nodeps_dynamic_library, + ACTION_NAMES.lto_index_for_dynamic_library, + ACTION_NAMES.lto_index_for_nodeps_dynamic_library, + ], + flag_groups = [flag_group(flags = ["-shared"])], + ), + ], + ) + sysroot_feature = feature( name = "sysroot", enabled = True, @@ -380,7 +395,6 @@ def _impl(ctx): "-Lexternal/LinaroArmGcc72/arm-linux-gnueabihf/libc/lib", "-Lexternal/LinaroArmGcc72/arm-linux-gnueabihf/libc/usr/lib", "-Bexternal/LinaroArmGcc72/arm-linux-gnueabihf/bin", - "-shared", ], ), ], @@ -407,6 +421,7 @@ def _impl(ctx): dbg_feature, user_compile_flags_feature, user_link_flags_feature, + shared_flag_feature, sysroot_feature, unfiltered_compile_flags_feature, ]