From: Petar Jovanovic <mips32r2@gmail.com>
Date: Fri, 26 Feb 2016 16:05:29 +0000 (+0000)
Subject: Allow 8k and 32k page sizes
X-Git-Tag: svn/VALGRIND_3_12_0~208
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7e2cc219fe3feeb1d31645fe323431a75d2cf5c;p=thirdparty%2Fvalgrind.git

Allow 8k and 32k page sizes

Allow 8k and 32k page sizes in memalign and other memory related tests.
This fixes crashes in the tests on systems with 8k or 32k pagesize.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15815
---

diff --git a/memcheck/tests/memalign_test.c b/memcheck/tests/memalign_test.c
index 38e165d425..e649462804 100644
--- a/memcheck/tests/memalign_test.c
+++ b/memcheck/tests/memalign_test.c
@@ -10,7 +10,8 @@ int main ( void )
   int i;
   unsigned long pszB = sysconf(_SC_PAGE_SIZE);
   assert(sizeof(long) == sizeof(void*));
-  assert(pszB == 4096 || pszB == 16384 || pszB == 65536);
+  assert(pszB == 4096 || pszB == 8192 || pszB == 16384 || pszB == 32768
+         || pszB == 65536);
 
   for (i = 0; i < 10; i++) {
     a[i] = valloc(11111 * (i+1));
diff --git a/tests/sys_mman.h b/tests/sys_mman.h
index c059308c12..0cdc434f71 100644
--- a/tests/sys_mman.h
+++ b/tests/sys_mman.h
@@ -21,7 +21,8 @@ static void* get_unmapped_page(void)
    void* ptr;
    int r;
    long pagesz = sysconf(_SC_PAGE_SIZE);
-   assert(pagesz == 4096 || pagesz == 16384 || pagesz == 65536);
+   assert(pagesz == 4096 || pagesz == 8192 || pagesz == 16384 || pagesz == 32768
+          || pagesz == 65536);
    ptr = mmap(0, pagesz, PROT_READ, MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
    assert(ptr != (void*)-1);
    r = munmap(ptr, pagesz);