Skip to content

Commit 65f0e78

Browse files
tstellarIanWood1
authored andcommitted
[sanitizer_common] Remove interceptors for deprecated struct termio (llvm#137403)
This struct will be removed from glibc-2.42 and has been deprecated for a very long time. Fixes llvm#137321
1 parent b150340 commit 65f0e78

File tree

3 files changed

+0
-12
lines changed

3 files changed

+0
-12
lines changed

compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc

-8
Original file line numberDiff line numberDiff line change
@@ -342,17 +342,9 @@ static void ioctl_table_fill() {
342342
_(SOUND_PCM_WRITE_CHANNELS, WRITE, sizeof(int));
343343
_(SOUND_PCM_WRITE_FILTER, WRITE, sizeof(int));
344344
_(TCFLSH, NONE, 0);
345-
#if SANITIZER_GLIBC
346-
_(TCGETA, WRITE, struct_termio_sz);
347-
#endif
348345
_(TCGETS, WRITE, struct_termios_sz);
349346
_(TCSBRK, NONE, 0);
350347
_(TCSBRKP, NONE, 0);
351-
#if SANITIZER_GLIBC
352-
_(TCSETA, READ, struct_termio_sz);
353-
_(TCSETAF, READ, struct_termio_sz);
354-
_(TCSETAW, READ, struct_termio_sz);
355-
#endif
356348
_(TCSETS, READ, struct_termios_sz);
357349
_(TCSETSF, READ, struct_termios_sz);
358350
_(TCSETSW, READ, struct_termios_sz);

compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -494,9 +494,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
494494
unsigned struct_input_id_sz = sizeof(struct input_id);
495495
unsigned struct_mtpos_sz = sizeof(struct mtpos);
496496
unsigned struct_rtentry_sz = sizeof(struct rtentry);
497-
#if SANITIZER_GLIBC || SANITIZER_ANDROID
498-
unsigned struct_termio_sz = sizeof(struct termio);
499-
#endif
500497
unsigned struct_vt_consize_sz = sizeof(struct vt_consize);
501498
unsigned struct_vt_sizes_sz = sizeof(struct vt_sizes);
502499
unsigned struct_vt_stat_sz = sizeof(struct vt_stat);

compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h

-1
Original file line numberDiff line numberDiff line change
@@ -1063,7 +1063,6 @@ extern unsigned struct_hd_geometry_sz;
10631063
extern unsigned struct_input_absinfo_sz;
10641064
extern unsigned struct_input_id_sz;
10651065
extern unsigned struct_mtpos_sz;
1066-
extern unsigned struct_termio_sz;
10671066
extern unsigned struct_vt_consize_sz;
10681067
extern unsigned struct_vt_sizes_sz;
10691068
extern unsigned struct_vt_stat_sz;

0 commit comments

Comments
 (0)