"Christos Zoulas" writes: > Module Name: src > Committed By: christos > Date: Mon Jul 31 17:41:18 UTC 2023 > > Modified Files: > src/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common: > sanitizer_interceptors_ioctl_netbsd.inc > sanitizer_platform_limits_netbsd.cc > src/sys/compat/common: usb_subr_30.c > src/sys/dev/usb: ugen.c uhid.c usb.c usb.h > src/sys/net: bpf.c bpf.h > src/sys/sys: compat_stub.h > > Log Message: > Don't call versioned stuff "old". Follow the naming convention for versioning > and name them after the last version of the OS they appeared on.
this is broken with -current, with your 2 additional changes, and i wasn't able to fix it easily. this happens: /usr/src6/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc: In function 'void ioctl_table_fill()': /usr/src6/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc:36:7: error: 'IOCTL_USB_DEVICEINFO_OLD' was not declared in this scope if i look, i see that _OLD is in the tree far more times today than the _30 version is. i think we should revert all this and just accept the old bad names are what those are known as now. there are 3 copies of this to fix in src (gcc, gcc.old, compiler-rt), as well as the upstream versions. these definitions have been around since 2006 (for at least USB_DEVICEINFO_OLD) and while i agree they're not the best names, those are the names we published. .. or perhaps revert, and then re-do when it's known that all the tree builds with it OK again, including not changing the sanitizer copies until after they've proven to build with the compat defines that exist currently. either way, please be sure to build the whole tree when you're making changes like this so you don't leave things broken, and espcially don't change published definitions that are used by 3rd party code... if it's published, someone probably uses it. for instance, i found: https://github.com/adityavardhanpadala/rumpsyscallfuzz/blob/master/honggfuzz/ioctl/ioctl_fuzz2.c very quickly. thanks. .mrg.
