From: Rhys Kidd <rhyskidd@gmail.com>
Date: Sun, 23 Aug 2015 08:27:45 +0000 (+0000)
Subject: Preliminary support for OS X 10.11 (El Capitan) documentation. bz#348909.
X-Git-Tag: svn/VALGRIND_3_11_0~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8a45cbef1333767b0c9bb483339a78f79054013;p=thirdparty%2Fvalgrind.git

Preliminary support for OS X 10.11 (El Capitan) documentation. bz#348909.

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

diff --git a/NEWS b/NEWS
index 203ef0006c..5f497192de 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,8 @@ Release 3.11.0 is under development, not yet released.
 * x86: on an SSE2 only host, Valgrind in 32 bits now claims to be a Pentium 4.
        3.10.1 was wrongly claiming to be a CORE 2, which is SSSE3.
 
+* Preliminary support for OS X 10.11 (El Capitan) has been added.
+
 * ==================== TOOL CHANGES ====================
 
 * Memcheck:
diff --git a/coregrind/m_syswrap/syswrap-darwin.c b/coregrind/m_syswrap/syswrap-darwin.c
index 1c1cb0e436..a6407bcbfd 100644
--- a/coregrind/m_syswrap/syswrap-darwin.c
+++ b/coregrind/m_syswrap/syswrap-darwin.c
@@ -10266,10 +10266,12 @@ const SyscallTableEntry ML_(syscall_table)[] = {
    MACXY(__NR_getattrlistbulk,     getattrlistbulk),    // 461
    MACX_(__NR_readlinkat,          readlinkat),         // 473
    MACX_(__NR_bsdthread_ctl,       bsdthread_ctl),      // 478
-   MACX_(__NR_guarded_open_dprotected_np, guarded_open_dprotected_np),
-   MACX_(__NR_guarded_write_np, guarded_write_np),
-   MACX_(__NR_guarded_pwrite_np, guarded_pwrite_np),
-   MACX_(__NR_guarded_writev_np, guarded_writev_np),
+   MACX_(__NR_guarded_open_dprotected_np, guarded_open_dprotected_np),  // 484
+   MACX_(__NR_guarded_write_np, guarded_write_np),      // 485
+   MACX_(__NR_guarded_pwrite_np, guarded_pwrite_np),    // 486
+   MACX_(__NR_guarded_writev_np, guarded_writev_np),    // 487
+// _____(__NR___rename_ext),                            // 488
+// _____(__NR___mremap_encrypted),                      // 489
 #endif
 // _____(__NR_MAXSYSCALL)
    MACX_(__NR_DARWIN_FAKE_SIGRETURN, FAKE_SIGRETURN)
diff --git a/docs/internals/3_10_BUGSTATUS.txt b/docs/internals/3_10_BUGSTATUS.txt
index 49a6cb4e1d..f9fc9524c7 100644
--- a/docs/internals/3_10_BUGSTATUS.txt
+++ b/docs/internals/3_10_BUGSTATUS.txt
@@ -252,9 +252,9 @@ go in here.
 341726  [patch] Remove uneccessary ifdef _android_ from launcher-linux.c
         do we want this?
 
-=== other/MacOS ========================================================
+=== other/OS X ========================================================
 
-338781  OSX: unable to read debug info
+338781  Unable to read debug information (3.10.0 BETA1)
 
 339745  Valgrind crash when check Marmalade app
         WONTFIX Requires 64 bit support in client application Marmalade
@@ -274,6 +274,8 @@ go in here.
 
 350359  memcheck/tests/x86/fxsave hangs indefinetely on OS X
 
+351632  UNKNOWN fcntl 97 on OS X 10.11
+
 === other/Win32 =======================================================
 
 344382  Memcheck has high false error rates on MSVC2013 compiled,
diff --git a/include/vki/vki-scnums-darwin.h b/include/vki/vki-scnums-darwin.h
index 161790f752..b75cdce7dc 100644
--- a/include/vki/vki-scnums-darwin.h
+++ b/include/vki/vki-scnums-darwin.h
@@ -738,7 +738,23 @@
 #define __NR_guarded_write_np       VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(485)
 #define __NR_guarded_pwrite_np      VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(486)
 #define __NR_guarded_writev_np      VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(487)
-#endif
+			/* 488  */
+			/* 489  */
+#endif /* DARWIN_VERS >= DARWIN_10_10 */
+
+// TODO Update with OS X 10.11 kernel (xnu) source code release
+#if DARWIN_VERS >= DARWIN_10_11
+			/* 490  */
+			/* 491  */
+			/* 492  */
+			/* 493  */
+			/* 494  */
+			/* 495  */
+			/* 496  */
+			/* 497  */
+			/* 498  */
+			/* 499  */
+#endif /* DARWIN_VERS >= DARWIN_10_11 */
 
 #if DARWIN_VERS < DARWIN_10_6
 #define	__NR_MAXSYSCALL             VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(427)
@@ -751,8 +767,8 @@
 #elif DARWIN_VERS == DARWIN_10_10
 #define __NR_MAXSYSCALL             VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(490)
 #elif DARWIN_VERS == DARWIN_10_11
-// TODO Hackish, needs properly analysis
-#define __NR_MAXSYSCALL             VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(490)
+// TODO Confirm against final release
+#define __NR_MAXSYSCALL             VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(500)
 #else
 #error unknown darwin version
 #endif