From 588d1a8d133b9963f78b835668f9a042c6ac2f97 Mon Sep 17 00:00:00 2001 From: Dmitri Gribenko Date: Fri, 6 Dec 2024 03:37:27 -0800 Subject: [PATCH] Integrate LLVM at llvm/llvm-project@2ccf7ed277df Updates LLVM usage to match [2ccf7ed277df](https://github.com/llvm/llvm-project/commit/2ccf7ed277df) PiperOrigin-RevId: 703440343 --- third_party/llvm/generated.patch | 56 ++++++++++++++++++++++++++++++++ third_party/llvm/workspace.bzl | 4 +-- 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/third_party/llvm/generated.patch b/third_party/llvm/generated.patch index 509398da9..dfa4b78b3 100644 --- a/third_party/llvm/generated.patch +++ b/third_party/llvm/generated.patch @@ -1 +1,57 @@ Auto generated patch. Do not edit or delete it, even if empty. +diff -ruN --strip-trailing-cr a/llvm/lib/ExecutionEngine/Orc/ExecutionUtils.cpp b/llvm/lib/ExecutionEngine/Orc/ExecutionUtils.cpp +--- a/llvm/lib/ExecutionEngine/Orc/ExecutionUtils.cpp ++++ b/llvm/lib/ExecutionEngine/Orc/ExecutionUtils.cpp +@@ -573,7 +573,6 @@ + // Create __imp_ symbol + jitlink::Symbol &Ptr = + jitlink::x86_64::createAnonymousPointer(*G, Sec, &Target); +- auto name = getImpPrefix() + *KV.first; + Ptr.setName(G->intern((Twine(getImpPrefix()) + *KV.first).str())); + Ptr.setLinkage(jitlink::Linkage::Strong); + Ptr.setScope(jitlink::Scope::Default); +diff -ruN --strip-trailing-cr a/utils/bazel/llvm-project-overlay/bolt/BUILD.bazel b/utils/bazel/llvm-project-overlay/bolt/BUILD.bazel +--- a/utils/bazel/llvm-project-overlay/bolt/BUILD.bazel ++++ b/utils/bazel/llvm-project-overlay/bolt/BUILD.bazel +@@ -285,6 +285,7 @@ + "//llvm:MCParser", + "//llvm:Object", + "//llvm:ObjectYAML", ++ "//llvm:OrcShared", + "//llvm:Support", + "//llvm:TargetParser", + "//llvm:config", +diff -ruN --strip-trailing-cr a/utils/bazel/llvm-project-overlay/libc/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/BUILD.bazel +--- a/utils/bazel/llvm-project-overlay/libc/BUILD.bazel ++++ b/utils/bazel/llvm-project-overlay/libc/BUILD.bazel +@@ -1442,7 +1442,10 @@ + hdrs = glob(["src/__support/time/*.h"]), + deps = [ + ":__support_common", ++ ":__support_error_or", + ":hdr_time_macros", ++ ":types_clockid_t", ++ ":types_struct_timespec", + ":types_time_t", + ], + ) +@@ -1486,6 +1489,8 @@ + ":__support_common", + ":__support_error_or", + ":__support_osutil_vdso", ++ ":types_clockid_t", ++ ":types_struct_timespec", + ], + ) + +diff -ruN --strip-trailing-cr a/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel b/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel +--- a/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel ++++ b/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel +@@ -2800,6 +2800,7 @@ + ":MC", + ":MCDisassembler", + ":Object", ++ ":OrcShared", + ":OrcTargetProcess", + ":Passes", + ":Support", diff --git a/third_party/llvm/workspace.bzl b/third_party/llvm/workspace.bzl index 99aaec9a3..e60a1c86e 100644 --- a/third_party/llvm/workspace.bzl +++ b/third_party/llvm/workspace.bzl @@ -4,8 +4,8 @@ load("//third_party:repo.bzl", "tf_http_archive") def repo(name): """Imports LLVM.""" - LLVM_COMMIT = "698d83218565d60580d7c71e0fce89a38134a5c6" - LLVM_SHA256 = "29c72ad1c3ea05314b945a9b90f43c52becbfd31783a0167f7bcb42302b01ca2" + LLVM_COMMIT = "2ccf7ed277df28651b94bbee9fccefdf22fb074f" + LLVM_SHA256 = "ca68a54dcd12c0dde32732a90899bf57e0f3f96fc43d8d1124d95a5eae627508" tf_http_archive( name = name,