tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=2bf34b9f4e446bf9be7f04458058dd5319fb396e
2https://gcc.gnu.org/PR100379
3--- a/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
4+++ b/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
5@@ -366,15 +366,6 @@ static void ioctl_table_fill() {
6
7 #if SANITIZER_LINUX && !SANITIZER_ANDROID
8 // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE
9- _(CYGETDEFTHRESH, WRITE, sizeof(int));
10- _(CYGETDEFTIMEOUT, WRITE, sizeof(int));
11- _(CYGETMON, WRITE, struct_cyclades_monitor_sz);
12- _(CYGETTHRESH, WRITE, sizeof(int));
13- _(CYGETTIMEOUT, WRITE, sizeof(int));
14- _(CYSETDEFTHRESH, NONE, 0);
15- _(CYSETDEFTIMEOUT, NONE, 0);
16- _(CYSETTHRESH, NONE, 0);
17- _(CYSETTIMEOUT, NONE, 0);
18 _(EQL_EMANCIPATE, WRITE, struct_ifreq_sz);
19 _(EQL_ENSLAVE, WRITE, struct_ifreq_sz);
20 _(EQL_GETMASTRCFG, WRITE, struct_ifreq_sz);
21--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
22+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
23@@ -130,7 +130,6 @@ typedef struct user_fpregs elf_fpregset_t;
24 # include <sys/procfs.h>
25 #endif
26 #include <sys/user.h>
27-#include <linux/cyclades.h>
28 #include <linux/if_eql.h>
29 #include <linux/if_plip.h>
30 #include <linux/lp.h>
31@@ -443,7 +442,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
32
33 #if SANITIZER_LINUX && !SANITIZER_ANDROID
34 unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct);
35- unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);
36 #if EV_VERSION > (0x010000)
37 unsigned struct_input_keymap_entry_sz = sizeof(struct input_keymap_entry);
38 #else
39@@ -809,15 +807,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
40 #endif // SANITIZER_LINUX
41
42 #if SANITIZER_LINUX && !SANITIZER_ANDROID
43- unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;
44- unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;
45- unsigned IOCTL_CYGETMON = CYGETMON;
46- unsigned IOCTL_CYGETTHRESH = CYGETTHRESH;
47- unsigned IOCTL_CYGETTIMEOUT = CYGETTIMEOUT;
48- unsigned IOCTL_CYSETDEFTHRESH = CYSETDEFTHRESH;
49- unsigned IOCTL_CYSETDEFTIMEOUT = CYSETDEFTIMEOUT;
50- unsigned IOCTL_CYSETTHRESH = CYSETTHRESH;
51- unsigned IOCTL_CYSETTIMEOUT = CYSETTIMEOUT;
52 unsigned IOCTL_EQL_EMANCIPATE = EQL_EMANCIPATE;
53 unsigned IOCTL_EQL_ENSLAVE = EQL_ENSLAVE;
54 unsigned IOCTL_EQL_GETMASTRCFG = EQL_GETMASTRCFG;
55--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
56+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
57@@ -974,7 +974,6 @@ extern unsigned struct_vt_mode_sz;
58
59 #if SANITIZER_LINUX && !SANITIZER_ANDROID
60 extern unsigned struct_ax25_parms_struct_sz;
61-extern unsigned struct_cyclades_monitor_sz;
62 extern unsigned struct_input_keymap_entry_sz;
63 extern unsigned struct_ipx_config_data_sz;
64 extern unsigned struct_kbdiacrs_sz;
65@@ -1319,15 +1318,6 @@ extern unsigned IOCTL_VT_WAITACTIVE;
66 #endif // SANITIZER_LINUX
67
68 #if SANITIZER_LINUX && !SANITIZER_ANDROID
69-extern unsigned IOCTL_CYGETDEFTHRESH;
70-extern unsigned IOCTL_CYGETDEFTIMEOUT;
71-extern unsigned IOCTL_CYGETMON;
72-extern unsigned IOCTL_CYGETTHRESH;
73-extern unsigned IOCTL_CYGETTIMEOUT;
74-extern unsigned IOCTL_CYSETDEFTHRESH;
75-extern unsigned IOCTL_CYSETDEFTIMEOUT;
76-extern unsigned IOCTL_CYSETTHRESH;
77-extern unsigned IOCTL_CYSETTIMEOUT;
78 extern unsigned IOCTL_EQL_EMANCIPATE;
79 extern unsigned IOCTL_EQL_ENSLAVE;
80 extern unsigned IOCTL_EQL_GETMASTRCFG;
81--
822.33.0
83