[patch] Cyclades patch for 9.x branch

35_all_remove-cyclades_9.x.patch (text/plain), 3.83 KB, created by Iade Gesso on 2021-07-15 21:15:10 UTC

diff -uarN gcc-9.3.0.orig/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc gcc-9.3.0/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
--- gcc-9.3.0.orig/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc	2020-03-12 12:07:24.000000000 +0100
+++ gcc-9.3.0/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc	2021-07-15 18:51:31.003868528 +0200
@@ -365,15 +365,6 @@
 
 #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 -uarN gcc-9.3.0.orig/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc gcc-9.3.0/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
--- gcc-9.3.0.orig/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc	2020-03-12 12:07:24.000000000 +0100
+++ gcc-9.3.0/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc	2021-07-15 18:52:20.448424769 +0200
@@ -157,7 +157,6 @@
 # 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>
@@ -466,7 +465,6 @@
 
 #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
@@ -833,15 +831,6 @@
 #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 -uarN gcc-9.3.0.orig/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h gcc-9.3.0/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
--- gcc-9.3.0.orig/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h	2020-03-12 12:07:24.000000000 +0100
+++ gcc-9.3.0/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h	2021-07-15 18:53:00.204871395 +0200
@@ -1040,7 +1040,6 @@
 
 #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;
@@ -1385,15 +1384,6 @@
 #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;