-
Notifications
You must be signed in to change notification settings - Fork 26
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Integrate LLVM at llvm/llvm-project@faa3f7528969
Updates LLVM usage to match [faa3f7528969](llvm/llvm-project@faa3f7528969) PiperOrigin-RevId: 712960477
- Loading branch information
1 parent
28dabbd
commit 40ee94f
Showing
2 changed files
with
2 additions
and
68 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,67 +1 @@ | ||
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", | ||
], | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters