Auto merge of #2530 - de-vri-es:tty-cleanup, r=JohnTitor

Move more ioctl constants and flags to linux::arch::* modules.

This PR moves a few things to `linux::arch::*` modules and out of libc specific modules. Specifically, it:
* Moves the `TIOCM*` ioclt constants and associated flags.
* Moves the `BOTHER` flag.
* Adds the `IBSHIFT` flag.

Without this PR, there are some arch+libc combinations that are missing some of these constants. Since these are all ioctl numbers or arguments to ioctls, they are not specific to any libc flavour. `BOTHER` and `IBSHIFT` don't even appear in glibc or musl headers.

Author: bors

libc-test/build.rs

@@ -1663,6 +1663,7 @@ fn test_android(target: &str) {
 
             // FIXME: conflicts with standard C headers and is tested in
             // `linux_termios.rs` below:
+            "IBSHIFT" => true,
             "TCGETS2" | "TCSETS2" | "TCSETSW2" | "TCSETSF2" => true,
 
             _ => false,
@@ -2915,6 +2916,7 @@ fn test_linux(target: &str) {
             // FIXME: conflicts with glibc headers and is tested in
             // `linux_termios.rs` below:
             | "BOTHER"
+            | "IBSHIFT"
             | "TCGETS2"
             | "TCSETS2"
             | "TCSETSW2"
@@ -3274,7 +3276,7 @@ fn test_linux_like_apis(target: &str) {
             .skip_static(|_| true)
             .skip_fn(|_| true)
             .skip_const(|c| match c {
-                "BOTHER" => false,
+                "BOTHER" | "IBSHIFT" => false,
                 "TCGETS2" | "TCSETS2" | "TCSETSW2" | "TCSETSF2" => false,
                 _ => true,
             })

libc-test/semver/TODO-linux.txt

@@ -1,6 +1,5 @@
 # The following symbols are not not available in some combinations of
 # musl/gnu/android and/or architecture.
-BOTHER
 KEYCTL_CAPABILITIES
 KEYCTL_CAPS0_BIG_KEY
 KEYCTL_CAPS0_CAPABILITIES

libc-test/semver/android.txt

@@ -665,6 +665,7 @@ GRPQUOTA
 HPFS_SUPER_MAGIC
 HUGETLBFS_MAGIC
 HUPCL
+IBSHIFT
 ICANON
 ICRNL
 IEXTEN

libc-test/semver/linux-gnu-x86_64.txt

@@ -1,4 +1,3 @@
-BOTHER
 KEYCTL_CAPABILITIES
 KEYCTL_CAPS0_BIG_KEY
 KEYCTL_CAPS0_CAPABILITIES

libc-test/semver/linux-i686.txt

@@ -2,7 +2,6 @@ B2500000
 B3000000
 B3500000
 B4000000
-BOTHER
 CIBAUD
 CS
 DS

libc-test/semver/linux-powerpc.txt

@@ -2,7 +2,6 @@ B2500000
 B3000000
 B3500000
 B4000000
-BOTHER
 KEYCTL_CAPABILITIES
 KEYCTL_CAPS0_BIG_KEY
 KEYCTL_CAPS0_CAPABILITIES

libc-test/semver/linux-powerpc64.txt

@@ -2,7 +2,6 @@ B2500000
 B3000000
 B3500000
 B4000000
-BOTHER
 KEYCTL_CAPABILITIES
 KEYCTL_CAPS0_BIG_KEY
 KEYCTL_CAPS0_CAPABILITIES

libc-test/semver/linux-powerpc64le.txt

@@ -2,7 +2,6 @@ B2500000
 B3000000
 B3500000
 B4000000
-BOTHER
 KEYCTL_CAPABILITIES
 KEYCTL_CAPS0_BIG_KEY
 KEYCTL_CAPS0_CAPABILITIES

libc-test/semver/linux-s390x.txt

@@ -2,7 +2,6 @@ B2500000
 B3000000
 B3500000
 B4000000
-BOTHER
 CIBAUD
 KEYCTL_CAPABILITIES
 KEYCTL_CAPS0_BIG_KEY

libc-test/semver/linux-sparc64.txt

@@ -2,7 +2,6 @@ B153600
 B307200
 B614400
 B76800
-BOTHER
 CIBAUD
 KEYCTL_CAPABILITIES
 KEYCTL_CAPS0_BIG_KEY