From: Szabolcs Nagy <nsz@port70.net>
To: musl@lists.openwall.com
Subject: [PATCH 00/16] sys/ioctl.h and termios.h cleanups
Date: Sun, 10 Apr 2016 14:09:40 +0200 [thread overview]
Message-ID: <cover.1460250248.git.nsz@port70.net> (raw)
the contents of sys/ioctl.h is linux specific and not defined by any
standard, the defacto standard is whatever glibc sys/ioctl.h does.
glibc includes asm/ioctl.h and asm/ioctls.h linux uapi headers and
contains a copy of most linux/sockios.h, linux/tty.h and asm/termios.h
definitions (does not seem to be updated regularly so some recent
linux macros are missing) and also includes sys/ttydefaults.h.
in musl the sys/ttydefaults.h include, struct termio and struct termios2
related definitions are omitted, otherwise glibc is followed.
termios.h is defined by posix, but there are various extensions.
glibc does not include linux uapi headers, but contains a copy of
most asm/termbits.h definitions and includes sys/ttydefaults.h
in non-standard mode.
musl termios.h follows glibc except the sys/ttydefaults.h include,
the termios struct definition and _HAVE_STRUCT_TERMIOS_C_{I,O}SPEED
macros.
these patches are not tested, but compared against preprocessed
glibc headers on all targets.
Szabolcs Nagy (16):
use the generic ioctl.h for x86_64, x32 and aarch64
remove linux asm/sockios.h macros from ioctl.h
remove ioctl macros that were removed from linux uapi
add missing SIOCSIFNAME from linux/sockios.h to ioctl.h
add missing TIOC* macros to ioctl.h
remove mips and powerpc ioctls that are missing from linux uapi
fix mips and mips64 TIOCM_* macros in ioctl.h
fix TIOCMSET in mips ioctl.h
remove termios2 related ioctls from sh ioctl.h
fix FIOQSIZE in arm ioctl.h
fix generic termios.h to be more consistent with glibc
fix powerpc termios.h to be more consistent with glibc
fix mips termios.h to be more consistent with glibc
fix TCS* definitions in mips termios.h
fix CBAUDEX in powerpc termios.h
fix struct termios in mips termios.h
arch/aarch64/bits/ioctl.h | 213 ------------------------------------------
arch/arm/bits/ioctl_fix.h | 2 +
arch/generic/bits/ioctl.h | 22 ++---
arch/generic/bits/ioctl_fix.h | 0
arch/generic/bits/termios.h | 23 +++--
arch/mips/bits/ioctl.h | 55 +++++------
arch/mips/bits/termios.h | 40 ++++----
arch/mips64/bits/ioctl.h | 55 +++++------
arch/mips64/bits/termios.h | 35 ++++---
arch/powerpc/bits/ioctl.h | 26 +-----
arch/powerpc/bits/termios.h | 26 +++---
arch/sh/bits/ioctl.h | 17 +---
arch/x32/bits/ioctl.h | 197 --------------------------------------
arch/x86_64/bits/ioctl.h | 197 --------------------------------------
14 files changed, 130 insertions(+), 778 deletions(-)
delete mode 100644 arch/aarch64/bits/ioctl.h
create mode 100644 arch/arm/bits/ioctl_fix.h
create mode 100644 arch/generic/bits/ioctl_fix.h
delete mode 100644 arch/x32/bits/ioctl.h
delete mode 100644 arch/x86_64/bits/ioctl.h
--
2.7.2
next reply other threads:[~2016-04-10 12:09 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-10 12:09 Szabolcs Nagy [this message]
2016-04-10 12:10 ` [PATCH 01/16] use the generic ioctl.h for x86_64, x32 and aarch64 Szabolcs Nagy
2016-04-10 12:10 ` [PATCH 02/16] remove linux asm/sockios.h macros from ioctl.h Szabolcs Nagy
2016-04-10 12:11 ` [PATCH 03/16] remove ioctl macros that were removed from linux uapi Szabolcs Nagy
2016-04-10 12:11 ` [PATCH 04/16] add missing SIOCSIFNAME from linux/sockios.h to ioctl.h Szabolcs Nagy
2016-04-10 12:11 ` [PATCH 05/16] add missing TIOC* macros " Szabolcs Nagy
2016-04-10 12:12 ` [PATCH 06/16] remove mips and powerpc ioctls that are missing from linux uapi Szabolcs Nagy
2016-04-10 12:12 ` [PATCH 07/16] fix mips and mips64 TIOCM_* macros in ioctl.h Szabolcs Nagy
2016-04-10 12:12 ` [PATCH 08/16] fix TIOCMSET in mips ioctl.h Szabolcs Nagy
2016-04-10 12:13 ` [PATCH 09/16] remove termios2 related ioctls from sh ioctl.h Szabolcs Nagy
2016-04-10 12:13 ` [PATCH 10/16] fix FIOQSIZE in arm ioctl.h Szabolcs Nagy
2016-04-10 12:14 ` [PATCH 11/16] fix generic termios.h to be more consistent with glibc Szabolcs Nagy
2016-04-10 12:14 ` [PATCH 12/16] fix powerpc " Szabolcs Nagy
2016-04-10 12:15 ` [PATCH 13/16] fix mips " Szabolcs Nagy
2016-04-10 12:15 ` [PATCH 14/16] fix TCS* definitions in mips termios.h Szabolcs Nagy
2016-04-10 12:16 ` [PATCH 15/16] fix CBAUDEX in powerpc termios.h Szabolcs Nagy
2016-04-10 12:16 ` [PATCH 16/16] fix struct termios in mips termios.h Szabolcs Nagy
2016-07-01 19:00 ` Rich Felker
2016-07-03 15:01 [PATCH 00/16] sys/ioctl.h and termios.h cleanups Szabolcs Nagy
2016-07-03 19:10 ` Rich Felker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1460250248.git.nsz@port70.net \
--to=nsz@port70.net \
--cc=musl@lists.openwall.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/musl/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).