This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.20-466-g253a59c
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 2 Jan 2015 18:32:12 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.20-466-g253a59c
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 253a59ccb571dc67b6dc303192d8d99378a35c75 (commit)
from 27dae0113e527aa2a94350d1f624c6e7c81139ce (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=253a59ccb571dc67b6dc303192d8d99378a35c75
commit 253a59ccb571dc67b6dc303192d8d99378a35c75
Author: Joseph Myers <joseph@codesourcery.com>
Date: Fri Jan 2 18:31:41 2015 +0000
Fix MIPS TIOCSER_TEMT namespace (bug 17782).
sysdeps/unix/sysv/linux/mips/bits/termios.h defines TIOCSER_TEMT
unconditionally, but it's in the user's namespace. This patch
conditions it on __USE_MISC, as on powerpc. I've filed bug 17783 for
the residual inconsistency in conditions on this macro (sparc defines
it for __USE_GNU only).
[BZ #17782]
* sysdeps/unix/sysv/linux/mips/bits/termios.h (TIOCSER_TEMT):
Condition macro definition on [__USE_MISC].
diff --git a/ChangeLog b/ChangeLog
index 6ba3840..eb1909d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2015-01-02 Joseph Myers <joseph@codesourcery.com>
+ [BZ #17782]
+ * sysdeps/unix/sysv/linux/mips/bits/termios.h (TIOCSER_TEMT):
+ Condition macro definition on [__USE_MISC].
+
[BZ #17781]
* sysdeps/unix/sysv/linux/mips/bits/sigaction.h
(struct sigaction): Change type of sa_flags field to int.
diff --git a/NEWS b/NEWS
index 258318f..4d90c85 100644
--- a/NEWS
+++ b/NEWS
@@ -16,7 +16,7 @@ Version 2.21
17584, 17585, 17589, 17594, 17601, 17608, 17616, 17625, 17630, 17633,
17634, 17647, 17653, 17657, 17664, 17665, 17668, 17682, 17717, 17719,
17722, 17723, 17724, 17725, 17732, 17733, 17744, 17745, 17746, 17747,
- 17775, 17780, 17781
+ 17775, 17780, 17781, 17782
* i386 memcpy functions optimized with SSE2 unaligned load/store.
diff --git a/sysdeps/unix/sysv/linux/mips/bits/termios.h b/sysdeps/unix/sysv/linux/mips/bits/termios.h
index 8f640e1..666d6a3 100644
--- a/sysdeps/unix/sysv/linux/mips/bits/termios.h
+++ b/sysdeps/unix/sysv/linux/mips/bits/termios.h
@@ -197,8 +197,10 @@ 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 */
+# define TIOCSER_TEMT 0x01 /* Transmitter physically empty */
+#endif
/* tcflow() and TCXONC use these */
#define TCOOFF 0 /* Suspend output. */
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 4 ++++
NEWS | 2 +-
sysdeps/unix/sysv/linux/mips/bits/termios.h | 4 +++-
3 files changed, 8 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources