Skip to content

Commit

Permalink
Integrate LLVM at llvm/llvm-project@743aee4951d4
Browse files Browse the repository at this point in the history
Updates LLVM usage to match
[743aee4951d4](llvm/llvm-project@743aee4951d4)

PiperOrigin-RevId: 712874385
  • Loading branch information
d0k authored and copybara-github committed Jan 7, 2025
1 parent 0ec8f83 commit 3a28180
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 1 deletion.
2 changes: 1 addition & 1 deletion bazel/import_llvm.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ load(

def import_llvm(name):
"""Imports LLVM."""
LLVM_COMMIT = "f739aa4004165dc64d3a1f418d5ad3c84886f01a"
LLVM_COMMIT = "743aee4951d452c7795e4e829a6cbf704340cd1c"

new_git_repository(
name = name,
Expand Down
66 changes: 66 additions & 0 deletions patches/llvm.patch
Original file line number Diff line number Diff line change
@@ -1 +1,67 @@
Auto generated patch. Do not edit or delete it, even if empty.
diff -ruN --strip-trailing-cr a/clang/test/Driver/spirv-openmp-toolchain.c b/clang/test/Driver/spirv-openmp-toolchain.c
--- a/clang/test/Driver/spirv-openmp-toolchain.c
+++ b/clang/test/Driver/spirv-openmp-toolchain.c
@@ -1,4 +1,4 @@
-// RUN: %clang -### --target=x86_64-unknown-linux-gnu -fopenmp -fopenmp-targets=spirv64-intel \
+// RUN: %clang -### --target=x86_64-unknown-linux-gnu -fopenmp=libomp -fopenmp-targets=spirv64-intel \
// RUN: --libomptarget-spirv-bc-path=%t/ -nogpulib %s 2>&1 \
// RUN: | FileCheck %s

diff -ruN --strip-trailing-cr a/libc/src/stdlib/qsort_pivot.h b/libc/src/stdlib/qsort_pivot.h
--- a/libc/src/stdlib/qsort_pivot.h
+++ b/libc/src/stdlib/qsort_pivot.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_SRC_STDLIB_QSORT_PIVOT_H
#define LLVM_LIBC_SRC_STDLIB_QSORT_PIVOT_H

-#include <stdint.h>
+#include <stddef.h> // For size_t

namespace LIBC_NAMESPACE_DECL {
namespace internal {
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
@@ -3481,11 +3481,13 @@
hdrs = [
"src/stdlib/heap_sort.h",
"src/stdlib/qsort_data.h",
+ "src/stdlib/qsort_pivot.h",
"src/stdlib/qsort_util.h",
"src/stdlib/quick_sort.h",
],
deps = [
":__support_common",
+ ":__support_cpp_bit",
":__support_cpp_cstddef",
":__support_macros_attributes",
],
diff -ruN --strip-trailing-cr a/utils/bazel/llvm-project-overlay/libc/test/src/stdlib/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/test/src/stdlib/BUILD.bazel
--- a/utils/bazel/llvm-project-overlay/libc/test/src/stdlib/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/test/src/stdlib/BUILD.bazel
@@ -115,7 +115,7 @@
hdrs = ["SortingTest.h"],
deps = [
"//libc:__support_macros_config",
- "//libc:qsort_util",
+ "//libc:qsort",
"//libc/test/UnitTest:LibcUnitTest",
],
)
@@ -126,6 +126,7 @@
libc_function_deps = ["//libc:qsort"],
deps = [
":qsort_test_helper",
+ "//libc:qsort_util",
"//libc:types_size_t",
],
)
@@ -136,6 +137,7 @@
libc_function_deps = ["//libc:qsort"],
deps = [
":qsort_test_helper",
+ "//libc:qsort_util",
"//libc:types_size_t",
],
)

0 comments on commit 3a28180

Please sign in to comment.