+2016-04-08 Joseph Myers <joseph@codesourcery.com>
+
+ [BZ #19925]
+ * sysdeps/unix/sysv/linux/alpha/bits/termios.h (XCASE): Do not
+ define if [!__USE_MISC && __USE_XOPEN2K].
+ * sysdeps/unix/sysv/linux/bits/termios.h (XCASE): Likewise.
+ * sysdeps/unix/sysv/linux/mips/bits/termios.h (XCASE): Likewise.
+ * sysdeps/unix/sysv/linux/powerpc/bits/termios.h (XCASE):
+ Likewise.
+ * sysdeps/unix/sysv/linux/sparc/bits/termios.h (XCASE): Likewise.
+ * conform/Makefile (test-xfail-XOPEN2K/termios.h/conform): Remove
+ variable.
+ (test-xfail-XOPEN2K8/termios.h/conform): Likewise.
+
2016-04-07 Paul E. Murphy <murphyp@linux.vnet.ibm.com>
* sysdeps/powerpc/powerpc64/multiarch/Makefile:
test-xfail-XOPEN2K/stdarg.h/conform = yes
test-xfail-XOPEN2K/stdio.h/conform = yes
test-xfail-XOPEN2K/sys/wait.h/conform = yes
-test-xfail-XOPEN2K/termios.h/conform = yes
test-xfail-XOPEN2K/ucontext.h/conform = yes
test-xfail-POSIX2008/arpa/inet.h/conform = yes
test-xfail-POSIX2008/netdb.h/conform = yes
test-xfail-XOPEN2K8/signal.h/conform = yes
test-xfail-XOPEN2K8/stdio.h/conform = yes
test-xfail-XOPEN2K8/sys/wait.h/conform = yes
-test-xfail-XOPEN2K8/termios.h/conform = yes
conformtest-cc-flags = -I../include $(+sysdep-includes) $(sysincludes) -I..
$(conformtest-header-tests): $(objpfx)%/conform.out: \
/* c_lflag bits */
#define ISIG 0x00000080
#define ICANON 0x00000100
-#if defined __USE_MISC || defined __USE_XOPEN
+#if defined __USE_MISC || (defined __USE_XOPEN && !defined __USE_XOPEN2K)
# define XCASE 0x00004000
#endif
#define ECHO 0x00000008
/* c_lflag bits */
#define ISIG 0000001
#define ICANON 0000002
-#if defined __USE_MISC || defined __USE_XOPEN
+#if defined __USE_MISC || (defined __USE_XOPEN && !defined __USE_XOPEN2K)
# define XCASE 0000004
#endif
#define ECHO 0000010
/* c_lflag bits */
#define ISIG 0000001 /* Enable signals. */
#define ICANON 0000002 /* Do erase and kill processing. */
-#if defined __USE_MISC || defined __USE_XOPEN
+#if defined __USE_MISC || (defined __USE_XOPEN && !defined __USE_XOPEN2K)
# define XCASE 0000004
#endif
#define ECHO 0000010 /* Enable echo. */
/* c_lflag bits */
#define ISIG 0x00000080
#define ICANON 0x00000100
-#if defined __USE_MISC || defined __USE_XOPEN
+#if defined __USE_MISC || (defined __USE_XOPEN && !defined __USE_XOPEN2K)
# define XCASE 0x00004000
#endif
#define ECHO 0x00000008
/* c_lflag bits */
#define ISIG 0x00000001
#define ICANON 0x00000002
-#if defined __USE_MISC || defined __USE_XOPEN
+#if defined __USE_MISC || (defined __USE_XOPEN && !defined __USE_XOPEN2K)
# define XCASE 0x00000004
#endif
#define ECHO 0x00000008