Index: external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_netbsd.h =================================================================== RCS file: /cvsroot/src/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_netbsd.h,v retrieving revision 1.3 diff -u -r1.3 sanitizer_platform_limits_netbsd.h --- external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_netbsd.h 20 Feb 2023 02:11:40 -0000 1.3 +++ external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_netbsd.h 2 Aug 2023 06:33:04 -0000 @@ -579,7 +579,7 @@ extern unsigned struct_blue_stats_sz; extern unsigned struct_bpf_dltlist_sz; extern unsigned struct_bpf_program_sz; -extern unsigned struct_bpf_stat_old_sz; +extern unsigned struct_bpf_stat30_sz; extern unsigned struct_bpf_stat_sz; extern unsigned struct_bpf_version_sz; extern unsigned struct_btreq_sz; @@ -883,7 +883,7 @@ extern unsigned struct_autofs_daemon_request_sz; extern unsigned struct_autofs_daemon_done_sz; extern unsigned struct_sctp_connectx_addrs_sz; -extern unsigned struct_usb_device_info_old_sz; +extern unsigned struct_usb_device_info30_sz; extern unsigned struct_usb_device_info_sz; extern unsigned struct_usb_device_stats_sz; extern unsigned struct_usb_endpoint_desc_sz; @@ -1434,7 +1434,7 @@ extern unsigned IOCTL_USB_SETDEBUG; extern unsigned IOCTL_USB_DISCOVER; extern unsigned IOCTL_USB_DEVICEINFO; -extern unsigned IOCTL_USB_DEVICEINFO_OLD; +extern unsigned IOCTL_USB_DEVICEINFO_30; extern unsigned IOCTL_USB_DEVICESTATS; extern unsigned IOCTL_USB_GET_REPORT_DESC; extern unsigned IOCTL_USB_SET_IMMED; @@ -1454,7 +1454,7 @@ extern unsigned IOCTL_USB_GET_STRING_DESC; extern unsigned IOCTL_USB_DO_REQUEST; extern unsigned IOCTL_USB_GET_DEVICEINFO; -extern unsigned IOCTL_USB_GET_DEVICEINFO_OLD; +extern unsigned IOCTL_USB_GET_DEVICEINFO_30; extern unsigned IOCTL_USB_SET_SHORT_XFER; extern unsigned IOCTL_USB_SET_TIMEOUT; extern unsigned IOCTL_USB_SET_BULK_RA; @@ -1637,7 +1637,7 @@ extern unsigned IOCTL_BIOCGETIF; extern unsigned IOCTL_BIOCSETIF; extern unsigned IOCTL_BIOCGSTATS; -extern unsigned IOCTL_BIOCGSTATSOLD; +extern unsigned IOCTL_BIOCGSTATS_30; extern unsigned IOCTL_BIOCIMMEDIATE; extern unsigned IOCTL_BIOCVERSION; extern unsigned IOCTL_BIOCSTCPF; Index: sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc =================================================================== RCS file: /cvsroot/src/sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc,v retrieving revision 1.5 diff -u -r1.5 sanitizer_interceptors_ioctl_netbsd.inc --- sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc 26 Dec 2022 22:22:22 -0000 1.5 +++ sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc 2 Aug 2023 06:33:06 -0000 @@ -452,7 +452,7 @@ _(USB_SETDEBUG, READ, sizeof(int)); _(USB_DISCOVER, NONE, 0); _(USB_DEVICEINFO, READWRITE, struct_usb_device_info_sz); - _(USB_DEVICEINFO_OLD, READWRITE, struct_usb_device_info_old_sz); + _(USB_DEVICEINFO_30, READWRITE, struct_usb_device_info30_sz); _(USB_DEVICESTATS, WRITE, struct_usb_device_stats_sz); _(USB_GET_REPORT_DESC, WRITE, struct_usb_ctl_report_desc_sz); _(USB_SET_IMMED, READ, sizeof(int)); @@ -472,7 +472,7 @@ _(USB_GET_STRING_DESC, READWRITE, struct_usb_string_desc_sz); _(USB_DO_REQUEST, READWRITE, struct_usb_ctl_request_sz); _(USB_GET_DEVICEINFO, WRITE, struct_usb_device_info_sz); - _(USB_GET_DEVICEINFO_OLD, WRITE, struct_usb_device_info_old_sz); + _(USB_GET_DEVICEINFO_30, WRITE, struct_usb_device_info30_sz); _(USB_SET_SHORT_XFER, READ, sizeof(int)); _(USB_SET_TIMEOUT, READ, sizeof(int)); _(USB_SET_BULK_RA, READ, sizeof(int)); @@ -675,7 +675,7 @@ _(BIOCGETIF, WRITE, struct_ifreq_sz); _(BIOCSETIF, READ, struct_ifreq_sz); _(BIOCGSTATS, WRITE, struct_bpf_stat_sz); - _(BIOCGSTATSOLD, WRITE, struct_bpf_stat_old_sz); + _(BIOCGSTATS_30, WRITE, struct_bpf_stat30_sz); _(BIOCIMMEDIATE, READ, sizeof(unsigned int)); _(BIOCVERSION, WRITE, struct_bpf_version_sz); _(BIOCSTCPF, READ, struct_bpf_program_sz); Index: sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc =================================================================== RCS file: /cvsroot/src/sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc,v retrieving revision 1.8 diff -u -r1.8 sanitizer_platform_limits_netbsd.cc --- sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc 26 Dec 2022 22:22:22 -0000 1.8 +++ sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc 2 Aug 2023 06:33:07 -0000 @@ -549,7 +549,7 @@ unsigned struct_blue_stats_sz = sizeof(blue_stats); unsigned struct_bpf_dltlist_sz = sizeof(bpf_dltlist); unsigned struct_bpf_program_sz = sizeof(bpf_program); -unsigned struct_bpf_stat_old_sz = sizeof(bpf_stat_old); +unsigned struct_bpf_stat30_sz = sizeof(bpf_stat30); unsigned struct_bpf_stat_sz = sizeof(bpf_stat); unsigned struct_bpf_version_sz = sizeof(bpf_version); unsigned struct_btreq_sz = sizeof(btreq); @@ -856,7 +856,7 @@ unsigned struct_autofs_daemon_request_sz = sizeof(autofs_daemon_request); unsigned struct_autofs_daemon_done_sz = sizeof(autofs_daemon_done); unsigned struct_sctp_connectx_addrs_sz = sizeof(sctp_connectx_addrs); -unsigned struct_usb_device_info_old_sz = sizeof(usb_device_info_old); +unsigned struct_usb_device_info30_sz = sizeof(usb_device_info30); unsigned struct_usb_device_info_sz = sizeof(usb_device_info); unsigned struct_usb_device_stats_sz = sizeof(usb_device_stats); unsigned struct_usb_endpoint_desc_sz = sizeof(usb_endpoint_desc); @@ -1419,7 +1419,7 @@ unsigned IOCTL_USB_SETDEBUG = USB_SETDEBUG; unsigned IOCTL_USB_DISCOVER = USB_DISCOVER; unsigned IOCTL_USB_DEVICEINFO = USB_DEVICEINFO; -unsigned IOCTL_USB_DEVICEINFO_OLD = USB_DEVICEINFO_OLD; +unsigned IOCTL_USB_DEVICEINFO_30 = USB_DEVICEINFO_30; unsigned IOCTL_USB_DEVICESTATS = USB_DEVICESTATS; unsigned IOCTL_USB_GET_REPORT_DESC = USB_GET_REPORT_DESC; unsigned IOCTL_USB_SET_IMMED = USB_SET_IMMED; @@ -1439,7 +1439,7 @@ unsigned IOCTL_USB_GET_STRING_DESC = USB_GET_STRING_DESC; unsigned IOCTL_USB_DO_REQUEST = USB_DO_REQUEST; unsigned IOCTL_USB_GET_DEVICEINFO = USB_GET_DEVICEINFO; -unsigned IOCTL_USB_GET_DEVICEINFO_OLD = USB_GET_DEVICEINFO_OLD; +unsigned IOCTL_USB_GET_DEVICEINFO_30 = USB_GET_DEVICEINFO_30; unsigned IOCTL_USB_SET_SHORT_XFER = USB_SET_SHORT_XFER; unsigned IOCTL_USB_SET_TIMEOUT = USB_SET_TIMEOUT; unsigned IOCTL_USB_SET_BULK_RA = USB_SET_BULK_RA; @@ -1624,7 +1624,7 @@ unsigned IOCTL_BIOCGETIF = BIOCGETIF; unsigned IOCTL_BIOCSETIF = BIOCSETIF; unsigned IOCTL_BIOCGSTATS = BIOCGSTATS; -unsigned IOCTL_BIOCGSTATSOLD = BIOCGSTATSOLD; +unsigned IOCTL_BIOCGSTATS_30 = BIOCGSTATS_30; unsigned IOCTL_BIOCIMMEDIATE = BIOCIMMEDIATE; unsigned IOCTL_BIOCVERSION = BIOCVERSION; unsigned IOCTL_BIOCSTCPF = BIOCSTCPF; Index: sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_platform_limits_netbsd.h =================================================================== RCS file: /cvsroot/src/sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_platform_limits_netbsd.h,v retrieving revision 1.6 diff -u -r1.6 sanitizer_platform_limits_netbsd.h --- sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_platform_limits_netbsd.h 26 Dec 2022 22:22:22 -0000 1.6 +++ sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_platform_limits_netbsd.h 2 Aug 2023 06:33:07 -0000 @@ -552,7 +552,7 @@ extern unsigned struct_blue_stats_sz; extern unsigned struct_bpf_dltlist_sz; extern unsigned struct_bpf_program_sz; -extern unsigned struct_bpf_stat_old_sz; +extern unsigned struct_bpf_stat30_sz; extern unsigned struct_bpf_stat_sz; extern unsigned struct_bpf_version_sz; extern unsigned struct_btreq_sz; @@ -856,7 +856,7 @@ extern unsigned struct_autofs_daemon_request_sz; extern unsigned struct_autofs_daemon_done_sz; extern unsigned struct_sctp_connectx_addrs_sz; -extern unsigned struct_usb_device_info_old_sz; +extern unsigned struct_usb_device_info30_sz; extern unsigned struct_usb_device_info_sz; extern unsigned struct_usb_device_stats_sz; extern unsigned struct_usb_endpoint_desc_sz; @@ -1408,7 +1408,7 @@ extern unsigned IOCTL_USB_SETDEBUG; extern unsigned IOCTL_USB_DISCOVER; extern unsigned IOCTL_USB_DEVICEINFO; -extern unsigned IOCTL_USB_DEVICEINFO_OLD; +extern unsigned IOCTL_USB_DEVICEINFO_30; extern unsigned IOCTL_USB_DEVICESTATS; extern unsigned IOCTL_USB_GET_REPORT_DESC; extern unsigned IOCTL_USB_SET_IMMED; @@ -1428,7 +1428,7 @@ extern unsigned IOCTL_USB_GET_STRING_DESC; extern unsigned IOCTL_USB_DO_REQUEST; extern unsigned IOCTL_USB_GET_DEVICEINFO; -extern unsigned IOCTL_USB_GET_DEVICEINFO_OLD; +extern unsigned IOCTL_USB_GET_DEVICEINFO_30; extern unsigned IOCTL_USB_SET_SHORT_XFER; extern unsigned IOCTL_USB_SET_TIMEOUT; extern unsigned IOCTL_USB_SET_BULK_RA; @@ -1611,7 +1611,7 @@ extern unsigned IOCTL_BIOCGETIF; extern unsigned IOCTL_BIOCSETIF; extern unsigned IOCTL_BIOCGSTATS; -extern unsigned IOCTL_BIOCGSTATSOLD; +extern unsigned IOCTL_BIOCGSTATS_30; extern unsigned IOCTL_BIOCIMMEDIATE; extern unsigned IOCTL_BIOCVERSION; extern unsigned IOCTL_BIOCSTCPF;