Skip to content

Commit aa804fd

Browse files
committed
[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 (cherry picked from commit 59978b2)
1 parent 53393e2 commit aa804fd

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -338,17 +338,9 @@ static void ioctl_table_fill() {
338338
_(SOUND_PCM_WRITE_CHANNELS, WRITE, sizeof(int));
339339
_(SOUND_PCM_WRITE_FILTER, WRITE, sizeof(int));
340340
_(TCFLSH, NONE, 0);
341-
#if SANITIZER_GLIBC
342-
_(TCGETA, WRITE, struct_termio_sz);
343-
#endif
344341
_(TCGETS, WRITE, struct_termios_sz);
345342
_(TCSBRK, NONE, 0);
346343
_(TCSBRKP, NONE, 0);
347-
#if SANITIZER_GLIBC
348-
_(TCSETA, READ, struct_termio_sz);
349-
_(TCSETAF, READ, struct_termio_sz);
350-
_(TCSETAW, READ, struct_termio_sz);
351-
#endif
352344
_(TCSETS, READ, struct_termios_sz);
353345
_(TCSETSF, READ, struct_termios_sz);
354346
_(TCSETSW, READ, struct_termios_sz);

compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -485,9 +485,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
485485
unsigned struct_input_id_sz = sizeof(struct input_id);
486486
unsigned struct_mtpos_sz = sizeof(struct mtpos);
487487
unsigned struct_rtentry_sz = sizeof(struct rtentry);
488-
#if SANITIZER_GLIBC || SANITIZER_ANDROID
489-
unsigned struct_termio_sz = sizeof(struct termio);
490-
#endif
491488
unsigned struct_vt_consize_sz = sizeof(struct vt_consize);
492489
unsigned struct_vt_sizes_sz = sizeof(struct vt_sizes);
493490
unsigned struct_vt_stat_sz = sizeof(struct vt_stat);

compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1043,7 +1043,6 @@ extern unsigned struct_hd_geometry_sz;
10431043
extern unsigned struct_input_absinfo_sz;
10441044
extern unsigned struct_input_id_sz;
10451045
extern unsigned struct_mtpos_sz;
1046-
extern unsigned struct_termio_sz;
10471046
extern unsigned struct_vt_consize_sz;
10481047
extern unsigned struct_vt_sizes_sz;
10491048
extern unsigned struct_vt_stat_sz;

0 commit comments

Comments
 (0)