$NetBSD: patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cpp,v 1.6 2023/03/03 09:53:14 wiz Exp $ urio and smb have been removed from NetBSD. upstreamed? TIOCRCVFRAME and TIOCXMTFRAME as well. https://github.com/llvm/llvm-project/issues/61151 --- lib/sanitizer_common/sanitizer_platform_limits_netbsd.cpp.orig 2023-01-12 07:12:30.000000000 +0000 +++ lib/sanitizer_common/sanitizer_platform_limits_netbsd.cpp @@ -957,12 +957,14 @@ unsigned struct_session_op_sz = sizeof(s unsigned struct_sgttyb_sz = sizeof(sgttyb); unsigned struct_sioc_sg_req_sz = sizeof(sioc_sg_req); unsigned struct_sioc_vif_req_sz = sizeof(sioc_vif_req); +#if __NetBSD_Version__ < 999000000 unsigned struct_smbioc_flags_sz = sizeof(smbioc_flags); unsigned struct_smbioc_lookup_sz = sizeof(smbioc_lookup); unsigned struct_smbioc_oshare_sz = sizeof(smbioc_oshare); unsigned struct_smbioc_ossn_sz = sizeof(smbioc_ossn); unsigned struct_smbioc_rq_sz = sizeof(smbioc_rq); unsigned struct_smbioc_rw_sz = sizeof(smbioc_rw); +#endif unsigned struct_spppauthcfg_sz = sizeof(spppauthcfg); unsigned struct_spppauthfailuresettings_sz = sizeof(spppauthfailuresettings); unsigned struct_spppauthfailurestats_sz = sizeof(spppauthfailurestats); @@ -987,7 +989,9 @@ unsigned struct_twe_drivecommand_sz = si unsigned struct_twe_paramcommand_sz = sizeof(twe_paramcommand); unsigned struct_twe_usercommand_sz = sizeof(twe_usercommand); unsigned struct_ukyopon_identify_sz = sizeof(ukyopon_identify); +#if __NetBSD_Version__ < 999000000 unsigned struct_urio_command_sz = sizeof(urio_command); +#endif unsigned struct_usb_alt_interface_sz = sizeof(usb_alt_interface); unsigned struct_usb_bulk_ra_wb_opt_sz = sizeof(usb_bulk_ra_wb_opt); unsigned struct_usb_config_desc_sz = sizeof(usb_config_desc); @@ -1576,8 +1580,10 @@ unsigned IOCTL_STICIO_RESET = STICIO_RES unsigned IOCTL_STICIO_STARTQ = STICIO_STARTQ; unsigned IOCTL_STICIO_STOPQ = STICIO_STOPQ; unsigned IOCTL_UKYOPON_IDENTIFY = UKYOPON_IDENTIFY; +#if __NetBSD_Version__ < 999000000 unsigned IOCTL_URIO_SEND_COMMAND = URIO_SEND_COMMAND; unsigned IOCTL_URIO_RECV_COMMAND = URIO_RECV_COMMAND; +#endif unsigned IOCTL_USB_REQUEST = USB_REQUEST; unsigned IOCTL_USB_SETDEBUG = USB_SETDEBUG; unsigned IOCTL_USB_DISCOVER = USB_DISCOVER; @@ -1962,6 +1968,7 @@ unsigned IOCTL_SIOCCONNECTXDEL = SIOCCON unsigned IOCTL_SIOCSIFINFO_FLAGS = SIOCSIFINFO_FLAGS; unsigned IOCTL_SIOCAADDRCTL_POLICY = SIOCAADDRCTL_POLICY; unsigned IOCTL_SIOCDADDRCTL_POLICY = SIOCDADDRCTL_POLICY; +#if __NetBSD_Version__ < 999000000 unsigned IOCTL_SMBIOC_OPENSESSION = SMBIOC_OPENSESSION; unsigned IOCTL_SMBIOC_OPENSHARE = SMBIOC_OPENSHARE; unsigned IOCTL_SMBIOC_REQUEST = SMBIOC_REQUEST; @@ -1969,6 +1976,7 @@ unsigned IOCTL_SMBIOC_SETFLAGS = SMBIOC_ unsigned IOCTL_SMBIOC_LOOKUP = SMBIOC_LOOKUP; unsigned IOCTL_SMBIOC_READ = SMBIOC_READ; unsigned IOCTL_SMBIOC_WRITE = SMBIOC_WRITE; +#endif unsigned IOCTL_AGPIOC_INFO = AGPIOC_INFO; unsigned IOCTL_AGPIOC_ACQUIRE = AGPIOC_ACQUIRE; unsigned IOCTL_AGPIOC_RELEASE = AGPIOC_RELEASE; @@ -2342,8 +2350,12 @@ unsigned IOCTL_TIOCDRAIN = TIOCDRAIN; unsigned IOCTL_TIOCGFLAGS = TIOCGFLAGS; unsigned IOCTL_TIOCSFLAGS = TIOCSFLAGS; unsigned IOCTL_TIOCDCDTIMESTAMP = TIOCDCDTIMESTAMP; +#ifdef TIOCRCVFRAME unsigned IOCTL_TIOCRCVFRAME = TIOCRCVFRAME; +#endif +#ifdef TIOCXMTFRAME unsigned IOCTL_TIOCXMTFRAME = TIOCXMTFRAME; +#endif unsigned IOCTL_TIOCPTMGET = TIOCPTMGET; unsigned IOCTL_TIOCGRANTPT = TIOCGRANTPT; unsigned IOCTL_TIOCPTSNAME = TIOCPTSNAME;