[compiler-rt] r326084 - Skip two more ioctl interceptors for NetBSD

[Kamil Rytarowski via llvm-commits]

Author: kamil
Date: Mon Feb 26 05:00:40 2018
New Revision: 326084

URL: http://llvm.org/viewvc/llvm-project?rev=326084&view=rev
Log:
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>

Modified:
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc
    compiler-rt/trunk/utils/generate_netbsd_ioctls.awk

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc?rev=326084&r1=326083&r2=326084&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc Mon Feb 26 05:00:40 2018
@@ -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);

Modified: compiler-rt/trunk/utils/generate_netbsd_ioctls.awk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/utils/generate_netbsd_ioctls.awk?rev=326084&r1=326083&r2=326084&view=diff
==============================================================================
--- compiler-rt/trunk/utils/generate_netbsd_ioctls.awk (original)
+++ compiler-rt/trunk/utils/generate_netbsd_ioctls.awk Mon Feb 26 05:00:40 2018
@@ -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/ ||