diff options
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/llvm.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/patches/clang-runtime-9-glibc-2.36-compat.patch | 50 |
3 files changed, 53 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 5442edea7a..516dbde17d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1069,6 +1069,7 @@ dist_patch_DATA = \ %D%/packages/patches/clang-runtime-esan-build-fixes.patch \ %D%/packages/patches/clang-runtime-13-glibc-2.36-compat.patch \ %D%/packages/patches/clang-runtime-14-glibc-2.36-compat.patch \ + %D%/packages/patches/clang-runtime-9-glibc-2.36-compat.patch \ %D%/packages/patches/clang-runtime-9-libsanitizer-mode-field.patch \ %D%/packages/patches/clang-runtime-3.5-libsanitizer-mode-field.patch \ %D%/packages/patches/clang-runtime-3.7-fix-build-with-python3.patch \ diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 2ab10b366f..1e15f08bba 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1081,7 +1081,8 @@ Library.") (clang-runtime-from-llvm llvm-9 "0xwh79g3zggdabxgnd0bphry75asm1qz7mv3hcqihqwqr6aspgy2" - '("clang-runtime-9-libsanitizer-mode-field.patch"))) + '("clang-runtime-9-libsanitizer-mode-field.patch" + "clang-runtime-9-glibc-2.36-compat.patch"))) (define-public clang-9 (clang-from-llvm llvm-9 clang-runtime-9 diff --git a/gnu/packages/patches/clang-runtime-9-glibc-2.36-compat.patch b/gnu/packages/patches/clang-runtime-9-glibc-2.36-compat.patch new file mode 100644 index 0000000000..9d0ab94222 --- /dev/null +++ b/gnu/packages/patches/clang-runtime-9-glibc-2.36-compat.patch @@ -0,0 +1,50 @@ +This commit is from upstream and is included in the llvm-15 release + +commit b379129c4beb3f26223288627a1291739f33af02 +Author: Fangrui Song <i@maskray.me> +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/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +index 4bd425435d56..81740bf4ab39 100644 +--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -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; |