1 |
commit: 79e72782e6a2cad3036402dafe5e2bbaf53f80be |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jul 5 20:36:30 2021 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 5 20:43:58 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=79e72782 |
7 |
|
8 |
10.3.0: cut 3 patchset |
9 |
|
10 |
Single new change: |
11 |
+ 32_all_remove-cyclades.patch: fix build failure against linux-headers-5.13 |
12 |
|
13 |
Bug: https://gcc.gnu.org/PR100379 |
14 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
15 |
|
16 |
10.3.0/gentoo/35_all_remove-cyclades.patch | 111 +++++++++++++++++++++++++++++ |
17 |
10.3.0/gentoo/README.history | 2 +- |
18 |
2 files changed, 112 insertions(+), 1 deletion(-) |
19 |
|
20 |
diff --git a/10.3.0/gentoo/35_all_remove-cyclades.patch b/10.3.0/gentoo/35_all_remove-cyclades.patch |
21 |
new file mode 100644 |
22 |
index 0000000..2a62fed |
23 |
--- /dev/null |
24 |
+++ b/10.3.0/gentoo/35_all_remove-cyclades.patch |
25 |
@@ -0,0 +1,111 @@ |
26 |
+From 68d5235cb58f988c71b403334cd9482d663841ab Mon Sep 17 00:00:00 2001 |
27 |
+From: Tamar Christina <tamar.christina@×××.com> |
28 |
+Date: Thu, 20 May 2021 18:55:11 +0100 |
29 |
+Subject: [PATCH] libsanitizer: Remove cyclades inclusion in sanitizer |
30 |
+ |
31 |
+The Linux kernel has removed the interface to cyclades from |
32 |
+the latest kernel headers[1] due to them being orphaned for the |
33 |
+past 13 years. |
34 |
+ |
35 |
+libsanitizer uses this header when compiling against glibc, but |
36 |
+glibcs itself doesn't seem to have any references to cyclades. |
37 |
+ |
38 |
+Further more it seems that the driver is broken in the kernel and |
39 |
+the firmware doesn't seem to be available anymore. |
40 |
+ |
41 |
+As such since this is breaking the build of libsanitizer (and so the |
42 |
+GCC bootstrap[2]) I propose to remove this. |
43 |
+ |
44 |
+[1] https://lkml.org/lkml/2021/3/2/153 |
45 |
+[2] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100379 |
46 |
+ |
47 |
+Reviewed By: eugenis |
48 |
+ |
49 |
+Differential Revision: https://reviews.llvm.org/D102059 |
50 |
+--- |
51 |
+ .../sanitizer_common_interceptors_ioctl.inc | 9 --------- |
52 |
+ .../sanitizer_platform_limits_posix.cpp | 11 ----------- |
53 |
+ .../sanitizer_platform_limits_posix.h | 10 ---------- |
54 |
+ 3 files changed, 30 deletions(-) |
55 |
+ |
56 |
+--- a/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc |
57 |
++++ b/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc |
58 |
+@@ -370,15 +370,6 @@ static void ioctl_table_fill() { |
59 |
+ |
60 |
+ #if SANITIZER_GLIBC |
61 |
+ // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE |
62 |
+- _(CYGETDEFTHRESH, WRITE, sizeof(int)); |
63 |
+- _(CYGETDEFTIMEOUT, WRITE, sizeof(int)); |
64 |
+- _(CYGETMON, WRITE, struct_cyclades_monitor_sz); |
65 |
+- _(CYGETTHRESH, WRITE, sizeof(int)); |
66 |
+- _(CYGETTIMEOUT, WRITE, sizeof(int)); |
67 |
+- _(CYSETDEFTHRESH, NONE, 0); |
68 |
+- _(CYSETDEFTIMEOUT, NONE, 0); |
69 |
+- _(CYSETTHRESH, NONE, 0); |
70 |
+- _(CYSETTIMEOUT, NONE, 0); |
71 |
+ _(EQL_EMANCIPATE, WRITE, struct_ifreq_sz); |
72 |
+ _(EQL_ENSLAVE, WRITE, struct_ifreq_sz); |
73 |
+ _(EQL_GETMASTRCFG, WRITE, struct_ifreq_sz); |
74 |
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp |
75 |
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp |
76 |
+@@ -143,7 +143,6 @@ typedef struct user_fpregs elf_fpregset_t; |
77 |
+ # include <sys/procfs.h> |
78 |
+ #endif |
79 |
+ #include <sys/user.h> |
80 |
+-#include <linux/cyclades.h> |
81 |
+ #include <linux/if_eql.h> |
82 |
+ #include <linux/if_plip.h> |
83 |
+ #include <linux/lp.h> |
84 |
+@@ -460,7 +459,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); |
85 |
+ |
86 |
+ #if SANITIZER_GLIBC |
87 |
+ unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct); |
88 |
+- unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor); |
89 |
+ #if EV_VERSION > (0x010000) |
90 |
+ unsigned struct_input_keymap_entry_sz = sizeof(struct input_keymap_entry); |
91 |
+ #else |
92 |
+@@ -824,15 +822,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); |
93 |
+ #endif // SANITIZER_LINUX |
94 |
+ |
95 |
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID |
96 |
+- unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH; |
97 |
+- unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT; |
98 |
+- unsigned IOCTL_CYGETMON = CYGETMON; |
99 |
+- unsigned IOCTL_CYGETTHRESH = CYGETTHRESH; |
100 |
+- unsigned IOCTL_CYGETTIMEOUT = CYGETTIMEOUT; |
101 |
+- unsigned IOCTL_CYSETDEFTHRESH = CYSETDEFTHRESH; |
102 |
+- unsigned IOCTL_CYSETDEFTIMEOUT = CYSETDEFTIMEOUT; |
103 |
+- unsigned IOCTL_CYSETTHRESH = CYSETTHRESH; |
104 |
+- unsigned IOCTL_CYSETTIMEOUT = CYSETTIMEOUT; |
105 |
+ unsigned IOCTL_EQL_EMANCIPATE = EQL_EMANCIPATE; |
106 |
+ unsigned IOCTL_EQL_ENSLAVE = EQL_ENSLAVE; |
107 |
+ unsigned IOCTL_EQL_GETMASTRCFG = EQL_GETMASTRCFG; |
108 |
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h |
109 |
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h |
110 |
+@@ -983,7 +983,6 @@ extern unsigned struct_vt_mode_sz; |
111 |
+ |
112 |
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID |
113 |
+ extern unsigned struct_ax25_parms_struct_sz; |
114 |
+-extern unsigned struct_cyclades_monitor_sz; |
115 |
+ extern unsigned struct_input_keymap_entry_sz; |
116 |
+ extern unsigned struct_ipx_config_data_sz; |
117 |
+ extern unsigned struct_kbdiacrs_sz; |
118 |
+@@ -1328,15 +1327,6 @@ extern unsigned IOCTL_VT_WAITACTIVE; |
119 |
+ #endif // SANITIZER_LINUX |
120 |
+ |
121 |
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID |
122 |
+-extern unsigned IOCTL_CYGETDEFTHRESH; |
123 |
+-extern unsigned IOCTL_CYGETDEFTIMEOUT; |
124 |
+-extern unsigned IOCTL_CYGETMON; |
125 |
+-extern unsigned IOCTL_CYGETTHRESH; |
126 |
+-extern unsigned IOCTL_CYGETTIMEOUT; |
127 |
+-extern unsigned IOCTL_CYSETDEFTHRESH; |
128 |
+-extern unsigned IOCTL_CYSETDEFTIMEOUT; |
129 |
+-extern unsigned IOCTL_CYSETTHRESH; |
130 |
+-extern unsigned IOCTL_CYSETTIMEOUT; |
131 |
+ extern unsigned IOCTL_EQL_EMANCIPATE; |
132 |
+ extern unsigned IOCTL_EQL_ENSLAVE; |
133 |
+ extern unsigned IOCTL_EQL_GETMASTRCFG; |
134 |
+-- |
135 |
+2.32.0 |
136 |
+ |
137 |
|
138 |
diff --git a/10.3.0/gentoo/README.history b/10.3.0/gentoo/README.history |
139 |
index f42d368..4487403 100644 |
140 |
--- a/10.3.0/gentoo/README.history |
141 |
+++ b/10.3.0/gentoo/README.history |
142 |
@@ -1,4 +1,4 @@ |
143 |
-3 TODO |
144 |
+3 05 July 2021 |
145 |
+ 35_all_remove-cyclades.patch |
146 |
|
147 |
2 08 Jun 2021 |