remove toolchain aliasing for crosstool workaround

prefer to patch aws BUILD files to remove reliance on the
`@org_tensorflow//tensorflow:raspberry_pi_armeabi` config setting and
the associated and required crosstool naming scheme

Author: emacski

.bazelrc

@@ -41,7 +41,7 @@ build:linux_amd64_avx_sse4.2 --define=tag_suffix=linux_amd64_avx_sse4.2
 
 # this config group should not be invoked directly on the command-line
 # TODO: remove legacy crosstool when tf supports toolchain resolution
-build:common_arm --crosstool_top=@local_config_arm_compiler//:toolchain
+build:common_arm --crosstool_top=@com_github_emacski_bazeltools//toolchain/cpp/clang:toolchain
 build:common_arm --copt=-funsafe-math-optimizations
 build:common_arm --copt=-ftree-vectorize
 build:common_arm --copt=-fomit-frame-pointer

WORKSPACE

@@ -26,12 +26,6 @@ http_archive(
 # x86_64 to arm(64) cross-compile toolchains
 register_toolchains("@com_github_emacski_bazeltools//toolchain/cpp/clang:all")
 
-# hack: tf depends on this specific toolchain target name to be used
-# as crosstool for one of its config_settings when building for arm
-load("//tools/cpp:cc_repo_config.bzl", "cc_repo_config")
-
-cc_repo_config(name = "local_config_arm_compiler")
-
 # project rules
 
 # deb_package
@@ -71,12 +65,12 @@ io_bazel_rules_docker_pip_deps()
 http_archive(
     name = "org_tensorflow",
     patches = [
+        # align arm cpu config values
+        "//third_party/tensorflow/aws:BUILD.bazel.patch",
+        "//third_party/tensorflow/aws:aws-c-common.bazel.patch",
         # arm (32-bit) datatype sizes
         "//third_party/tensorflow:curl.BUILD.patch",
         "//third_party/tensorflow:hwloc.BUILD.bazel.patch",
-        # use canonical cpu value
-        # as of tf 2.3.0, this seems to only affect aws deps
-        "//third_party/tensorflow:BUILD.patch",
     ],
     sha256 = "9c94bfec7214853750c7cacebd079348046f246ec0174d01cd36eda375117628",
     strip_prefix = "tensorflow-582c8d236cb079023657287c318ff26adb239002",

third_party/tensorflow/BUILD.patch

@@ -0,0 +1,11 @@
+--- third_party/aws/BUILD.bazel	2020-11-23 10:54:13.440058312 -0800
++++ third_party/aws/BUILD.bazel.new	2020-12-16 15:35:03.425176353 -0800
+@@ -24,7 +24,7 @@
+         "@org_tensorflow//tensorflow:linux_ppc64le": glob([
+             "aws-cpp-sdk-core/source/platform/linux-shared/*.cpp",
+         ]),
+-        "@org_tensorflow//tensorflow:raspberry_pi_armeabi": glob([
++        "@org_tensorflow//tensorflow:arm": glob([
+             "aws-cpp-sdk-core/source/platform/linux-shared/*.cpp",
+         ]),
+         "@org_tensorflow//tensorflow:freebsd": glob([

tools/cpp/BUILD renamed to third_party/tensorflow/aws/BUILD

@@ -0,0 +1,11 @@
+--- third_party/aws/aws-c-common.bazel	2020-11-23 10:54:13.440058312 -0800
++++ third_party/aws/aws-c-common.bazel.new	2020-12-16 15:34:46.216946839 -0800
+@@ -24,7 +24,7 @@
+         "@org_tensorflow//tensorflow:linux_ppc64le": glob([
+             "source/posix/*.c",
+         ]),
+-        "@org_tensorflow//tensorflow:raspberry_pi_armeabi": glob([
++        "@org_tensorflow//tensorflow:arm": glob([
+             "source/posix/*.c",
+         ]),
+         "@org_tensorflow//tensorflow:windows": glob([