aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-11-23 22:43:11 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-11-23 22:43:11 +0000
commit2a01fa43a5364b6f60125f889505d8dd458dcc96 (patch)
treecfedcf4169aeeabee1cdfb1b76f643e51463f8c3
parent970756c6d794dcf5fafd329e51013cc09b7c2ec4 (diff)
downloadupstream-2a01fa43a5364b6f60125f889505d8dd458dcc96.tar.gz
upstream-2a01fa43a5364b6f60125f889505d8dd458dcc96.tar.bz2
upstream-2a01fa43a5364b6f60125f889505d8dd458dcc96.zip
musl: backport an upstream fix for MIPS and termios constants
Fixes weird console behavior with a musl rootfs. Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 34318
-rw-r--r--toolchain/musl/patches-0.9.7/003-fix_termios_constants_on_mips.patch99
1 files changed, 99 insertions, 0 deletions
diff --git a/toolchain/musl/patches-0.9.7/003-fix_termios_constants_on_mips.patch b/toolchain/musl/patches-0.9.7/003-fix_termios_constants_on_mips.patch
new file mode 100644
index 0000000000..73e22a590c
--- /dev/null
+++ b/toolchain/musl/patches-0.9.7/003-fix_termios_constants_on_mips.patch
@@ -0,0 +1,99 @@
+From 144dc4f479d49b8148f8b1b6b506b0f1096f911b Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Fri, 23 Nov 2012 17:23:38 -0500
+Subject: [PATCH] fix termios constants on mips
+
+---
+ arch/mips/bits/termios.h | 31 +++++++++++++++++++++----------
+ 1 file changed, 21 insertions(+), 10 deletions(-)
+
+diff --git a/arch/mips/bits/termios.h b/arch/mips/bits/termios.h
+index 9f6abd8..179af8e 100644
+--- a/arch/mips/bits/termios.h
++++ b/arch/mips/bits/termios.h
+@@ -14,19 +14,20 @@ struct termios
+ #define VQUIT 1
+ #define VERASE 2
+ #define VKILL 3
+-#define VEOF 4
++#define VMIN 4
+ #define VTIME 5
+-#define VMIN 6
++#define VEOL2 6
+ #define VSWTC 7
++#define VSWTCH 7
+ #define VSTART 8
+ #define VSTOP 9
+ #define VSUSP 10
+-#define VEOL 11
+ #define VREPRINT 12
+ #define VDISCARD 13
+ #define VWERASE 14
+ #define VLNEXT 15
+-#define VEOL2 16
++#define VEOF 16
++#define VEOL 17
+
+ #define IGNBRK 0000001
+ #define BRKINT 0000002
+@@ -42,6 +43,7 @@ struct termios
+ #define IXANY 0004000
+ #define IXOFF 0010000
+ #define IMAXBEL 0020000
++#define IUTF8 0040000
+
+ #define OPOST 0000001
+ #define OLCUC 0000002
+@@ -94,7 +96,10 @@ struct termios
+ #define B9600 0000015
+ #define B19200 0000016
+ #define B38400 0000017
++#define EXTA 0000016
++#define EXTB 0000017
+
++#define BOTHER 0010000
+ #define B57600 0010001
+ #define B115200 0010002
+ #define B230400 0010003
+@@ -124,26 +129,32 @@ struct termios
+ #define PARODD 0001000
+ #define HUPCL 0002000
+ #define CLOCAL 0004000
++#define CBAUDEX 0010000
+
++#define CIBAUD 002003600000
++#define CMSPAR 010000000000
+ #define CRTSCTS 020000000000
++#define IBSHIFT 16
+
+ #define ISIG 0000001
+ #define ICANON 0000002
++#define XCASE 0000004
+ #define ECHO 0000010
+ #define ECHOE 0000020
+ #define ECHOK 0000040
+ #define ECHONL 0000100
+ #define NOFLSH 0000200
+-#define TOSTOP 0000400
+-#define IEXTEN 0100000
+-
+-/* Extensions? */
+-#define CBAUDEX 0010000
++#define IEXTEN 0000400
+ #define ECHOCTL 0001000
+ #define ECHOPRT 0002000
+ #define ECHOKE 0004000
+-#define FLUSHO 0010000
++#define FLUSHO 0020000
+ #define PENDIN 0040000
++#define TOSTOP 0100000
++#define ITOSTOP 0100000
++#define EXTPROC 0200000
++
++#define TIOCSER_TEMT 1
+
+ #define TCOOFF 0
+ #define TCOON 1
+--
+1.7.10.4
+