glibc: Closer match upstream's root structure

src/new/glibc/bits/signum_generic.rs

@@ -16,4 +16,4 @@ pub const SIGKILL: c_int = 9;
 pub const SIGPIPE: c_int = 13;
 pub const SIGALRM: c_int = 14;
 
-pub use super::super::sysdeps::unix::linux::bits::signum_arch::*;
+pub use crate::new::glibc::bits::signum_arch::*;

src/new/glibc/io/sys/mod.rs

@@ -0,0 +1,6 @@
+//! Source directory: `io/sys/`
+//!
+//! <https://github.com/sailfishos-mirror/glibc/tree/master/io/sys>
+
+#[cfg(target_os = "linux")]
+pub(crate) mod statvfs;

src/new/glibc/sys/statvfs.rs → src/new/glibc/io/sys/statvfs.rs

@@ -1,6 +1,6 @@
 //! Header: `io/sys/statvfs.h`
 
-pub use super::super::sysdeps::unix::linux::bits::statvfs::*;
+pub use crate::new::glibc::bits::statvfs::*;
 use crate::prelude::*;
 
 extern "C" {

src/new/glibc/mod.rs

@@ -8,10 +8,23 @@
 
 /// Source directory: `bits/`
 ///
+/// This directory contains default
+///
 /// <https://github.com/sailfishos-mirror/glibc/tree/master/bits>
 mod bits {
     #[cfg(target_os = "linux")]
     pub(crate) mod signum_generic;
+    #[cfg(target_os = "linux")]
+    pub(crate) use super::sysdeps::unix::linux::bits::{
+        sigaction,
+        signum_arch,
+        statvfs,
+        types,
+    };
+}
+
+mod io {
+    pub(crate) mod sys;
 }
 
 /// Source directory: `posix/`
@@ -24,14 +37,6 @@ mod posix {
 #[cfg(target_os = "linux")]
 pub(crate) mod signal;
 
-/// Source directory: `io/sys/`
-///
-/// <https://github.com/sailfishos-mirror/glibc/tree/master/io/sys>
-pub(crate) mod sys {
-    #[cfg(target_os = "linux")]
-    pub(crate) mod statvfs;
-}
-
 /// Source directory: `sysdeps/`
 ///
 /// <https://github.com/sailfishos-mirror/glibc/tree/master/sysdeps>
@@ -45,6 +50,8 @@ mod sysdeps {
     // `path = "..."` wherever the generic implementation lives.
 }
 
+pub(crate) mod sys;
+
 pub(crate) use posix::*;
 // FIXME(pthread): eventually all platforms should use this module
 #[cfg(target_os = "linux")]

src/new/glibc/signal.rs

@@ -1,8 +1,8 @@
 //! Header: `signal/signal.h`
 
-pub use super::bits::signum_generic::*;
-pub use super::sysdeps::unix::linux::bits::sigaction::*;
-pub use super::sysdeps::unix::linux::bits::types::siginfo_t::*;
+pub use crate::new::glibc::bits::sigaction::*;
+pub use crate::new::glibc::bits::signum_generic::*;
+pub use crate::new::glibc::bits::types::siginfo_t::*;
 use crate::prelude::*;
 
 extern "C" {

src/new/glibc/sys.rs

@@ -0,0 +1,8 @@
+//! Source directory: `sys/`
+//!
+//! <https://github.com/sailfishos-mirror/glibc/tree/master/sys>
+
+#[cfg(target_os = "linux")]
+pub(crate) mod statvfs {
+    pub use super::super::io::sys::statvfs::*;
+}