From 78c05814320cdc3377347f8e5fdbaa7cf5abf5b5 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Mon, 27 Mar 2017 15:07:38 +0000 Subject: [PATCH] Define more termios.h macros unconditionally for alpha (bug 21277). termios.h should define IUCLC for UNIX98 and older XSI standards. The sysdeps/unix/sysv/linux/alpha version defines it only if __USE_MISC, so causing some conform/ tests to fail. Other versions define it unconditionally (I* being a reserved namespace for this header); the API should be consistent between architectures in the absence of a clear reason for it to differ (and given that a symbol is part of the API on two architectures, I don't see any reason for the feature test macros required ever to differ between those architectures), so this patch makes the alpha version define it unconditionally as well. Two non-POSIX macros alongside it, IMAXBEL and IUTF8, are also defined unconditionally on other architectures, so this patch makes them consistent by defining them unconditionally on alpha as well. Tested (compilation only) with build-many-glibcs.py. [BZ #21277] * sysdeps/unix/sysv/linux/alpha/bits/termios.h (IUCLC): Define unconditionally. (IMAXBEL): Likewise. (IUTF8): Likewise. --- ChangeLog | 8 ++++++++ sysdeps/unix/sysv/linux/alpha/bits/termios.h | 9 +++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index a48150a9e8..261a64d1a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2017-03-27 Joseph Myers + + [BZ #21277] + * sysdeps/unix/sysv/linux/alpha/bits/termios.h (IUCLC): Define + unconditionally. + (IMAXBEL): Likewise. + (IUTF8): Likewise. + 2017-03-27 Szabolcs Nagy * sysdeps/aarch64/libm-test-ulps: Update. diff --git a/sysdeps/unix/sysv/linux/alpha/bits/termios.h b/sysdeps/unix/sysv/linux/alpha/bits/termios.h index b560484b3c..19f717bba6 100644 --- a/sysdeps/unix/sysv/linux/alpha/bits/termios.h +++ b/sysdeps/unix/sysv/linux/alpha/bits/termios.h @@ -71,12 +71,9 @@ struct termios #define IXON 0001000 #define IXOFF 0002000 #define IXANY 0004000 -#ifdef __USE_MISC - /* POSIX.1 doesn't want these... */ -# define IUCLC 0010000 -# define IMAXBEL 0020000 -# define IUTF8 0040000 -#endif +#define IUCLC 0010000 +#define IMAXBEL 0020000 +#define IUTF8 0040000 /* c_oflag bits */ #define OPOST 0000001 -- 2.11.4.GIT