0.3.0: converge relibc to upstream 0.6.0 + Red Bear patches

tests/stdlib/alloc.c

@@ -1,4 +1,4 @@
-#include <malloc.h>
+#include <malloc.h> /* for pvalloc() */
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -89,7 +89,7 @@ int main(void) {
     size_t nonpow2_mul_voidptr_size = 3*sizeof(void *);
     size_t pow2_mul_voidptr_size = 4*sizeof(void *);
     
-    int i;
+    size_t i;
     
     errno = 0;
     char * ptr_zerosize_malloc = (char *)malloc(zero_size);
@@ -165,7 +165,26 @@ int main(void) {
     printf("realloc (SIZE_MAX): ");
     test_cannot_alloc(ptr_realloc_maxsize, realloc_maxsize_errno);
     free(ptr_realloc_maxsize);
+
+    errno = 0;
+    char * ptr_reallocarray_maxsize = (char *)malloc(sample_alloc_size);
+    ptr_reallocarray_maxsize = (char *)reallocarray(ptr_reallocarray_maxsize, 2, sample_alloc_size);
+    int reallocarray_errno = errno;
+    printf("reallocarray: ");
+    test_non_null(ptr_reallocarray_maxsize, reallocarray_errno);
+    for(i = 0; i < sample_realloc_size; i++) {
+        ptr_realloc[i] = (char)i;
+    }
+    errno = 0;
+    ptr_reallocarray_maxsize = (char *)reallocarray(ptr_reallocarray_maxsize, 2, max_size);
+    reallocarray_errno = errno;
+    printf("reallocarray (SIZE_MAX): ");
+    test_cannot_alloc(ptr_reallocarray_maxsize, reallocarray_errno);
+    free(ptr_reallocarray_maxsize);
     
+    // Warning for deprecated functions is expected so silence -Werror
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     errno = 0;
     char * ptr_memalign_size0 = (char *)memalign(aligned_alloc_alignment, zero_size);
     int memalign_size0_errno = errno;
@@ -203,6 +222,8 @@ int main(void) {
     printf("memalign (alignment 3): ");
     test_invalid_aligned(ptr_memalign_align3, memalign_align3_errno);
     free(ptr_memalign_align3);
+
+    #pragma GCC diagnostic pop
     
     errno = 0;
     char * ptr_aligned_alloc_goodsize = (char *)aligned_alloc(aligned_alloc_alignment, aligned_alloc_goodsize);
@@ -218,6 +239,10 @@ int main(void) {
     test_invalid_aligned(ptr_aligned_alloc_badsize, aligned_alloc_badsize_errno);
     free(ptr_aligned_alloc_badsize);
     
+    // Warning for deprecated functions is expected so silence -Werror
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
     errno = 0;
     char * ptr_valloc_size0 = (char *)valloc(zero_size);
     int valloc_size0_errno = errno;
@@ -273,4 +298,44 @@ int main(void) {
     printf("posix_memalign (SIZE_MAX): ");
     test_cannot_alloc(ptr_posix_memalign_maxsize, posix_memalign_maxsize_return);
     free(ptr_posix_memalign_maxsize);
+
+    errno = 0;
+    char * ptr_pvalloc_size0 = (char *)pvalloc(zero_size);
+    int pvalloc_size0_errno = errno;
+    printf("pvalloc (size 0): ");
+    test_size_zero(ptr_pvalloc_size0, page_size, pvalloc_size0_errno);
+    free(ptr_pvalloc_size0);
+
+    errno = 0;
+    char * ptr_pvalloc = (char *)pvalloc(sample_alloc_size);
+    int pvalloc_errno = errno;
+    printf("pvalloc: ");
+    test_valid_aligned(ptr_pvalloc, page_size, pvalloc_errno);
+    /* Check that the alloc size is rounded up to nearest page-size
+     * multiple */
+    for(i = 0; i < page_size; i++) {
+        ptr_pvalloc[i] = (char)i;
+    }
+    free(ptr_pvalloc);
+
+    errno = 0;
+    char * ptr_pvalloc_multipage = (char *)pvalloc(page_size + 1);
+    int pvalloc_multipage_errno = errno;
+    printf("pvalloc (2 pages): ");
+    test_valid_aligned(ptr_pvalloc_multipage, page_size, pvalloc_multipage_errno);
+    /* Check that the alloc size is rounded up to nearest page-size
+     * multiple */
+    for(i = 0; i < 2*page_size; i++) {
+        ptr_pvalloc_multipage[i] = (char)i;
+    }
+    free(ptr_pvalloc_multipage);
+
+    errno = 0;
+    char * ptr_pvalloc_maxsize = (char *)pvalloc(max_size);
+    int pvalloc_maxsize_errno = errno;
+    printf("pvalloc (SIZE_MAX): ");
+    test_cannot_alloc(ptr_pvalloc_maxsize, pvalloc_maxsize_errno);
+    free(ptr_pvalloc_maxsize);
+
+    #pragma GCC diagnostic pop
 }