Skip two more ioctl interceptors for NetBSD

Don't intercept:
 - HFSC_IF_ATTACH
 - HFSC_MOD_CLASS

These operations conflict on NetBSD 32-bit with:
 - PRIQ_IF_ATTACH
 - PRIQ_MOD_CLASS

Sponsored by <The NetBSD Foundation>

llvm-svn: 326084

diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc b/compiler-rt/lib/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc
index 6d9a959..f076940 100644 (file)
--- a/compiler-rt/lib/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc
@@ -25,7 +25,7 @@ struct ioctl_desc {
   const char *name;
 };
 
-const unsigned ioctl_table_max = 1200;
+const unsigned ioctl_table_max = 1198;
 static ioctl_desc ioctl_table[ioctl_table_max];
 static unsigned ioctl_table_size = 0;
 
@@ -82,10 +82,8 @@ static void ioctl_table_fill() {
   _(FIFOQ_CONFIG, READWRITE, struct_fifoq_conf_sz);
   _(FIFOQ_GETSTATS, READWRITE, struct_fifoq_getstats_sz);
   /* Entries from file: altq/altq_hfsc.h */
-  _(HFSC_IF_ATTACH, READ, struct_hfsc_attach_sz);
   _(HFSC_CLEAR_HIERARCHY, READ, struct_hfsc_interface_sz);
   _(HFSC_ADD_CLASS, READWRITE, struct_hfsc_add_class_sz);
-  _(HFSC_MOD_CLASS, READ, struct_hfsc_modify_class_sz);
   _(HFSC_GETSTATS, READWRITE, struct_hfsc_class_stats_sz);
   /* Entries from file: altq/altq_jobs.h */
   _(JOBS_IF_ATTACH, READ, struct_jobs_attach_sz);

diff --git a/compiler-rt/utils/generate_netbsd_ioctls.awk b/compiler-rt/utils/generate_netbsd_ioctls.awk
index fc39a30..574217f 100755 (executable)
--- a/compiler-rt/utils/generate_netbsd_ioctls.awk
+++ b/compiler-rt/utils/generate_netbsd_ioctls.awk
@@ -196,6 +196,8 @@ FNR == 1 {
       $0 ~ /ALTQDELFILTER/ ||
       $0 ~ /ALTQGETSTATS/ ||
       $0 ~ /ALTQGETCNTR/ ||
+      $0 ~ /HFSC_IF_ATTACH/ ||
+      $0 ~ /HFSC_MOD_CLASS/ ||
       $0 ~ /HLCD_DISPCTL/ ||
       $0 ~ /HLCD_RESET/ ||
       $0 ~ /HLCD_CLEAR/ ||