Auto merge of #2291 - devnexen:reallocarray_linux, r=JohnTitor

adding reallocarray for linux and android

Author: bors

libc-test/build.rs

@@ -1630,6 +1630,7 @@ fn test_android(target: &str) {
             // We skip the test here since here _GNU_SOURCE is defined, and
             // test the XSI version below.
             "strerror_r" => true,
+            "reallocarray" => true,
 
             _ => false,
         }
@@ -2875,6 +2876,8 @@ fn test_linux(target: &str) {
             // Needs glibc 2.33 or later.
             "mallinfo2" => true,
 
+            "reallocarray" if musl => true,
+
             _ => false,
         }
     });

libc-test/semver/android.txt

@@ -3044,6 +3044,7 @@ readlink
 readlinkat
 readv
 realloc
+reallocarray
 realpath
 recv
 recvfrom

libc-test/semver/linux-gnu.txt

@@ -566,6 +566,7 @@ pthread_setname_np
 pututxline
 pwritev2
 qsort_r
+reallocarray
 semid_ds
 seminfo
 setutxent

libc-test/semver/linux-musl.txt

@@ -1,2 +1,3 @@
 # TODO: musl.
 explicit_bzero
+reallocarray

src/unix/linux_like/android/mod.rs

@@ -2879,6 +2879,8 @@ extern "C" {
     pub fn arc4random() -> u32;
     pub fn arc4random_uniform(__upper_bound: u32) -> u32;
     pub fn arc4random_buf(__buf: *mut ::c_void, __n: ::size_t);
+
+    pub fn reallocarray(ptr: *mut ::c_void, nmemb: ::size_t, size: ::size_t) -> *mut ::c_void;
 }
 
 cfg_if! {

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

@@ -1276,6 +1276,8 @@ extern "C" {
 
     // Added in `glibc` 2.25
     pub fn explicit_bzero(s: *mut ::c_void, len: ::size_t);
+    // Added in `glibc` 2.29
+    pub fn reallocarray(ptr: *mut ::c_void, nmemb: ::size_t, size: ::size_t) -> *mut ::c_void;
 }
 
 extern "C" {

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

@@ -700,6 +700,8 @@ extern "C" {
 
     // Added in `musl` 1.1.20
     pub fn explicit_bzero(s: *mut ::c_void, len: ::size_t);
+    // Added in `musl` 1.2.2
+    pub fn reallocarray(ptr: *mut ::c_void, nmemb: ::size_t, size: ::size_t) -> *mut ::c_void;
 }
 
 cfg_if! {