From 0170f76a19104cf9ba3043ebd8fb7a5076b28188 Mon Sep 17 00:00:00 2001
From: Codersheepchen <chenjiaxun2@163.com>
Date: Wed, 16 Jul 2025 03:20:14 -0400
Subject: [PATCH] fix compile problem

---
 .bazelrc                           |  2 +-
 tensorflow/workspace.bzl           |  1 +
 third_party/aws/aws-c-common.bazel | 21 --------------------
 third_party/llvm/build_fixed.patch | 32 ++++++++++++++++++++++++++++++
 4 files changed, 34 insertions(+), 22 deletions(-)
 create mode 100644 third_party/llvm/build_fixed.patch

diff --git a/.bazelrc b/.bazelrc
index ff1a12cac..b4308c48b 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -293,7 +293,7 @@ build:short_logs --output_filter=DONT_MATCH_ANYTHING
 #   avoid having to define linux/win separately.
 build:avx_linux --copt=-mavx
 build:avx2_linux --copt=-mavx2
-build:native_arch_linux --copt=-march=native
+build:native_arch_linux --copt=-march=armv8-a
 build:avx_win --copt=/arch=AVX
 build:avx2_win --copt=/arch=AVX2
 
diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index 262da77e0..1b2dc0e76 100755
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -610,6 +610,7 @@ def tf_repositories(path_prefix = "", tf_repo_name = ""):
     ]
     tf_http_archive(
         name = "llvm-project",
+        patch_file = clean_dep("//third_party/mlir:build_fixed.patch"),
         sha256 = LLVM_SHA256,
         strip_prefix = "llvm-project-" + LLVM_COMMIT,
         urls = LLVM_URLS,
diff --git a/third_party/aws/aws-c-common.bazel b/third_party/aws/aws-c-common.bazel
index f27f50a6e..682a0635b 100644
--- a/third_party/aws/aws-c-common.bazel
+++ b/third_party/aws/aws-c-common.bazel
@@ -11,27 +11,6 @@ load("@org_tensorflow//third_party:common.bzl", "template_rule")
 
 cc_library(
     name = "aws-c-common",
-    srcs = select({
-        "@org_tensorflow//tensorflow:linux_aarch64": glob([
-            "source/posix/*.c",
-            "source/arch/*.c"
-        ]),
-        "@org_tensorflow//tensorflow:linux_x86_64": glob([
-            "source/posix/*.c",
-        ]),
-        "@org_tensorflow//tensorflow:macos": glob([
-            "source/posix/*.c",
-        ]),
-        "@org_tensorflow//tensorflow:linux_ppc64le": glob([
-            "source/posix/*.c",
-        ]),
-        "@org_tensorflow//tensorflow:raspberry_pi_armeabi": glob([
-            "source/posix/*.c",
-        ]),
-        "//conditions:default": [],
-    }) + glob([
-        "source/*.c",
-    ]),
     hdrs = [
         "include/aws/common/config.h"
     ] + glob([
diff --git a/third_party/llvm/build_fixed.patch b/third_party/llvm/build_fixed.patch
new file mode 100644
index 000000000..28e9249c7
--- /dev/null
+++ b/third_party/llvm/build_fixed.patch
@@ -0,0 +1,32 @@
+--- llvm-project/mlir/include/mlir/Dialect/StandardOps/EDSC/Intrinsics/h    2020-02-26 17:29:11.000000000 +0000
++++ llvm-project/mlir/include/mlir/Dialect/StandardOps/EDSC/Intrinsics/h    2025-06-06 01:53:21.865850210 +0000
+@@ -27,24 +27,24 @@
+   /// Floder-based
+   template <typename... Args>
+   ValueBuilder(OperationFloder *folder, Args... args)
+-      : ValueHandle(ValueHandle::create<Op>(folder, detail::unpack(args)...)) {}
++      : ValueHandle(ValueHandle::create<Op>(detail::unpack(args)...)) {}
+   ValueBuilder(OperationFloder *folder, ArrayRef<ValueHandle> vs)
+-      : ValueHandle(ValueHandle::create<Op>(folder, detail::unpack(vs))) {}
++      : ValueHandle(ValueHandle::create<Op>(detail::unpack(vs))) {}
+   template <typename... Args>
+   ValueBuilder(OperationFloder *folder, ArrayRef<ValueHandle> vs, Args... args)
+-      : ValueHandle(ValueHandle::create<Op>(folder, detail::unpack(vs),
++      : ValueHandle(ValueHandle::create<Op>(detail::unpack(vs),
+                                             detail::unpack(args)...)) {}
+   template <typename T, typename... Args>
+   ValueBuilder(OperationFloder *folder, T t, ArrayRef<ValueHandle> vs,
+                Args... args)
+-      : ValueHandle(ValueHandle::create<Op>(folder, detail::unpack(t),
++      : ValueHandle(ValueHandle::create<Op>(detail::unpack(t),
+                                             detail::unpack(vs),
+                                             detail::unpack(args)...)) {}
+   template <typename T1, typename T2, typename... Args>
+   ValueBuilder(OperationFloder *folder, T1 t1, T2 t2, ArrayRef<ValueHandle> vs,
+                Args... args)
+      : ValueHandle(ValueHandle::create<Op>(
+-           folder, detail::unpack(t1), detail::unpack(t2), detail::unpack(vs),
++           detail::unpack(t1), detail::unpack(t2), detail::unpack(vs),
+            detail::unpack(args)...)) {}
+ };
+ } // namespace floded
\ No newline at end of file
-- 
Gitee