diff options
-rw-r--r-- | recipes-devtools/ion/ion-tests/0001-map_test-Replace-PAGE_SIZE-with-local-variable-name.patch | 69 | ||||
-rw-r--r-- | recipes-devtools/ion/ion-tests_git.bb | 1 |
2 files changed, 70 insertions, 0 deletions
diff --git a/recipes-devtools/ion/ion-tests/0001-map_test-Replace-PAGE_SIZE-with-local-variable-name.patch b/recipes-devtools/ion/ion-tests/0001-map_test-Replace-PAGE_SIZE-with-local-variable-name.patch new file mode 100644 index 00000000..8915c642 --- /dev/null +++ b/recipes-devtools/ion/ion-tests/0001-map_test-Replace-PAGE_SIZE-with-local-variable-name.patch @@ -0,0 +1,69 @@ +From f045cbf9aae0053e9e785e32b772e473aa892443 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 6 Oct 2019 16:08:36 -0700 +Subject: [PATCH] map_test: Replace PAGE_SIZE with local variable name + +PAGE_SIZE is already a define in libc implementations global namespace +e.g. in musl. Therefore its best to use a unique variable name to not +stamp on the global definition. + +Fixes +src/map_test.cpp:59:23: error: expected unqualified-id +unsigned long PAGE_SIZE = sysconf(_SC_PAGESIZE); +^ +/usr/include/limits.h:89:19: note: expanded from macro 'PAGE_SIZE' +^ +/usr/include/bits/limits.h:3:18: note: expanded from macro 'PAGESIZE' +^ + +Upstream-Status: Submitted [https://github.com/glneo/ion-tests/pull/1] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/map_test.cpp | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/src/map_test.cpp b/src/map_test.cpp +index a7ce2c9..7b5746d 100644 +--- a/src/map_test.cpp ++++ b/src/map_test.cpp +@@ -56,27 +56,27 @@ TEST_F(Map, MapOffset) + SCOPED_TRACE(::testing::Message() << "heap " << heapMask); + int map_fd = -1; + +- unsigned long PAGE_SIZE = sysconf(_SC_PAGESIZE); ++ unsigned long psize = sysconf(_SC_PAGESIZE); + +- ASSERT_EQ(0, ion_alloc(m_ionFd, PAGE_SIZE * 2, heapMask, 0, &map_fd)); ++ ASSERT_EQ(0, ion_alloc(m_ionFd, psize * 2, heapMask, 0, &map_fd)); + ASSERT_GE(map_fd, 0); + + unsigned char *ptr; +- ptr = (unsigned char *)mmap(NULL, PAGE_SIZE * 2, PROT_READ | PROT_WRITE, MAP_SHARED, map_fd, 0); ++ ptr = (unsigned char *)mmap(NULL, psize * 2, PROT_READ | PROT_WRITE, MAP_SHARED, map_fd, 0); + ASSERT_TRUE(ptr != NULL); + +- memset(ptr, 0, PAGE_SIZE); +- memset(ptr + PAGE_SIZE, 0xaa, PAGE_SIZE); ++ memset(ptr, 0, psize); ++ memset(ptr + psize, 0xaa, psize); + +- ASSERT_EQ(0, munmap(ptr, PAGE_SIZE * 2)); ++ ASSERT_EQ(0, munmap(ptr, psize * 2)); + +- ptr = (unsigned char *)mmap(NULL, PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, map_fd, PAGE_SIZE); ++ ptr = (unsigned char *)mmap(NULL, psize, PROT_READ | PROT_WRITE, MAP_SHARED, map_fd, psize); + ASSERT_TRUE(ptr != NULL); + + ASSERT_EQ(ptr[0], 0xaa); +- ASSERT_EQ(ptr[PAGE_SIZE - 1], 0xaa); ++ ASSERT_EQ(ptr[psize - 1], 0xaa); + +- ASSERT_EQ(0, munmap(ptr, PAGE_SIZE)); ++ ASSERT_EQ(0, munmap(ptr, psize)); + + ASSERT_EQ(0, close(map_fd)); + } +-- +2.23.0 + diff --git a/recipes-devtools/ion/ion-tests_git.bb b/recipes-devtools/ion/ion-tests_git.bb index 831f5e8c..52346f1c 100644 --- a/recipes-devtools/ion/ion-tests_git.bb +++ b/recipes-devtools/ion/ion-tests_git.bb @@ -8,6 +8,7 @@ PV = "1.0" BRANCH = "master" SRC_URI = "git://github.com/glneo/ion-tests.git;protocol=git;branch=${BRANCH} \ file://0001-CMakeLists.txt-disable-phys-addr-for-now.patch \ + file://0001-map_test-Replace-PAGE_SIZE-with-local-variable-name.patch \ " SRCREV = "70d730cebca29e6fd37b21d9beac82ae645f3900" |