Gentoo Archives: gentoo-commits

From: Craig Andrews <candrews@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm-roc/, sys-devel/llvm-roc/files/
Date: Thu, 08 Jul 2021 19:04:53
Message-Id: 1625771084.21bed19cb90bf71c63d9e42557af1a6cc39a1989.candrews@gentoo
1 commit: 21bed19cb90bf71c63d9e42557af1a6cc39a1989
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jul 8 18:14:01 2021 +0000
4 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 8 19:04:44 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21bed19c
7
8 sys-devel/llvm-roc: fix linux-headers-5.13 build
9
10 Backport #include <linux/cyclades.h> uptream removal.
11
12 Reported-by: cyrillic
13 Closes: https://bugs.gentoo.org/800695
14 Package-Manager: Portage-3.0.20, Repoman-3.0.3
15 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
16 Closes: https://github.com/gentoo/gentoo/pull/21568
17 Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
18
19 .../llvm-roc/files/llvm-roc-4.2.0-cyclades.patch | 86 ++++++++++++++++++++++
20 sys-devel/llvm-roc/llvm-roc-4.2.0.ebuild | 1 +
21 2 files changed, 87 insertions(+)
22
23 diff --git a/sys-devel/llvm-roc/files/llvm-roc-4.2.0-cyclades.patch b/sys-devel/llvm-roc/files/llvm-roc-4.2.0-cyclades.patch
24 new file mode 100644
25 index 00000000000..629ede5bbc7
26 --- /dev/null
27 +++ b/sys-devel/llvm-roc/files/llvm-roc-4.2.0-cyclades.patch
28 @@ -0,0 +1,86 @@
29 +https://github.com/RadeonOpenCompute/llvm-project/commit/68d5235cb58f988c71b403334cd9482d663841ab.patch
30 +https://bugs.gentoo.org/800695
31 +Differential Revision: https://reviews.llvm.org/D102059
32 +
33 +From 68d5235cb58f988c71b403334cd9482d663841ab Mon Sep 17 00:00:00 2001
34 +From: Tamar Christina <tamar.christina@×××.com>
35 +Date: Thu, 20 May 2021 18:55:11 +0100
36 +Subject: [PATCH] libsanitizer: Remove cyclades inclusion in sanitizer
37 +--- a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
38 ++++ b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
39 +@@ -370,15 +370,6 @@ static void ioctl_table_fill() {
40 +
41 + #if SANITIZER_GLIBC
42 + // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE
43 +- _(CYGETDEFTHRESH, WRITE, sizeof(int));
44 +- _(CYGETDEFTIMEOUT, WRITE, sizeof(int));
45 +- _(CYGETMON, WRITE, struct_cyclades_monitor_sz);
46 +- _(CYGETTHRESH, WRITE, sizeof(int));
47 +- _(CYGETTIMEOUT, WRITE, sizeof(int));
48 +- _(CYSETDEFTHRESH, NONE, 0);
49 +- _(CYSETDEFTIMEOUT, NONE, 0);
50 +- _(CYSETTHRESH, NONE, 0);
51 +- _(CYSETTIMEOUT, NONE, 0);
52 + _(EQL_EMANCIPATE, WRITE, struct_ifreq_sz);
53 + _(EQL_ENSLAVE, WRITE, struct_ifreq_sz);
54 + _(EQL_GETMASTRCFG, WRITE, struct_ifreq_sz);
55 +--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
56 ++++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
57 +@@ -143,7 +143,6 @@ typedef struct user_fpregs elf_fpregset_t;
58 + # include <sys/procfs.h>
59 + #endif
60 + #include <sys/user.h>
61 +-#include <linux/cyclades.h>
62 + #include <linux/if_eql.h>
63 + #include <linux/if_plip.h>
64 + #include <linux/lp.h>
65 +@@ -460,7 +459,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
66 +
67 + #if SANITIZER_GLIBC
68 + unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct);
69 +- unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);
70 + #if EV_VERSION > (0x010000)
71 + unsigned struct_input_keymap_entry_sz = sizeof(struct input_keymap_entry);
72 + #else
73 +@@ -824,15 +822,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
74 + #endif // SANITIZER_LINUX
75 +
76 + #if SANITIZER_LINUX && !SANITIZER_ANDROID
77 +- unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;
78 +- unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;
79 +- unsigned IOCTL_CYGETMON = CYGETMON;
80 +- unsigned IOCTL_CYGETTHRESH = CYGETTHRESH;
81 +- unsigned IOCTL_CYGETTIMEOUT = CYGETTIMEOUT;
82 +- unsigned IOCTL_CYSETDEFTHRESH = CYSETDEFTHRESH;
83 +- unsigned IOCTL_CYSETDEFTIMEOUT = CYSETDEFTIMEOUT;
84 +- unsigned IOCTL_CYSETTHRESH = CYSETTHRESH;
85 +- unsigned IOCTL_CYSETTIMEOUT = CYSETTIMEOUT;
86 + unsigned IOCTL_EQL_EMANCIPATE = EQL_EMANCIPATE;
87 + unsigned IOCTL_EQL_ENSLAVE = EQL_ENSLAVE;
88 + unsigned IOCTL_EQL_GETMASTRCFG = EQL_GETMASTRCFG;
89 +--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
90 ++++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
91 +@@ -983,7 +983,6 @@ extern unsigned struct_vt_mode_sz;
92 +
93 + #if SANITIZER_LINUX && !SANITIZER_ANDROID
94 + extern unsigned struct_ax25_parms_struct_sz;
95 +-extern unsigned struct_cyclades_monitor_sz;
96 + extern unsigned struct_input_keymap_entry_sz;
97 + extern unsigned struct_ipx_config_data_sz;
98 + extern unsigned struct_kbdiacrs_sz;
99 +@@ -1328,15 +1327,6 @@ extern unsigned IOCTL_VT_WAITACTIVE;
100 + #endif // SANITIZER_LINUX
101 +
102 + #if SANITIZER_LINUX && !SANITIZER_ANDROID
103 +-extern unsigned IOCTL_CYGETDEFTHRESH;
104 +-extern unsigned IOCTL_CYGETDEFTIMEOUT;
105 +-extern unsigned IOCTL_CYGETMON;
106 +-extern unsigned IOCTL_CYGETTHRESH;
107 +-extern unsigned IOCTL_CYGETTIMEOUT;
108 +-extern unsigned IOCTL_CYSETDEFTHRESH;
109 +-extern unsigned IOCTL_CYSETDEFTIMEOUT;
110 +-extern unsigned IOCTL_CYSETTHRESH;
111 +-extern unsigned IOCTL_CYSETTIMEOUT;
112 + extern unsigned IOCTL_EQL_EMANCIPATE;
113 + extern unsigned IOCTL_EQL_ENSLAVE;
114 + extern unsigned IOCTL_EQL_GETMASTRCFG;
115
116 diff --git a/sys-devel/llvm-roc/llvm-roc-4.2.0.ebuild b/sys-devel/llvm-roc/llvm-roc-4.2.0.ebuild
117 index b008b6ca513..d4d6b886d09 100644
118 --- a/sys-devel/llvm-roc/llvm-roc-4.2.0.ebuild
119 +++ b/sys-devel/llvm-roc/llvm-roc-4.2.0.ebuild
120 @@ -33,6 +33,7 @@ src_prepare() {
121 cd "${WORKDIR}/llvm-project-rocm-${PV}" || die
122 eapply "${FILESDIR}/${PN}-3.0.0-add_libraries.patch"
123 eapply "${FILESDIR}/${PN}-4.0.0-remove-isystem-usr-include.patch"
124 + eapply "${FILESDIR}/${PN}-4.2.0-cyclades.patch"
125
126 if [[ -n ${EPREFIX} ]]; then
127 pushd "${S}"/../clang >/dev/null || die