7d5d075809
* llvm: replace +omp_as_runtime with omp=runtime * llvm: fetch 'libomp-libflags-as-list.patch' from upstream repo * llvm: replace 'llvm14-hwloc-ompd.patch' with the official fix from upstream repo * llvm: fix-up for the black reformatting * llvm: fetch 'constexpr_longdouble.patch' from upstream repo * llvm: optionally build libcxx as a runtime * llvm: fetch 'llvm5-sanitizer-ustat.patch' from upstream repo * llvm: update 'sanitizer-ipc_perm_mode.patch' * llvm: refactor compiler conflicts when libcxx=project * llvm: fetch 'llvm_python_path.patch' from upstream repo * llvm: update comments and condition for 'xray_buffer_queue-cstddef.patch' * llvm: optionally build compiler-rt as a runtime * llvm: fetch 'lldb_external_ncurses-10.patch' from upstream repo * llvm: fetch 'llvm_py37.patch' from upstream repo * llvm: rename variant 'internal_unwind' to 'libunwind' * llvm: optionally build libunwind as a runtime * llvm: extend the list of maintainers * llvm: allow for explicit '~clang~flang~libomptarget~lldb~omp_debug~z3' * llvm: fetch 'llvm5-lld-ELF-Symbols.patch' from FreeBSD port repo * llvm: fetch most of 'missing-includes.patch' from upstream repo and reuse 'llvm-gcc11.patch' * llvm: regroup patches for missing include directives and drop compiler constraints for them * llvm: fetch 'llvm-gcc11.patch' from upstream repo * llvm: fetch 'no_cyclades.patch' from upstream repo * llvm: update comments and condition for 'no_cyclades9.patch' * llvm: rename variant 'omp' to 'openmp' * llvm: constrain and rename variant 'omp_tsan' to 'libomp_tsan' * llvm: rename variant 'omp_debug' to 'libomptarget_debug' * llvm: do not apply same patch twice * llvm: constrain and document the '*-thread.patch' patches * llvm: document the '~lld+libomptarget' conflict * llvm: update comments for the 'D133513.diff' patch
48 lines
2.0 KiB
Diff
48 lines
2.0 KiB
Diff
# This is a backport of https://reviews.llvm.org/D102059.
|
|
#
|
|
# We need the patch to be applicable when="@:9" and, therefore, cannot fetch
|
|
# it from the upstream repo.
|
|
|
|
--- a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
|
|
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
|
|
@@ -370,9 +370,0 @@
|
|
- _(CYGETDEFTHRESH, WRITE, sizeof(int));
|
|
- _(CYGETDEFTIMEOUT, WRITE, sizeof(int));
|
|
- _(CYGETMON, WRITE, struct_cyclades_monitor_sz);
|
|
- _(CYGETTHRESH, WRITE, sizeof(int));
|
|
- _(CYGETTIMEOUT, WRITE, sizeof(int));
|
|
- _(CYSETDEFTHRESH, NONE, 0);
|
|
- _(CYSETDEFTIMEOUT, NONE, 0);
|
|
- _(CYSETTHRESH, NONE, 0);
|
|
- _(CYSETTIMEOUT, NONE, 0);
|
|
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
|
|
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
|
|
@@ -986,1 +986,0 @@
|
|
- extern unsigned struct_cyclades_monitor_sz;
|
|
@@ -1331,9 +1327,0 @@
|
|
- extern unsigned IOCTL_CYGETDEFTHRESH;
|
|
- extern unsigned IOCTL_CYGETDEFTIMEOUT;
|
|
- extern unsigned IOCTL_CYGETMON;
|
|
- extern unsigned IOCTL_CYGETTHRESH;
|
|
- extern unsigned IOCTL_CYGETTIMEOUT;
|
|
- extern unsigned IOCTL_CYSETDEFTHRESH;
|
|
- extern unsigned IOCTL_CYSETDEFTIMEOUT;
|
|
- extern unsigned IOCTL_CYSETTHRESH;
|
|
- extern unsigned IOCTL_CYSETTIMEOUT;
|
|
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
|
|
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
|
|
@@ -143,1 +143,0 @@
|
|
-#include <linux/cyclades.h>
|
|
@@ -460,1 +459,0 @@
|
|
- unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);
|
|
@@ -824,9 +822,0 @@
|
|
- unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;
|
|
- unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;
|
|
- unsigned IOCTL_CYGETMON = CYGETMON;
|
|
- unsigned IOCTL_CYGETTHRESH = CYGETTHRESH;
|
|
- unsigned IOCTL_CYGETTIMEOUT = CYGETTIMEOUT;
|
|
- unsigned IOCTL_CYSETDEFTHRESH = CYSETDEFTHRESH;
|
|
- unsigned IOCTL_CYSETDEFTIMEOUT = CYSETDEFTIMEOUT;
|
|
- unsigned IOCTL_CYSETTHRESH = CYSETTHRESH;
|
|
- unsigned IOCTL_CYSETTIMEOUT = CYSETTIMEOUT;
|