From: Rhys Kidd Date: Thu, 22 Sep 2016 02:55:24 +0000 (+0000) Subject: Preliminary support for macOS Sierra (10.12). Does not fully resolve bz#365327. X-Git-Tag: svn/VALGRIND_3_13_0~390 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab2edd2901bc4ea23264200e0e1ed223fb9b7987;p=thirdparty%2Fvalgrind.git Preliminary support for macOS Sierra (10.12). Does not fully resolve bz#365327. No regressions on OS X 10.11. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15976 --- diff --git a/Makefile.am b/Makefile.am index 4ad7b16755..c43b570452 100644 --- a/Makefile.am +++ b/Makefile.am @@ -47,6 +47,7 @@ SUPP_FILES = \ darwin9.supp darwin9-drd.supp \ darwin10.supp darwin10-drd.supp \ darwin11.supp darwin12.supp darwin13.supp darwin14.supp darwin15.supp \ + darwin16.supp \ bionic.supp \ solaris11.supp solaris12.supp DEFAULT_SUPP_FILES = @DEFAULT_SUPP@ diff --git a/NEWS b/NEWS index 61988e95bf..e03a1b2090 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,8 @@ Release 3.12.0 is under development, not yet released. * ================== PLATFORM CHANGES ================= +* Preliminary support for macOS 10.12 (Sierra) has been added. + * ==================== TOOL CHANGES ==================== * Memcheck: diff --git a/configure.ac b/configure.ac index 85439a4c0e..5f4929a445 100644 --- a/configure.ac +++ b/configure.ac @@ -353,6 +353,7 @@ case "${host_os}" in AC_DEFINE([DARWIN_10_9], 100900, [DARWIN_VERS value for Mac OS X 10.9]) AC_DEFINE([DARWIN_10_10], 101000, [DARWIN_VERS value for Mac OS X 10.10]) AC_DEFINE([DARWIN_10_11], 101100, [DARWIN_VERS value for Mac OS X 10.11]) + AC_DEFINE([DARWIN_10_12], 101200, [DARWIN_VERS value for macOS 10.12]) AC_MSG_CHECKING([for the kernel version]) kernel=`uname -r` @@ -416,9 +417,15 @@ case "${host_os}" in DEFAULT_SUPP="darwin15.supp ${DEFAULT_SUPP}" DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" ;; + 16.*) + AC_MSG_RESULT([Darwin 16.x (${kernel}) / macOS 10.12 Sierra]) + AC_DEFINE([DARWIN_VERS], DARWIN_10_12, [Darwin / Mac OS X version]) + DEFAULT_SUPP="darwin16.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" + ;; *) AC_MSG_RESULT([unsupported (${kernel})]) - AC_MSG_ERROR([Valgrind works on Darwin 10.x, 11.x, 12.x, 13.x, 14.x and 15.x (Mac OS X 10.6/7/8/9/10/11)]) + AC_MSG_ERROR([Valgrind works on Darwin 10.x, 11.x, 12.x, 13.x, 14.x, 15.x and 16.x (Mac OS X 10.6/7/8/9/10/11 and macOS 10.12)]) ;; esac ;; diff --git a/coregrind/fixup_macho_loadcmds.c b/coregrind/fixup_macho_loadcmds.c index 9db6f46e53..516b7bad6f 100644 --- a/coregrind/fixup_macho_loadcmds.c +++ b/coregrind/fixup_macho_loadcmds.c @@ -122,7 +122,7 @@ #if DARWIN_VERS != DARWIN_10_5 && DARWIN_VERS != DARWIN_10_6 \ && DARWIN_VERS != DARWIN_10_7 && DARWIN_VERS != DARWIN_10_8 \ && DARWIN_VERS != DARWIN_10_9 && DARWIN_VERS != DARWIN_10_10 \ - && DARWIN_VERS != DARWIN_10_11 + && DARWIN_VERS != DARWIN_10_11 && DARWIN_VERS != DARWIN_10_12 # error "Unknown DARWIN_VERS value. This file only compiles on Darwin." #endif diff --git a/coregrind/m_syswrap/syswrap-amd64-darwin.c b/coregrind/m_syswrap/syswrap-amd64-darwin.c index 7fb8b2c6db..375989f795 100644 --- a/coregrind/m_syswrap/syswrap-amd64-darwin.c +++ b/coregrind/m_syswrap/syswrap-amd64-darwin.c @@ -479,7 +479,10 @@ void wqthread_hijack(Addr self, Addr kport, Addr stackaddr, Addr workitem, UWord magic_delta = 0; # elif DARWIN_VERS == DARWIN_10_7 || DARWIN_VERS == DARWIN_10_8 UWord magic_delta = 0x60; -# elif DARWIN_VERS == DARWIN_10_9 || DARWIN_VERS == DARWIN_10_10 || DARWIN_VERS == DARWIN_10_11 +# elif DARWIN_VERS == DARWIN_10_9 \ + || DARWIN_VERS == DARWIN_10_10 \ + || DARWIN_VERS == DARWIN_10_11 \ + || DARWIN_VERS == DARWIN_10_12 UWord magic_delta = 0xE0; # else # error "magic_delta: to be computed on new OS version" diff --git a/coregrind/m_syswrap/syswrap-x86-darwin.c b/coregrind/m_syswrap/syswrap-x86-darwin.c index 37bbbc3f5b..a571f6473e 100644 --- a/coregrind/m_syswrap/syswrap-x86-darwin.c +++ b/coregrind/m_syswrap/syswrap-x86-darwin.c @@ -427,7 +427,10 @@ void wqthread_hijack(Addr self, Addr kport, Addr stackaddr, Addr workitem, UWord magic_delta = 0; # elif DARWIN_VERS == DARWIN_10_7 || DARWIN_VERS == DARWIN_10_8 UWord magic_delta = 0x48; -# elif DARWIN_VERS == DARWIN_10_9 || DARWIN_VERS == DARWIN_10_10 || DARWIN_VERS == DARWIN_10_11 +# elif DARWIN_VERS == DARWIN_10_9 \ + || DARWIN_VERS == DARWIN_10_10 \ + || DARWIN_VERS == DARWIN_10_11 \ + || DARWIN_VERS == DARWIN_10_12 UWord magic_delta = 0xB0; # else # error "magic_delta: to be computed on new OS version" diff --git a/darwin16.supp b/darwin16.supp new file mode 100644 index 0000000000..91f48ff13c --- /dev/null +++ b/darwin16.supp @@ -0,0 +1,761 @@ + +# Suppressions for Darwin 16.x / macOS 10.12 Sierra + +############################################ +## Leaks. For other stuff see below. + +{ + OSX1012:1-Leak + Memcheck:Leak + match-leak-kinds: possible + fun:malloc_zone_?alloc + ... + fun:_read_images +} + +{ + OSX1012:2-Leak + Memcheck:Leak + match-leak-kinds: definite + fun:malloc_zone_?alloc + ... + fun:_read_images +} + +{ + OSX1012:3-Leak + Memcheck:Leak + match-leak-kinds: definite + fun:malloc_zone_?alloc + fun:recursive_mutex_init + ... + fun:_os_object_init + fun:libdispatch_init + fun:libSystem_initializer + ... +} + +{ + OSX1012:4-Leak + Memcheck:Leak + fun:malloc_zone_?alloc + ... + fun:dyld_register_image_state_change_handler + ... +} + +{ + OSX1012:5-Leak + Memcheck:Leak + match-leak-kinds: reachable + fun:?alloc + ... + fun:dyld_register_image_state_change_handler + ... +} + +{ + OSX1012:6-Leak + Memcheck:Leak + match-leak-kinds: reachable + fun:malloc_zone_?alloc + ... + fun:map_images_nolock + fun:map_2_images + ... +} + +{ + OSX1012:7-Leak + Memcheck:Leak + match-leak-kinds: possible + fun:malloc_zone_?alloc + ... + fun:map_images_nolock + fun:map_2_images + ... +} + +{ + OSX1012:8-Leak + Memcheck:Leak + match-leak-kinds: definite + fun:?alloc + ... + fun:libSystem_initializer + ... +} + +{ + OSX1012:9-Leak + Memcheck:Leak + match-leak-kinds: reachable + fun:malloc_zone_?alloc + ... + fun:libSystem_initializer + ... +} + +{ + OSX1012:10-Leak + Memcheck:Leak + match-leak-kinds: reachable + fun:?alloc + ... + fun:libSystem_initializer + ... +} + +#{ +# OSX1012:11-Leak +# Memcheck:Leak +# match-leak-kinds: definite +# fun:malloc +# fun:currentlocale +#} +# +#{ +# OSX1012:12-Leak +# Memcheck:Leak +# match-leak-kinds: possible +# fun:malloc +# fun:tzsetwall_basic +# fun:_st_tzset_basic +#} + +{ + OSX1012:13-Leak + Memcheck:Leak + match-leak-kinds: reachable + fun:malloc_zone_memalign + ... + fun:_ZN4dyld24initializeMainExecutableEv + ... +} + +{ + OSX1012:14-Leak + Memcheck:Leak + match-leak-kinds: reachable + fun:?alloc + ... + fun:libSystem_atfork_child + ... +} + +{ + OSX1012:15-Leak + Memcheck:Leak + match-leak-kinds: reachable + fun:malloc + fun:__smakebuf + ... + fun:printf + ... +} + +{ + OSX1012:16-Leak + Memcheck:Leak + match-leak-kinds: possible + fun:?alloc + ... + fun:_read_images +} + +{ + OSX1012:17-Leak + Memcheck:Leak + match-leak-kinds: reachable + fun:?alloc + ... + fun:_read_images +} + +{ + OSX1012:18-Leak + Memcheck:Leak + match-leak-kinds: reachable + fun:malloc_zone_?alloc + ... + fun:_read_images +} + +{ + OSX1012:19-Leak + Memcheck:Leak + match-leak-kinds: possible + fun:malloc_zone_?alloc + ... + fun:*NX*Map* + fun:*NX*Map* +} + +{ + OSX1012:20-Leak + Memcheck:Leak + match-leak-kinds: indirect + fun:?alloc + ... + fun:libSystem_initializer + ... +} + +{ + OSX1012:21-Leak + Memcheck:Leak + match-leak-kinds: definite + fun:malloc_zone_memalign + ... + fun:_ZN4dyld24initializeMainExecutableEv + ... +} + + +############################################ +## Non-leak errors + +##{ +## OSX1012:CoreFoundation-1 +## Memcheck:Cond +## obj:*CoreFoundation.framework*CoreFoundation* +## obj:*CoreFoundation.framework*CoreFoundation* +## obj:*CoreFoundation.framework*CoreFoundation* +##} + +{ + OSX1012:CoreFoundation-2 + Memcheck:Cond + obj:*CoreFoundation.framework*CoreFoundation* + obj:*libdispatch.dylib* + obj:*libdispatch.dylib* +} + +{ + OSX1012:CoreFoundation-3 + Memcheck:Cond + obj:*CoreFoundation.framework*CoreFoundation* + obj:*CoreFoundation.framework*CoreFoundation* + obj:*Foundation.framework*Foundation* +} + +{ + OSX1012:CoreFoundation-4 + Memcheck:Cond + obj:*CoreFoundation.framework*CoreFoundation* + obj:*CoreFoundation.framework*CoreFoundation* + obj:*SystemConfiguration.framework*SystemConfiguration* +} + +{ + OSX1012:CoreFoundation-5 + Memcheck:Cond + obj:*CoreFoundation.framework*CoreFoundation* + obj:*CoreFoundation.framework*CoreFoundation* + obj:*HIServices.framework*HIServices* +} + +{ + OSX1012:CoreFoundation-6 + Memcheck:Cond + obj:*CoreFoundation.framework*CoreFoundation* + obj:*SystemConfiguration.framework*SystemConfiguration* + obj:*SystemConfiguration.framework*SystemConfiguration* +} + +{ + OSX1012:CoreFoundation-7 + Memcheck:Cond + obj:*CoreFoundation.framework*CoreFoundation* + obj:*SystemConfiguration.framework*SystemConfiguration* + obj:*CoreFoundation.framework*CoreFoundation* +} + +{ + OSX1012:CoreFoundation-8 + Memcheck:Cond + obj:*CoreFoundation.framework*CoreFoundation* + obj:*IOKit.framework*IOKit* +} + +{ + OSX1012:CoreFoundation-9 + Memcheck:Cond + obj:*CoreFoundation.framework*CoreFoundation* + obj:*Foundation.framework*Foundation* + obj:*AppKit.framework*AppKit* +} + +{ + OSX1012:CoreFoundation-10 + Memcheck:Cond + obj:*CoreFoundation.framework*CoreFoundation* + obj:*HIToolbox.framework*HIToolbox* + obj:*HIToolbox.framework*HIToolbox* +} + +{ + OSX1012:CoreFoundation-11 + Memcheck:Cond + obj:*CoreFoundation.framework*CoreFoundation* + obj:*AE.framework*AE* + obj:*AE.framework*AE* +} + +{ + OSX1012:CoreFoundation-12 + Memcheck:Cond + obj:*CoreFoundation.framework*CoreFoundation* + obj:*CoreFoundation.framework*CoreFoundation* + obj:*HIToolbox.framework*HIToolbox* +} + +{ + OSX1012:CoreFoundation-13 + Memcheck:Cond + obj:*CoreFoundation.framework*CoreFoundation* + obj:*CoreFoundation.framework*CoreFoundation* + obj:*AE.framework*AE* +} + +{ + OSX1012:AppKit-1 + Memcheck:Cond + obj:*AppKit.framework*AppKit* + obj:*AppKit.framework*AppKit* + obj:*AppKit.framework*AppKit* +} + +{ + OSX1012:AppKit-2 + Memcheck:Cond + obj:*AppKit.framework*AppKit* + obj:*AppKit.framework*AppKit* + obj:*libdispatch.dylib* +} + +#{ +# OSX1012:AppKit-3 +# Memcheck:Cond +# obj:*AppKit.framework*AppKit* +# obj:*libdispatch.dylib* +# obj:*libdispatch.dylib* +#} + +##{ +## OSX1012:AppKit-4 +## Memcheck:Cond +## obj:*AppKit.framework*AppKit* +## obj:*AppKit.framework*AppKit* +## obj:*CoreFoundation.framework*CoreFoundation* +##} + +{ + OSX1012:AppKit-5 + Memcheck:Cond + obj:*AppKit.framework*AppKit* + obj:*AppKit.framework*AppKit* + obj:*Foundation.framework*Foundation* +} + +{ + OSX1012:AppKit-6 + Memcheck:Cond + obj:*AppKit.framework*AppKit* + obj:*Foundation.framework*Foundation* + obj:*AppKit.framework*AppKit* +} + +{ + OSX1012:AppKit-7 + Memcheck:Cond + obj:*AppKit.framework*AppKit* + obj:*libdispatch.dylib* + obj:*libdispatch.dylib* +} + +{ + OSX1012:AppKit-8 + Memcheck:Cond + obj:*AppKit.framework*AppKit* + obj:*Foundation.framework*Foundation* + obj:*Foundation.framework*Foundation* +} + +{ + OSX1012:ColorSync-1 + Memcheck:Cond + obj:*ColorSync.framework*ColorSync* + obj:*ColorSync.framework*ColorSync* + obj:*ColorSync.framework*ColorSync* +} + +#{ +# OSX1012:ColorSync-2 +# Memcheck:Value8 +# obj:*ColorSync.framework*ColorSync* +# obj:*ColorSync.framework*ColorSync* +# obj:*ColorSync.framework*ColorSync* +#} + +{ + OSX1012:CoreGraphics-1 + Memcheck:Cond + obj:*CoreGraphics.framework*CoreGraphics* + obj:*CoreGraphics.framework*CoreGraphics* +} + +#{ +# OSX1012:CoreGraphics-2 +# Memcheck:Value8 +# obj:*CoreGraphics.framework*CoreGraphics* +# obj:*CoreGraphics.framework*CoreGraphics* +# obj:*CoreGraphics.framework*CoreGraphics* +#} + +{ + OSX1012:CoreGraphics-3 + Memcheck:Cond + obj:*CoreGraphics.framework*CoreGraphics* + obj:*CoreGraphics.framework*libRIP* + obj:*CoreGraphics.framework*libRIP* +} + +#{ +# OSX1012:CoreGraphics-4 +# Memcheck:Cond +# obj:*CoreGraphics.framework*CoreGraphics* +# obj:*CoreGraphics.framework*CoreGraphics* +# obj:*CoreGraphics.framework*libRIP* +#} + +{ + OSX1012:CoreGraphics-5 + Memcheck:Cond + obj:*CoreGraphics.framework*CoreGraphics* + obj:*libdispatch.dylib* + obj:*libdispatch.dylib* +} + +#{ +# OSX1012:CoreGraphics-6 +# Memcheck:Cond +# obj:*CoreGraphics.framework*CoreGraphics* +# obj:*CoreGraphics.framework*CoreGraphics* +# obj:*HIToolbox.framework*HIToolbox* +#} + +{ + OSX1012:HIServices-1 + Memcheck:Cond + obj:*HIServices.framework*HIServices* + obj:*HIToolbox.framework*HIToolbox* + obj:*HIToolbox.framework*HIToolbox* +} + +{ + OSX1012:LaunchServices-1 + Memcheck:Cond + obj:*LaunchServices.framework*LaunchServices* + obj:*AppKit.framework*AppKit* + obj:*AppKit.framework*AppKit* +} + +{ + OSX1012:LaunchServices-2 + Memcheck:Cond + obj:*LaunchServices.framework*LaunchServices* + obj:*libdispatch.dylib* + obj:*libdispatch.dylib* +} + +{ + OSX1012:QuartzCore-1 + Memcheck:Cond + obj:*QuartzCore.framework*QuartzCore + obj:*QuartzCore.framework*QuartzCore + obj:*QuartzCore.framework*QuartzCore +} + +#{ +# OSX1012:vImage-1 +# Memcheck:Cond +# obj:*vImage.framework*vImage* +# obj:*vImage.framework*vImage* +# obj:*CoreGraphics.framework*CoreGraphics* +#} + +{ + OSX1012:zlib-C + Memcheck:Cond + obj:/usr/lib/libz.*dylib + obj:/usr/lib/libz.*dylib +} + +{ + OSX1012:zlib-8 + Memcheck:Value8 + obj:/usr/lib/libz.*dylib + obj:/usr/lib/libz.*dylib +} + +{ + OSX1012:32bit:_libxpc_initializer + Memcheck:Cond + obj:/usr/lib/system/libsystem_c.dylib + obj:/usr/lib/system/libsystem_c.dylib + fun:_libxpc_initializer + obj:/usr/lib/libSystem.B.dylib + fun:*ImageLoaderMachO*doModInitFunctions* +} + +{ + OSX1012:dyld-1 + Memcheck:Cond + fun:*ImageLoader*weakBind* + fun:*ImageLoader*link* + fun:*dyld*link* +} + +{ + OSX1012:dyld-2 + Memcheck:Cond + fun:exit + obj:*libdyld*dylib* +} + +{ + OSX1012:libsystem_kernel-1 + Memcheck:Cond + obj:*libsystem_kernel*dylib* + obj:*libsystem_kernel*dylib* + obj:*CoreFoundation.framework*CoreFoundation* +} + +{ + OSX1012:CoreServicesInternal-1 + Memcheck:Cond + obj:*CoreServicesInternal.framework*CoreServicesInternal* + obj:*CoreServices.framework*LaunchServices* + obj:*CoreServices.framework*LaunchServices* +} + +{ + OSX1012:CoreServicesInternal-2 + Memcheck:Cond + obj:*CoreServicesInternal.framework*CoreServicesInternal* + obj:*CoreServicesInternal.framework*CoreServicesInternal* + obj:*CoreServicesInternal.framework*CoreServicesInternal* +} + +{ + OSX1012:CoreServicesInternal-3 + Memcheck:Cond + obj:*CoreServicesInternal.framework*CoreServicesInternal* + obj:*CoreServicesInternal.framework*CoreServicesInternal* + obj:*CoreFoundation.framework*CoreFoundation* +} + +{ + OSX1012:CoreServices-1 + Memcheck:Cond + obj:*CoreServices.framework*LaunchServices* + obj:*CoreServices.framework*LaunchServices* + obj:*CoreServices.framework*LaunchServices* +} + +##{ +## OSX1012:libsystem_pthread-1 +## Memcheck:Cond +## obj:*libsystem_pthread*dylib* +## obj:*ImageIO.framework*ImageIO* +## obj:*ImageIO.framework*ImageIO* +##} + +{ + OSX1012:ApplicationServices-1 + Memcheck:Cond + obj:*ApplicationServices.framework*ATS* + obj:*libsystem_pthread*dylib* + obj:*libsystem_platform*dylib* +} + +{ + OSX1012:HIToolbox-1 + Memcheck:Cond + obj:*HIToolbox.framework*HIToolbox* + obj:*HIToolbox.framework*HIToolbox* + obj:*HIToolbox.framework*HIToolbox* +} + +{ + OSX1012:RawCamera-1 + Memcheck:Cond + obj:*RawCamera.bundle*RawCamera* + obj:*libdispatch.dylib* + obj:*libdispatch.dylib* +} + +##{ +## OSX1012:CoreImage-1 +## Memcheck:Cond +## obj:*CoreImage.framework*CoreImage* +## obj:*CoreImage.framework*CoreImage* +## obj:*CoreImage.framework*CoreImage* +##} + +##{ +## OSX1012:strncpy-1 +## Memcheck:Cond +## fun:strncpy +## obj:*CoreServicesInternal.framework*CoreServicesInternal +## obj:*CoreServicesInternal.framework*CoreServicesInternal +##} + +{ + OSX1012:pthread_rwlock_init + Memcheck:Cond + fun:pthread_rwlock_init + obj:*ImageIO.framework*ImageIO* + obj:*ImageIO.framework*ImageIO* +} + +{ + OSX1012:CFBasicHash + Memcheck:Value8 + fun:*CFBasicHash* + fun:*CF* +} + +{ + OSX1012:AppleIntelHD4000GraphicsGLDriver-1-Addr8 + Memcheck:Addr8 + obj:*AppleIntelHD4000GraphicsGLDriver.bundle*AppleIntelHD4000GraphicsGLDriver* + obj:*AppleIntelHD4000GraphicsGLDriver.bundle*AppleIntelHD4000GraphicsGLDriver* + obj:*AppleIntelHD4000GraphicsGLDriver.bundle*AppleIntelHD4000GraphicsGLDriver* +} +{ + OSX1012:AppleIntelHD4000GraphicsGLDriver-1-Addr8 + Memcheck:Addr4 + obj:*AppleIntelHD4000GraphicsGLDriver.bundle*AppleIntelHD4000GraphicsGLDriver* + obj:*AppleIntelHD4000GraphicsGLDriver.bundle*AppleIntelHD4000GraphicsGLDriver* + obj:*AppleIntelHD4000GraphicsGLDriver.bundle*AppleIntelHD4000GraphicsGLDriver* +} + +{ + OSX1012:AppleIntelHD4000GraphicsGLDriver-2-Addr8 + Memcheck:Addr8 + fun:*platform_memmove* + obj:*AppleIntelHD4000GraphicsGLDriver.bundle*AppleIntelHD4000GraphicsGLDriver* + obj:*AppleIntelHD4000GraphicsGLDriver.bundle*AppleIntelHD4000GraphicsGLDriver* +} +{ + OSX1012:AppleIntelHD4000GraphicsGLDriver-2-Addr2 + Memcheck:Addr2 + fun:*platform_memmove* + obj:*AppleIntelHD4000GraphicsGLDriver.bundle*AppleIntelHD4000GraphicsGLDriver* + obj:*AppleIntelHD4000GraphicsGLDriver.bundle*AppleIntelHD4000GraphicsGLDriver* +} + +{ + OSX1012:AppleIntelHD4000GraphicsGLDriver-3-Addr8 + Memcheck:Addr8 + fun:*platform_memmove* + obj:*AppleIntelHD4000GraphicsGLDriver.bundle*AppleIntelHD4000GraphicsGLDriver* + obj:*GLEngine.bundle*GLEngine* +} +{ + OSX1012:AppleIntelHD4000GraphicsGLDriver-3-Addr2 + Memcheck:Addr2 + fun:*platform_memmove* + obj:*AppleIntelHD4000GraphicsGLDriver.bundle*AppleIntelHD4000GraphicsGLDriver* + obj:*GLEngine.bundle*GLEngine* +} +{ + OSX1012:AppleIntelHD4000GraphicsGLDriver-3-Addr1 + Memcheck:Addr1 + fun:*platform_memmove* + obj:*AppleIntelHD4000GraphicsGLDriver.bundle*AppleIntelHD4000GraphicsGLDriver* + obj:*GLEngine.bundle*GLEngine* +} + +{ + OSX1012:AppleIntelHD4000GraphicsGLDriver-4 + Memcheck:Addr8 + fun:*platform_bzero* + obj:*AppleIntelHD4000GraphicsGLDriver.bundle*AppleIntelHD4000GraphicsGLDriver* + obj:*AppleIntelHD4000GraphicsGLDriver.bundle*AppleIntelHD4000GraphicsGLDriver* +} + +{ + OSX1012:AppleIntelHD4000GraphicsGLDriver-6-Addr8 + Memcheck:Addr8 + obj:*AppleIntelHD4000GraphicsGLDriver.bundle*AppleIntelHD4000GraphicsGLDriver* + obj:*AppleIntelHD4000GraphicsGLDriver.bundle*AppleIntelHD4000GraphicsGLDriver* + obj:*GLEngine.bundle*GLEngine* +} +{ + OSX1012:AppleIntelHD4000GraphicsGLDriver-6-Addr4 + Memcheck:Addr4 + obj:*AppleIntelHD4000GraphicsGLDriver.bundle*AppleIntelHD4000GraphicsGLDriver* + obj:*AppleIntelHD4000GraphicsGLDriver.bundle*AppleIntelHD4000GraphicsGLDriver* + obj:*GLEngine.bundle*GLEngine* +} + +{ + OSX1012:AppleIntelHD4000GraphicsGLDriver-7 + Memcheck:Addr4 + obj:*AppleIntelHD4000GraphicsGLDriver.bundle*AppleIntelHD4000GraphicsGLDriver* + obj:*GLEngine.bundle*GLEngine* +} + +{ + OSX1012:OSAtomicAdd32 + Memcheck:Addr4 + fun:*OSAtomicAdd32* + obj:*IOAccelerator.framework*IOAccelerator* + obj:*GPUSupport.framework*GPUSupportMercury* +} + +{ + OSX1012:IOAccelerator-1 + Memcheck:Addr4 + obj:*IOAccelerator.framework*IOAccelerator* + obj:*GPUSupport.framework*GPUSupportMercury* +} + +{ + OSX1012:mach_msg_trap-1 + Memcheck:Param + msg->desc.port.name + fun:mach_msg_trap + obj:*libsystem_kernel.dylib* + obj:*SystemConfiguration.framework*SystemConfiguration* +} + +{ + OSX1012:mach_msg_trap-2 + Memcheck:Param + msg->desc.port.name + fun:mach_msg_trap + obj:*SystemConfiguration.framework*SystemConfiguration* + obj:*SystemConfiguration.framework*SystemConfiguration* +} + +# See https://bugs.kde.org/show_bug.cgi?id=188572 about this; it's +# unavoidable due to BSD setenv() semantics. +{ + macos-__setenv-leak-see-our-bug-188572 + Memcheck:Leak + match-leak-kinds: definite + fun:malloc + fun:_owned_ptr_alloc + fun:setenv +} + +# See https://bugs.kde.org/show_bug.cgi?id=196528 +{ +macos-__pthread_rwlock_init-see-our-bug-196528 +Memcheck:Cond +fun:pthread_rwlock_init +} diff --git a/include/vki/vki-scnums-darwin.h b/include/vki/vki-scnums-darwin.h index 94a48b344d..b775849670 100644 --- a/include/vki/vki-scnums-darwin.h +++ b/include/vki/vki-scnums-darwin.h @@ -756,6 +756,32 @@ /* 499 */ #endif /* DARWIN_VERS >= DARWIN_10_11 */ +// TODO Update with macOS 10.12 kernel (xnu) source code release +#if DARWIN_VERS >= DARWIN_10_12 + /* 500 */ + /* 501 */ + /* 502 */ + /* 503 */ + /* 504 */ + /* 505 */ + /* 506 */ + /* 507 */ + /* 508 */ + /* 509 */ + /* 510 */ + /* 511 */ + /* 512 */ + /* 513 */ + /* 514 */ + /* 515 */ + /* 516 */ + /* 517 */ + /* 518 */ + /* 519 */ + /* 520 */ + /* 521 */ +#endif /* DARWIN_VERS >= DARWIN_10_12 */ + #if DARWIN_VERS < DARWIN_10_6 #define __NR_MAXSYSCALL VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(427) #elif DARWIN_VERS < DARWIN_10_7 @@ -768,6 +794,9 @@ #define __NR_MAXSYSCALL VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(490) #elif DARWIN_VERS == DARWIN_10_11 #define __NR_MAXSYSCALL VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(500) +#elif DARWIN_VERS == DARWIN_10_12 +// TODO Confirm against final release +#define __NR_MAXSYSCALL VG_DARWIN_SYSCALL_CONSTRUCT_UNIX(522) #else #error unknown darwin version #endif