Skip to content

Commit 884040d

Browse files
TamarChristinaArmtstellar
authored andcommitted
libsanitizer: Remove cyclades inclusion in sanitizer
The Linux kernel has removed the interface to cyclades from the latest kernel headers[1] due to them being orphaned for the past 13 years. libsanitizer uses this header when compiling against glibc, but glibcs itself doesn't seem to have any references to cyclades. Further more it seems that the driver is broken in the kernel and the firmware doesn't seem to be available anymore. As such since this is breaking the build of libsanitizer (and so the GCC bootstrap[2]) I propose to remove this. [1] https://lkml.org/lkml/2021/3/2/153 [2] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100379 Reviewed By: eugenis Differential Revision: https://reviews.llvm.org/D102059 (cherry picked from commit 68d5235)
1 parent 894c0c8 commit 884040d

File tree

3 files changed

+0
-30
lines changed

3 files changed

+0
-30
lines changed

compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -370,15 +370,6 @@ static void ioctl_table_fill() {
370370

371371
#if SANITIZER_GLIBC
372372
// _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE
373-
_(CYGETDEFTHRESH, WRITE, sizeof(int));
374-
_(CYGETDEFTIMEOUT, WRITE, sizeof(int));
375-
_(CYGETMON, WRITE, struct_cyclades_monitor_sz);
376-
_(CYGETTHRESH, WRITE, sizeof(int));
377-
_(CYGETTIMEOUT, WRITE, sizeof(int));
378-
_(CYSETDEFTHRESH, NONE, 0);
379-
_(CYSETDEFTIMEOUT, NONE, 0);
380-
_(CYSETTHRESH, NONE, 0);
381-
_(CYSETTIMEOUT, NONE, 0);
382373
_(EQL_EMANCIPATE, WRITE, struct_ifreq_sz);
383374
_(EQL_ENSLAVE, WRITE, struct_ifreq_sz);
384375
_(EQL_GETMASTRCFG, WRITE, struct_ifreq_sz);

compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ typedef struct user_fpregs elf_fpregset_t;
143143
# include <sys/procfs.h>
144144
#endif
145145
#include <sys/user.h>
146-
#include <linux/cyclades.h>
147146
#include <linux/if_eql.h>
148147
#include <linux/if_plip.h>
149148
#include <linux/lp.h>
@@ -459,7 +458,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
459458

460459
#if SANITIZER_GLIBC
461460
unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct);
462-
unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);
463461
#if EV_VERSION > (0x010000)
464462
unsigned struct_input_keymap_entry_sz = sizeof(struct input_keymap_entry);
465463
#else
@@ -823,15 +821,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
823821
#endif // SANITIZER_LINUX
824822

825823
#if SANITIZER_LINUX && !SANITIZER_ANDROID
826-
unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;
827-
unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;
828-
unsigned IOCTL_CYGETMON = CYGETMON;
829-
unsigned IOCTL_CYGETTHRESH = CYGETTHRESH;
830-
unsigned IOCTL_CYGETTIMEOUT = CYGETTIMEOUT;
831-
unsigned IOCTL_CYSETDEFTHRESH = CYSETDEFTHRESH;
832-
unsigned IOCTL_CYSETDEFTIMEOUT = CYSETDEFTIMEOUT;
833-
unsigned IOCTL_CYSETTHRESH = CYSETTHRESH;
834-
unsigned IOCTL_CYSETTIMEOUT = CYSETTIMEOUT;
835824
unsigned IOCTL_EQL_EMANCIPATE = EQL_EMANCIPATE;
836825
unsigned IOCTL_EQL_ENSLAVE = EQL_ENSLAVE;
837826
unsigned IOCTL_EQL_GETMASTRCFG = EQL_GETMASTRCFG;

compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -983,7 +983,6 @@ extern unsigned struct_vt_mode_sz;
983983

984984
#if SANITIZER_LINUX && !SANITIZER_ANDROID
985985
extern unsigned struct_ax25_parms_struct_sz;
986-
extern unsigned struct_cyclades_monitor_sz;
987986
extern unsigned struct_input_keymap_entry_sz;
988987
extern unsigned struct_ipx_config_data_sz;
989988
extern unsigned struct_kbdiacrs_sz;
@@ -1328,15 +1327,6 @@ extern unsigned IOCTL_VT_WAITACTIVE;
13281327
#endif // SANITIZER_LINUX
13291328

13301329
#if SANITIZER_LINUX && !SANITIZER_ANDROID
1331-
extern unsigned IOCTL_CYGETDEFTHRESH;
1332-
extern unsigned IOCTL_CYGETDEFTIMEOUT;
1333-
extern unsigned IOCTL_CYGETMON;
1334-
extern unsigned IOCTL_CYGETTHRESH;
1335-
extern unsigned IOCTL_CYGETTIMEOUT;
1336-
extern unsigned IOCTL_CYSETDEFTHRESH;
1337-
extern unsigned IOCTL_CYSETDEFTIMEOUT;
1338-
extern unsigned IOCTL_CYSETTHRESH;
1339-
extern unsigned IOCTL_CYSETTIMEOUT;
13401330
extern unsigned IOCTL_EQL_EMANCIPATE;
13411331
extern unsigned IOCTL_EQL_ENSLAVE;
13421332
extern unsigned IOCTL_EQL_GETMASTRCFG;

0 commit comments

Comments
 (0)