[sanitizer] avoid using ioctl constants for glibc above 2.41

Author: trcrsired

compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc

@@ -345,14 +345,14 @@ static void ioctl_table_fill() {
   _(SOUND_PCM_WRITE_FILTER, WRITE, sizeof(int));
   _(TCFLSH, NONE, 0);
 #    if SANITIZER_TERMIOS_IOCTL_CONSTANTS
-  _(SANITIZER_TCGETS, WRITE, struct_termios_sz);
+  _(TCGETS, WRITE, struct_termios_sz);
 #    endif
   _(TCSBRK, NONE, 0);
   _(TCSBRKP, NONE, 0);
 #    if SANITIZER_TERMIOS_IOCTL_CONSTANTS
-  _(SANITIZER_TCSETS, READ, struct_termios_sz);
-  _(SANITIZER_TCSETSF, READ, struct_termios_sz);
-  _(SANITIZER_TCSETSW, READ, struct_termios_sz);
+  _(TCSETS, READ, struct_termios_sz);
+  _(TCSETSF, READ, struct_termios_sz);
+  _(TCSETSW, READ, struct_termios_sz);
 #    endif
   _(TCXONC, NONE, 0);
   _(TIOCGLCKTRMIOS, WRITE, struct_termios_sz);

compiler-rt/lib/sanitizer_common/sanitizer_platform.h

@@ -483,25 +483,16 @@
 #endif
 
 #if SANITIZER_LINUX
-#  if !SANITIZER_GLIBC || SANITIZER_PPC
+#    if SANITIZER_GLIBC
 // Workaround for
 // glibc/commit/3d3572f59059e2b19b8541ea648a6172136ec42e
 // Linux: Keep termios ioctl constants strictly internal
-#    define SANITIZER_TERMIOS_IOCTL_CONSTANTS 1
-#    if SANITIZER_GLIBC && SANITIZER_PPC
-#      define SANITIZER_TCGETS 0x402c7413
-#      define SANITIZER_TCSETS 0x802c7414
-#      define SANITIZER_TCSETSF 0x802c7415
-#      define SANITIZER_TCSETSW 0x802c7416
+#      if __GLIBC_PREREQ(2, 41)
+#        define SANITIZER_TERMIOS_IOCTL_CONSTANTS 0
+#      else
+#        define SANITIZER_TERMIOS_IOCTL_CONSTANTS 1
+#      endif
 #    else
-#      define SANITIZER_TCGETS TCGETS
-#      define SANITIZER_TCSETS TCSETS
-#      define SANITIZER_TCSETSF TCSETSF
-#      define SANITIZER_TCSETSW TCSETSW
+#      define SANITIZER_TERMIOS_IOCTL_CONSTANTS 1
 #    endif
-#  else
-#    define SANITIZER_TERMIOS_IOCTL_CONSTANTS 0
-#  endif
-#endif
-
 #endif  // SANITIZER_PLATFORM_H

compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp

@@ -781,17 +781,17 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
   unsigned IOCTL_TCFLSH = TCFLSH;
   unsigned IOCTL_TCGETA = TCGETA;
 #    if SANITIZER_TERMIOS_IOCTL_CONSTANTS
-  unsigned IOCTL_TCGETS = SANITIZER_TCGETS;
+  unsigned IOCTL_TCGETS = TCGETS;
 #    endif
   unsigned IOCTL_TCSBRK = TCSBRK;
   unsigned IOCTL_TCSBRKP = TCSBRKP;
   unsigned IOCTL_TCSETA = TCSETA;
   unsigned IOCTL_TCSETAF = TCSETAF;
   unsigned IOCTL_TCSETAW = TCSETAW;
 #    if SANITIZER_TERMIOS_IOCTL_CONSTANTS
-  unsigned IOCTL_TCSETS = SANITIZER_TCSETS;
-  unsigned IOCTL_TCSETSF = SANITIZER_TCSETSF;
-  unsigned IOCTL_TCSETSW = SANITIZER_TCSETSW;
+  unsigned IOCTL_TCSETS = TCSETS;
+  unsigned IOCTL_TCSETSF = TCSETSF;
+  unsigned IOCTL_TCSETSW = TCSETSW;
 #    endif
   unsigned IOCTL_TCXONC = TCXONC;
   unsigned IOCTL_TIOCGLCKTRMIOS = TIOCGLCKTRMIOS;