From 07295482688b834ccdde71a51dc42848d7e8df0b Mon Sep 17 00:00:00 2001
From: Benjamin Kramer <kramerb@google.com>
Date: Thu, 23 Apr 2020 05:02:10 -0700
Subject: [PATCH] Bump open source llvm revision to
 35cf2f42dda4d708741e06570b2dbe91cec4dc41

PiperOrigin-RevId: 308026811
Change-Id: I25760fe9b2c07b267ef3fd5a61122392cfa8e2f9
---
 tensorflow/workspace.bzl                  | 4 ++--
 third_party/llvm/llvm.autogenerated.BUILD | 1 +
 third_party/mlir/BUILD                    | 4 ++++
 third_party/mlir/tblgen.bzl               | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index c810f21339b..3814e9c0971 100755
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -666,8 +666,8 @@ def tf_repositories(path_prefix = "", tf_repo_name = ""):
     )
 
     # Check out LLVM and MLIR from llvm-project.
-    LLVM_COMMIT = "22219cfc6a2a752c53238df4ceea342672392818"
-    LLVM_SHA256 = "e8d6b4a5d52cb78f8464b716a1c97e0d5bb631cf56012a6a9872c15c720738db"
+    LLVM_COMMIT = "35cf2f42dda4d708741e06570b2dbe91cec4dc41"
+    LLVM_SHA256 = "c522ae8860a3cc5807d195d521cc1fc5ef3d27c4598762ea7e38185cef71fe05"
     LLVM_URLS = [
         "https://storage.googleapis.com/mirror.tensorflow.org/github.com/llvm/llvm-project/archive/{commit}.tar.gz".format(commit = LLVM_COMMIT),
         "https://github.com/llvm/llvm-project/archive/{commit}.tar.gz".format(commit = LLVM_COMMIT),
diff --git a/third_party/llvm/llvm.autogenerated.BUILD b/third_party/llvm/llvm.autogenerated.BUILD
index db2038eed61..d283e6849ee 100644
--- a/third_party/llvm/llvm.autogenerated.BUILD
+++ b/third_party/llvm/llvm.autogenerated.BUILD
@@ -1934,6 +1934,7 @@ cc_library(
     ]),
     copts = llvm_copts,
     deps = [
+        ":binary_format",
         ":config",
         ":debug_info_code_view",
         ":debug_info_msf",
diff --git a/third_party/mlir/BUILD b/third_party/mlir/BUILD
index ffb811f5cc3..74dfe01a42d 100644
--- a/third_party/mlir/BUILD
+++ b/third_party/mlir/BUILD
@@ -2692,6 +2692,10 @@ cc_binary(
     srcs = glob([
         "tools/mlir-linalg-ods-gen/mlir-linalg-ods-gen.cpp",
     ]),
+    linkopts = [
+        "-lm",
+        "-lpthread",
+    ],
     deps = [
         ":IR",
         ":Support",
diff --git a/third_party/mlir/tblgen.bzl b/third_party/mlir/tblgen.bzl
index 623d085ccc3..bbe64c11a02 100644
--- a/third_party/mlir/tblgen.bzl
+++ b/third_party/mlir/tblgen.bzl
@@ -21,7 +21,7 @@ def gentbl(name, tblgen, td_file, tbl_outs, td_srcs = [], td_includes = [], stri
         srcs += [td_file]
 
     td_includes_cmd = ["-I external/llvm-project/mlir/include -I external/org_tensorflow"]
-    td_includes_cmd += ["-I $(GENDIR)/third_party/llvm/llvm-project/mlir/include"]
+    td_includes_cmd += ["-I $(GENDIR)/external/llvm-project/mlir/include"]
     for td_include in td_includes:
         td_includes_cmd += ["-I%s" % td_include]
     local_inc = "-I $$(dirname $(location %s))" % td_file