Merge pull request #4511 from Gelbpunkt/map-32bit-arches

linux: gnu/musl: MAP_32BIT is only defined on x86

Author: tgross35

libc-test/build.rs

@@ -4305,6 +4305,11 @@ fn test_linux(target: &str) {
             if old_musl && name == "RLIM_NLIMITS" {
                 return true;
             }
+            // FIXME: Does not exist on non-x86 architectures, slated for removal
+            // in libc in 1.0
+            if ppc64 && name == "MAP_32BIT" {
+                return true;
+            }
         }
         match name {
             // These constants are not available if gnu headers have been included

src/unix/linux_like/linux/gnu/b32/m68k/mod.rs

@@ -191,7 +191,6 @@ pub const O_NDELAY: c_int = 0x800;
 pub const MADV_SOFT_OFFLINE: c_int = 101;
 pub const MAP_LOCKED: c_int = 0x02000;
 pub const MAP_NORESERVE: c_int = 0x04000;
-pub const MAP_32BIT: c_int = 0x0040;
 pub const MAP_ANON: c_int = 0x0020;
 pub const MAP_ANONYMOUS: c_int = 0x0020;
 pub const MAP_DENYWRITE: c_int = 0x0800;

src/unix/linux_like/linux/musl/b64/powerpc64.rs

@@ -72,6 +72,8 @@ s! {
 }
 
 pub const MADV_SOFT_OFFLINE: c_int = 101;
+#[deprecated(since = "0.2.175", note = "Linux does not define MAP_32BIT on any architectures \
+    other than x86 and x86_64, this constant will be removed in the future")]
 pub const MAP_32BIT: c_int = 0x0040;
 pub const O_APPEND: c_int = 1024;
 pub const O_DIRECT: c_int = 0x20000;

src/unix/linux_like/linux/musl/b64/wasm32/mod.rs

@@ -441,7 +441,6 @@ pub const SYS_set_mempolicy_home_node: c_long = 450;
 pub const SYS_fadvise: c_long = SYS_fadvise64;
 
 pub const MADV_SOFT_OFFLINE: c_int = 101;
-pub const MAP_32BIT: c_int = 0x0040;
 pub const O_APPEND: c_int = 1024;
 pub const O_DIRECT: c_int = 0x4000;
 pub const O_DIRECTORY: c_int = 0x10000;