On Fri, Jul 25, 2025 at 07:51:41PM +0100, Sam James wrote:
> Cherry picked from LLVM commit c99b1bcd505064f2e086e6b1034ce0b0c91ea5b9.
>
> The termio ioctls are no longer used after commit 59978b21ad9c
> ("[sanitizer_common] Remove interceptors for deprecated struct termio
> (#137403)"), remove them. Fixes this build error:
>
> ../../../../libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp:765:27:
> error: invalid application of ‘sizeof’ to incomplete type
> ‘__sanitizer::termio’
> 765 | unsigned IOCTL_TCGETA = TCGETA;
> | ^~~~~~
> ../../../../libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp:769:27:
> error: invalid application of ‘sizeof’ to incomplete type
> ‘__sanitizer::termio’
> 769 | unsigned IOCTL_TCSETA = TCSETA;
> | ^~~~~~
> ../../../../libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp:770:28:
> error: invalid application of ‘sizeof’ to incomplete type
> ‘__sanitizer::termio’
> 770 | unsigned IOCTL_TCSETAF = TCSETAF;
> | ^~~~~~~
> ../../../../libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp:771:28:
> error: invalid application of ‘sizeof’ to incomplete type
> ‘__sanitizer::termio’
> 771 | unsigned IOCTL_TCSETAW = TCSETAW;
> | ^~~~~~~
> ---
> We need this for imminent glibc-2.42. Testing running now. OK if that
> succeeds? Ideally for backports too after some soak time? (Note that
> we already backported Florian's r16-360-g1789c57dc97ea2 to 15, this
> change is a followup to that, and I'd like to backport his change further
> back as well).
While this is a workaround for the kernel headers vs. glibc incompatibility,
given that nothing uses those and that _ZN11__sanitizer12IOCTL_TCGETAE etc.
symbols are STV_HIDDEN and so this isn't an ABI break, the patch is ok for
trunk/15. But please get it into 15 today.
Guess we should also cherry-pick r15-9614 and this to 14/13 branches.
Jakub
