From 8083afa55d8c68abc02902e9a6ff16be5f301940 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Mon, 8 Oct 2018 17:51:32 -0300 Subject: [PATCH] termios: Define TIOCSER_TEMT with __USE_MISC (BZ#17783) This patch defines TIOCSER_TEMT on all architectures using the __USE_MISC guards similar to BZ#17782 fix. Latest Linux UAPI defines TIOCSER_TEMT with the same value for all architectures, so it is safe to use the value as default for all ABIs. Checked on x86_64linux-gnu and build against sparc64-linux-gnu and powerpc64le-linux-gnu. [BZ #17783] * sysdeps/unix/sysv/linux/bits/termios.h [__USE_MISC] (TIOCSER_TEMT): Define. * sysdeps/unix/sysv/linux/powerpc/bits/termios.h [__USE_MISC] (TIOCSER_TEMT): Likewise. * sysdeps/unix/sysv/linux/sparc/bits/termios.h [__USE_MISC] (TEOCSER_TEMT): Likewise. --- ChangeLog | 10 ++++++++++ sysdeps/unix/sysv/linux/bits/termios.h | 5 +++++ sysdeps/unix/sysv/linux/powerpc/bits/termios.h | 4 +++- sysdeps/unix/sysv/linux/sparc/bits/termios.h | 4 ++-- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3cf2a50bff..879578967e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2019-01-03 Adhemerval Zanella + + [BZ #17783] + * sysdeps/unix/sysv/linux/bits/termios.h [__USE_MISC] (TIOCSER_TEMT): + Define. + * sysdeps/unix/sysv/linux/powerpc/bits/termios.h [__USE_MISC] + (TIOCSER_TEMT): Likewise. + * sysdeps/unix/sysv/linux/sparc/bits/termios.h [__USE_MISC] + (TEOCSER_TEMT): Likewise. + 2019-01-02 PanderMusubi [BZ #24011] diff --git a/sysdeps/unix/sysv/linux/bits/termios.h b/sysdeps/unix/sysv/linux/bits/termios.h index e0249a5f4f..96b68a0abc 100644 --- a/sysdeps/unix/sysv/linux/bits/termios.h +++ b/sysdeps/unix/sysv/linux/bits/termios.h @@ -198,6 +198,11 @@ struct termios # define EXTPROC 0200000 #endif +#ifdef __USE_MISC +/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ +# define TIOCSER_TEMT 0x01 /* Transmitter physically empty */ +#endif + /* tcflow() and TCXONC use these */ #define TCOOFF 0 #define TCOON 1 diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/termios.h b/sysdeps/unix/sysv/linux/powerpc/bits/termios.h index 5236dc9adb..050d947eb9 100644 --- a/sysdeps/unix/sysv/linux/powerpc/bits/termios.h +++ b/sysdeps/unix/sysv/linux/powerpc/bits/termios.h @@ -273,7 +273,9 @@ struct ltchars { #define _VEOL2 8 #define _VSWTC 9 +#ifdef __USE_MISC /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ -#define TIOCSER_TEMT 0x01 /* Transmitter physically empty */ +# define TIOCSER_TEMT 0x01 /* Transmitter physically empty */ +#endif #endif /* __USE_MISC */ diff --git a/sysdeps/unix/sysv/linux/sparc/bits/termios.h b/sysdeps/unix/sysv/linux/sparc/bits/termios.h index 36860e0020..0c35d27772 100644 --- a/sysdeps/unix/sysv/linux/sparc/bits/termios.h +++ b/sysdeps/unix/sysv/linux/sparc/bits/termios.h @@ -203,9 +203,9 @@ struct termios # define EXTPROC 0x00010000 #endif -# if defined __USE_GNU +#ifdef __USE_MISC /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ -#define TIOCSER_TEMT 0x01 /* Transmitter physically empty */ +# define TIOCSER_TEMT 0x01 /* Transmitter physically empty */ #endif /* tcflow() and TCXONC use these */ -- 2.43.5