summaryrefslogtreecommitdiff
path: root/gnu/packages/patches/clang-cling-runtime-13-glibc-2.36-compat.patch
diff options
context:
space:
mode:
authorMaxim Cournoyer <[email protected]>2024-09-21 10:51:28 +0900
committerMaxim Cournoyer <[email protected]>2024-10-07 01:20:22 +0900
commit866fc620b3dbe160c8d0ed4e77ed18515f2ce6fb (patch)
tree8088926806323db0f6c8e25fa6120634e2949bd7 /gnu/packages/patches/clang-cling-runtime-13-glibc-2.36-compat.patch
parent41c85063304b49751987554b433da45b318498ad (diff)
gnu: cling: Update to 1.1.
* gnu/packages/llvm.scm (llvm-cling-base): New variable (llvm-cling): Use it. Update to version 16-20240621-02. [source]: Delete patches. (clang-cling-runtime): Base on clang-runtime-16. [phases]: Delete change-directory phase. (clang-cling): Base on clang-16. [phases]: Delete change-directory and delete-static-libraries phases (the later would cause CMake to fail due to baking the static targets in). (cling): Update to 1.1. [source]: Delete patches. [arguments] <#:tests?>: Reference upstream discussion in comment. [phases] <patch-paths>: Adjust file name of clang lib directory. <set-CLANG>: New phase. [native-inputs]: Add clang-cling, used by the test suite. * gnu/packages/patches/clang-cling-13-libc-search-path.patch * gnu/packages/patches/clang-cling-13-remove-crypt-interceptors.patch * gnu/packages/patches/clang-cling-runtime-13-glibc-2.36-compat.patch * gnu/packages/patches/cling-use-shared-library.patch: Delete files. * gnu/local.mk (dist_patch_DATA): De-register deleted files. Change-Id: Ia8b58188ad9de2795a52289bd46ed15a8e722bfa
Diffstat (limited to 'gnu/packages/patches/clang-cling-runtime-13-glibc-2.36-compat.patch')
-rw-r--r--gnu/packages/patches/clang-cling-runtime-13-glibc-2.36-compat.patch50
1 files changed, 0 insertions, 50 deletions
diff --git a/gnu/packages/patches/clang-cling-runtime-13-glibc-2.36-compat.patch b/gnu/packages/patches/clang-cling-runtime-13-glibc-2.36-compat.patch
deleted file mode 100644
index 79b36f1383..0000000000
--- a/gnu/packages/patches/clang-cling-runtime-13-glibc-2.36-compat.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-This commit is from upstream and is included in the llvm-15 release
-
-commit b379129c4beb3f26223288627a1291739f33af02
-Author: Fangrui Song <[email protected]>
-Date: Mon Jul 11 11:38:28 2022 -0700
-
- [sanitizer] Remove #include <linux/fs.h> to resolve fsconfig_command/mount_attr conflict with glibc 2.36
-
- It is generally not a good idea to mix usage of glibc headers and Linux UAPI
- headers (https://sourceware.org/glibc/wiki/Synchronizing_Headers). In glibc
- since 7eae6a91e9b1670330c9f15730082c91c0b1d570 (milestone: 2.36), sys/mount.h
- defines `fsconfig_command` which conflicts with linux/mount.h:
-
- .../usr/include/linux/mount.h:95:6: error: redeclaration of ‘enum fsconfig_command’
-
- Remove #include <linux/fs.h> which pulls in linux/mount.h. Expand its 4 macros manually.
-
- Fix https://github.com/llvm/llvm-project/issues/56421
-
- Reviewed By: #sanitizers, vitalybuka, zatrazz
-
- Differential Revision: https://reviews.llvm.org/D129471
-
-diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
-index 4bd425435d56..81740bf4ab39 100644
---- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
-+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
-@@ -73,7 +73,6 @@
- #include <sys/vt.h>
- #include <linux/cdrom.h>
- #include <linux/fd.h>
--#include <linux/fs.h>
- #include <linux/hdreg.h>
- #include <linux/input.h>
- #include <linux/ioctl.h>
-@@ -876,10 +875,10 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT;
- unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT;
- #endif
-- unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS;
-- unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION;
-- unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS;
-- unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION;
-+ unsigned IOCTL_FS_IOC_GETFLAGS = _IOR('f', 1, long);
-+ unsigned IOCTL_FS_IOC_GETVERSION = _IOR('v', 1, long);
-+ unsigned IOCTL_FS_IOC_SETFLAGS = _IOW('f', 2, long);
-+ unsigned IOCTL_FS_IOC_SETVERSION = _IOW('v', 2, long);
- unsigned IOCTL_GIO_CMAP = GIO_CMAP;
- unsigned IOCTL_GIO_FONT = GIO_FONT;
- unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP;