From: Rhys Kidd <rhyskidd@gmail.com>
Date: Fri, 1 May 2015 06:29:51 +0000 (+0000)
Subject: Fix aspacem segment mismatch: seen with none/tests/bigcode
X-Git-Tag: svn/VALGRIND_3_11_0~438
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9fe1f89425f01760b578471f6b5f48279eec5e0e;p=thirdparty%2Fvalgrind.git

Fix aspacem segment mismatch: seen with none/tests/bigcode
bz#345824

Tested on OS X 10.9 and OS X 10.10.

Before:

== 595 tests, 237 stderr failures, 23 stdout failures, 0 stderrB failures, 0 stdoutB failures, 31 post failures ==

After:

== 595 tests, 236 stderr failures, 22 stdout failures, 0 stderrB failures, 0 stdoutB failures, 31 post failures ==


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

diff --git a/NEWS b/NEWS
index 40ecb51525..1c178cc44b 100644
--- a/NEWS
+++ b/NEWS
@@ -157,6 +157,7 @@ where XXXXXX is the bug number as listed below.
 345394  Fix memcheck/tests/strchr on OS X
 345637  Fix memcheck/tests/sendmsg on OS X
 345695  Add POWERPC support for AT_DCACHESIZE and HWCAP2
+345824  Fix aspacem segment mismatch: seen with none/tests/bigcode
 345887  Fix an assertion in the address space manager
 346267  Compiler warnings for PPC64 code on call to LibVEX_GuestPPC64_get_XER()
         and LibVEX_GuestPPC64_get_CR()
diff --git a/coregrind/m_aspacemgr/aspacemgr-linux.c b/coregrind/m_aspacemgr/aspacemgr-linux.c
index d5e0be8f27..b5de1864ef 100644
--- a/coregrind/m_aspacemgr/aspacemgr-linux.c
+++ b/coregrind/m_aspacemgr/aspacemgr-linux.c
@@ -815,8 +815,9 @@ static void sync_check_mapping_callback ( Addr addr, SizeT len, UInt prot,
 #  endif
 
    /* Some kernels on s390 provide 'r' permission even when it was not
-      explicitly requested. It seems that 'x' permission implies 'r'. */
-#  if defined(VGA_s390x)
+      explicitly requested. It seems that 'x' permission implies 'r'. 
+      This behaviour also occurs on OS X. */
+#  if defined(VGA_s390x) || defined(VGO_darwin)
    sloppyRcheck = True;
 #  else
    sloppyRcheck = False;