88 lines
3.9 KiB
Diff
88 lines
3.9 KiB
Diff
|
Pick a7e72b282177fbaa6a852324641c871313d326da to remove cyclades from
|
||
|
|
libsanitizer
|
||
|
|
|
||
|
|
diff --git a/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
|
||
|
|
index a68534c5a0a..85ab53e7430 100755
|
||
|
|
--- a/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
|
||
|
|
+++ b/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
|
||
|
|
@@ -361,15 +361,6 @@ static void ioctl_table_fill() {
|
||
|
|
|
||
|
|
#if SANITIZER_LINUX && !SANITIZER_ANDROID
|
||
|
|
// _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE
|
||
|
|
- _(CYGETDEFTHRESH, WRITE, sizeof(int));
|
||
|
|
- _(CYGETDEFTIMEOUT, WRITE, sizeof(int));
|
||
|
|
- _(CYGETMON, WRITE, struct_cyclades_monitor_sz);
|
||
|
|
- _(CYGETTHRESH, WRITE, sizeof(int));
|
||
|
|
- _(CYGETTIMEOUT, WRITE, sizeof(int));
|
||
|
|
- _(CYSETDEFTHRESH, NONE, 0);
|
||
|
|
- _(CYSETDEFTIMEOUT, NONE, 0);
|
||
|
|
- _(CYSETTHRESH, NONE, 0);
|
||
|
|
- _(CYSETTIMEOUT, NONE, 0);
|
||
|
|
_(EQL_EMANCIPATE, WRITE, struct_ifreq_sz);
|
||
|
|
_(EQL_ENSLAVE, WRITE, struct_ifreq_sz);
|
||
|
|
_(EQL_GETMASTRCFG, WRITE, struct_ifreq_sz);
|
||
|
|
diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
|
||
|
|
index 97eae3fc7bc..a5e02947696 100644
|
||
|
|
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
|
||
|
|
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
|
||
|
|
@@ -154,7 +154,6 @@ typedef struct user_fpregs elf_fpregset_t;
|
||
|
|
# include <sys/procfs.h>
|
||
|
|
#endif
|
||
|
|
#include <sys/user.h>
|
||
|
|
-#include <linux/cyclades.h>
|
||
|
|
#include <linux/if_eql.h>
|
||
|
|
#include <linux/if_plip.h>
|
||
|
|
#include <linux/lp.h>
|
||
|
|
@@ -454,7 +453,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
|
||
|
|
|
||
|
|
#if SANITIZER_LINUX && !SANITIZER_ANDROID
|
||
|
|
unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct);
|
||
|
|
- unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);
|
||
|
|
#if EV_VERSION > (0x010000)
|
||
|
|
unsigned struct_input_keymap_entry_sz = sizeof(struct input_keymap_entry);
|
||
|
|
#else
|
||
|
|
@@ -821,15 +819,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
|
||
|
|
#endif // SANITIZER_LINUX || SANITIZER_FREEBSD
|
||
|
|
|
||
|
|
#if SANITIZER_LINUX && !SANITIZER_ANDROID
|
||
|
|
- unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;
|
||
|
|
- unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;
|
||
|
|
- unsigned IOCTL_CYGETMON = CYGETMON;
|
||
|
|
- unsigned IOCTL_CYGETTHRESH = CYGETTHRESH;
|
||
|
|
- unsigned IOCTL_CYGETTIMEOUT = CYGETTIMEOUT;
|
||
|
|
- unsigned IOCTL_CYSETDEFTHRESH = CYSETDEFTHRESH;
|
||
|
|
- unsigned IOCTL_CYSETDEFTIMEOUT = CYSETDEFTIMEOUT;
|
||
|
|
- unsigned IOCTL_CYSETTHRESH = CYSETTHRESH;
|
||
|
|
- unsigned IOCTL_CYSETTIMEOUT = CYSETTIMEOUT;
|
||
|
|
unsigned IOCTL_EQL_EMANCIPATE = EQL_EMANCIPATE;
|
||
|
|
unsigned IOCTL_EQL_ENSLAVE = EQL_ENSLAVE;
|
||
|
|
unsigned IOCTL_EQL_GETMASTRCFG = EQL_GETMASTRCFG;
|
||
|
|
diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
|
||
|
|
index c139322839a..10f7a4f6502 100644
|
||
|
|
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
|
||
|
|
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
|
||
|
|
@@ -1000,7 +1000,6 @@ struct __sanitizer_cookie_io_functions_t {
|
||
|
|
|
||
|
|
#if SANITIZER_LINUX && !SANITIZER_ANDROID
|
||
|
|
extern unsigned struct_ax25_parms_struct_sz;
|
||
|
|
- extern unsigned struct_cyclades_monitor_sz;
|
||
|
|
extern unsigned struct_input_keymap_entry_sz;
|
||
|
|
extern unsigned struct_ipx_config_data_sz;
|
||
|
|
extern unsigned struct_kbdiacrs_sz;
|
||
|
|
@@ -1345,15 +1344,6 @@ struct __sanitizer_cookie_io_functions_t {
|
||
|
|
#endif // SANITIZER_LINUX || SANITIZER_FREEBSD
|
||
|
|
|
||
|
|
#if SANITIZER_LINUX && !SANITIZER_ANDROID
|
||
|
|
- extern unsigned IOCTL_CYGETDEFTHRESH;
|
||
|
|
- extern unsigned IOCTL_CYGETDEFTIMEOUT;
|
||
|
|
- extern unsigned IOCTL_CYGETMON;
|
||
|
|
- extern unsigned IOCTL_CYGETTHRESH;
|
||
|
|
- extern unsigned IOCTL_CYGETTIMEOUT;
|
||
|
|
- extern unsigned IOCTL_CYSETDEFTHRESH;
|
||
|
|
- extern unsigned IOCTL_CYSETDEFTIMEOUT;
|
||
|
|
- extern unsigned IOCTL_CYSETTHRESH;
|
||
|
|
- extern unsigned IOCTL_CYSETTIMEOUT;
|
||
|
|
extern unsigned IOCTL_EQL_EMANCIPATE;
|
||
|
|
extern unsigned IOCTL_EQL_ENSLAVE;
|
||
|
|
extern unsigned IOCTL_EQL_GETMASTRCFG;
|