From c54c7f741b34bfb2cc99fea3b5058f45d1da56e6 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 13 Sep 2015 17:38:49 +0000 Subject: [PATCH] musl: fix termios struct c_ispeed/c_ospeed field names Signed-off-by: Felix Fietkau SVN-Revision: 46896 --- ...fix-termios-custom-speed-field-names.patch | 141 ++++++++++++++++++ 1 file changed, 141 insertions(+) create mode 100644 toolchain/musl/patches/020-fix-termios-custom-speed-field-names.patch diff --git a/toolchain/musl/patches/020-fix-termios-custom-speed-field-names.patch b/toolchain/musl/patches/020-fix-termios-custom-speed-field-names.patch new file mode 100644 index 0000000000..72e0f6277a --- /dev/null +++ b/toolchain/musl/patches/020-fix-termios-custom-speed-field-names.patch @@ -0,0 +1,141 @@ +From: Felix Fietkau +Date: Sun, 13 Sep 2015 18:46:17 +0200 +Subject: [PATCH] fix termios custom speed field names + +Using c_ispeed/c_ospeed is necessary for setting custom baud rates not +covered by the existing defines (via BOTHER). +Rename those fields to match glibc/uClibc. + +Signed-off-by: Felix Fietkau +--- + +--- a/arch/aarch64/bits/termios.h ++++ b/arch/aarch64/bits/termios.h +@@ -6,8 +6,8 @@ struct termios + tcflag_t c_lflag; + cc_t c_line; + cc_t c_cc[NCCS]; +- speed_t __c_ispeed; +- speed_t __c_ospeed; ++ speed_t c_ispeed; ++ speed_t c_ospeed; + }; + + #define VINTR 0 +--- a/arch/arm/bits/termios.h ++++ b/arch/arm/bits/termios.h +@@ -6,8 +6,8 @@ struct termios + tcflag_t c_lflag; + cc_t c_line; + cc_t c_cc[NCCS]; +- speed_t __c_ispeed; +- speed_t __c_ospeed; ++ speed_t c_ispeed; ++ speed_t c_ospeed; + }; + + #define VINTR 0 +--- a/arch/i386/bits/termios.h ++++ b/arch/i386/bits/termios.h +@@ -6,8 +6,8 @@ struct termios + tcflag_t c_lflag; + cc_t c_line; + cc_t c_cc[NCCS]; +- speed_t __c_ispeed; +- speed_t __c_ospeed; ++ speed_t c_ispeed; ++ speed_t c_ospeed; + }; + + #define VINTR 0 +--- a/arch/microblaze/bits/termios.h ++++ b/arch/microblaze/bits/termios.h +@@ -6,8 +6,8 @@ struct termios + tcflag_t c_lflag; + cc_t c_line; + cc_t c_cc[NCCS]; +- speed_t __c_ispeed; +- speed_t __c_ospeed; ++ speed_t c_ispeed; ++ speed_t c_ospeed; + }; + + #define VINTR 0 +--- a/arch/mips/bits/termios.h ++++ b/arch/mips/bits/termios.h +@@ -6,8 +6,8 @@ struct termios + tcflag_t c_lflag; + cc_t c_line; + cc_t c_cc[NCCS]; +- speed_t __c_ispeed; +- speed_t __c_ospeed; ++ speed_t c_ispeed; ++ speed_t c_ospeed; + }; + + #define VINTR 0 +--- a/arch/or1k/bits/termios.h ++++ b/arch/or1k/bits/termios.h +@@ -5,8 +5,8 @@ struct termios { + tcflag_t c_lflag; + cc_t c_line; + cc_t c_cc[NCCS]; +- speed_t __c_ispeed; +- speed_t __c_ospeed; ++ speed_t c_ispeed; ++ speed_t c_ospeed; + }; + + #define VINTR 0 +--- a/arch/powerpc/bits/termios.h ++++ b/arch/powerpc/bits/termios.h +@@ -8,8 +8,8 @@ struct termios + tcflag_t c_lflag; + cc_t c_cc[NCCS]; + cc_t c_line; +- speed_t __c_ispeed; +- speed_t __c_ospeed; ++ speed_t c_ispeed; ++ speed_t c_ospeed; + }; + + #define VINTR 0 +--- a/arch/sh/bits/termios.h ++++ b/arch/sh/bits/termios.h +@@ -6,8 +6,8 @@ struct termios + tcflag_t c_lflag; + cc_t c_line; + cc_t c_cc[NCCS]; +- speed_t __c_ispeed; +- speed_t __c_ospeed; ++ speed_t c_ispeed; ++ speed_t c_ospeed; + }; + + #define VINTR 0 +--- a/arch/x32/bits/termios.h ++++ b/arch/x32/bits/termios.h +@@ -6,8 +6,8 @@ struct termios + tcflag_t c_lflag; + cc_t c_line; + cc_t c_cc[NCCS]; +- speed_t __c_ispeed; +- speed_t __c_ospeed; ++ speed_t c_ispeed; ++ speed_t c_ospeed; + }; + + #define VINTR 0 +--- a/arch/x86_64/bits/termios.h ++++ b/arch/x86_64/bits/termios.h +@@ -6,8 +6,8 @@ struct termios + tcflag_t c_lflag; + cc_t c_line; + cc_t c_cc[NCCS]; +- speed_t __c_ispeed; +- speed_t __c_ospeed; ++ speed_t c_ispeed; ++ speed_t c_ospeed; + }; + + #define VINTR 0 -- 2.30.2