This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]
GNU C Library master sources branch master updated. glibc-2.23-163-gfb3227b

From: jsm28 at sourceware dot org
To: glibc-cvs at sourceware dot org
Date: 8 Apr 2016 18:16:29 -0000
Subject: GNU C Library master sources branch master updated. glibc-2.23-163-gfb3227b
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  fb3227b95caae0d99d0c185099486240a75e2076 (commit)
      from  25dba0ad054723196fb633ba5d8a463ef5cb775c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=fb3227b95caae0d99d0c185099486240a75e2076

commit fb3227b95caae0d99d0c185099486240a75e2076
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Fri Apr 8 18:16:09 2016 +0000

    Fix termios.h XCASE namespace (bug 19925).
    
    bits/termios.h (various versions under sysdeps/unix/sysv/linux)
    defines XCASE if defined __USE_MISC || defined __USE_XOPEN.  This
    macro was removed in the 2001 edition of POSIX, and is not otherwise
    reserved, so should not be defined for 2001 and later versions of
    POSIX.  This patch fixes the conditions accordingly (leaving the macro
    defined for __USE_MISC, so still in the default namespace).
    
    Tested for x86_64 and x86 (testsuite, and that installed shared
    libraries are unchanged by the patch).
    
    	[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.

diff --git a/ChangeLog b/ChangeLog
index 9d48c8b..61562e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+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:
diff --git a/conform/Makefile b/conform/Makefile
index fddeaa1..ed94ffc 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -218,7 +218,6 @@ test-xfail-XOPEN2K/signal.h/conform = yes
 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
@@ -230,7 +229,6 @@ test-xfail-XOPEN2K8/limits.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: \
diff --git a/sysdeps/unix/sysv/linux/alpha/bits/termios.h b/sysdeps/unix/sysv/linux/alpha/bits/termios.h
index d9b5be9..ddb0e42 100644
--- a/sysdeps/unix/sysv/linux/alpha/bits/termios.h
+++ b/sysdeps/unix/sysv/linux/alpha/bits/termios.h
@@ -185,7 +185,7 @@ struct termios
 /* 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
diff --git a/sysdeps/unix/sysv/linux/bits/termios.h b/sysdeps/unix/sysv/linux/bits/termios.h
index bbf093d..e09f826 100644
--- a/sysdeps/unix/sysv/linux/bits/termios.h
+++ b/sysdeps/unix/sysv/linux/bits/termios.h
@@ -177,7 +177,7 @@ struct termios
 /* 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
diff --git a/sysdeps/unix/sysv/linux/mips/bits/termios.h b/sysdeps/unix/sysv/linux/mips/bits/termios.h
index 7013cdd..8ca3f98 100644
--- a/sysdeps/unix/sysv/linux/mips/bits/termios.h
+++ b/sysdeps/unix/sysv/linux/mips/bits/termios.h
@@ -175,7 +175,7 @@ struct termios
 /* 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.  */
diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/termios.h b/sysdeps/unix/sysv/linux/powerpc/bits/termios.h
index e13ea3f..ba8a388 100644
--- a/sysdeps/unix/sysv/linux/powerpc/bits/termios.h
+++ b/sysdeps/unix/sysv/linux/powerpc/bits/termios.h
@@ -187,7 +187,7 @@ struct termios {
 /* 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
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/termios.h b/sysdeps/unix/sysv/linux/sparc/bits/termios.h
index 65673aa..3d04f41 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/termios.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/termios.h
@@ -181,7 +181,7 @@ struct termios
 /* 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

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                      |   14 ++++++++++++++
 conform/Makefile                               |    2 --
 sysdeps/unix/sysv/linux/alpha/bits/termios.h   |    2 +-
 sysdeps/unix/sysv/linux/bits/termios.h         |    2 +-
 sysdeps/unix/sysv/linux/mips/bits/termios.h    |    2 +-
 sysdeps/unix/sysv/linux/powerpc/bits/termios.h |    2 +-
 sysdeps/unix/sysv/linux/sparc/bits/termios.h   |    2 +-
 7 files changed, 19 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]