--- qemu/linux-user/ppc/termbits.h	2018/04/24 16:37:52	1.1.1.1
+++ qemu/linux-user/ppc/termbits.h	2018/04/24 16:52:00	1.1.1.3
@@ -7,8 +7,8 @@ struct target_termios {
     unsigned int c_oflag;               /* output mode flags */
     unsigned int c_cflag;               /* control mode flags */
     unsigned int c_lflag;               /* local mode flags */
-    unsigned char c_line;                    /* line discipline */
     unsigned char c_cc[TARGET_NCCS];                /* control characters */
+    unsigned char c_line;                    /* line discipline */
     unsigned int c_ispeed;		/* input speed */
     unsigned int c_ospeed;		/* output speed */
 };
@@ -47,6 +47,7 @@ struct target_termios {
 #define TARGET_IXANY	0004000
 #define TARGET_IUCLC	0010000
 #define TARGET_IMAXBEL	0020000
+#define	TARGET_IUTF8	0040000
 
 /* c_oflag bits */
 #define TARGET_OPOST	0000001
@@ -69,6 +70,7 @@ struct target_termios {
 #define   TARGET_TAB1	00002000
 #define   TARGET_TAB2	00004000
 #define   TARGET_TAB3	00006000
+#define   TARGET_XTABS	00006000	/* required by POSIX to == TAB3 */
 #define TARGET_CRDLY	00030000
 #define   TARGET_CR0	00000000
 #define   TARGET_CR1	00010000
@@ -83,7 +85,6 @@ struct target_termios {
 #define TARGET_VTDLY	00200000
 #define   TARGET_VT0	00000000
 #define   TARGET_VT1	00200000
-#define TARGET_XTABS	01000000 /* Hmm.. Linux/i386 considers this part of TABDLY.. */
 
 /* c_cflag bit meaning */
 #define TARGET_CBAUD	0000377
@@ -135,7 +136,8 @@ struct target_termios {
 #define TARGET_HUPCL	00040000
 
 #define TARGET_CLOCAL	00100000
-#define TARGET_CRTSCTS	  020000000000		/* flow control */
+#define TARGET_CMSPAR	010000000000		/* mark or space (stick) parity */
+#define TARGET_CRTSCTS	020000000000		/* flow control */
 
 /* c_lflag bits */
 #define TARGET_ISIG	0x00000080
@@ -232,4 +234,3 @@ struct target_termios {
 
 #define TARGET_TIOCMIWAIT	0x545C	/* wait for a change on serial input line(s) */
 #define TARGET_TIOCGICOUNT	0x545D	/* read serial port inline interrupt counts */
-