From: Julian Seward Date: Thu, 6 Nov 2014 20:16:05 +0000 (+0000) Subject: Build system changes to enable building on MacOS X 10.10 (Yosemite). X-Git-Tag: svn/VALGRIND_3_11_0~853 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca44cf32c396f31c54ac01870700f47326b73b97;p=thirdparty%2Fvalgrind.git Build system changes to enable building on MacOS X 10.10 (Yosemite). See bug 339045. Part of a patch from fxcoudert@gcc.gnu.org. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14695 --- diff --git a/Makefile.am b/Makefile.am index 5c93ed056a..d35fd36d34 100644 --- a/Makefile.am +++ b/Makefile.am @@ -45,7 +45,7 @@ SUPP_FILES = \ exp-sgcheck.supp \ darwin9.supp darwin9-drd.supp \ darwin10.supp darwin10-drd.supp \ - darwin11.supp darwin12.supp darwin13.supp \ + darwin11.supp darwin12.supp darwin13.supp darwin14.supp \ bionic.supp DEFAULT_SUPP_FILES = @DEFAULT_SUPP@ diff --git a/configure.ac b/configure.ac index 410b9d72f2..69c28d5681 100644 --- a/configure.ac +++ b/configure.ac @@ -350,6 +350,7 @@ case "${host_os}" in AC_DEFINE([DARWIN_10_7], 100700, [DARWIN_VERS value for Mac OS X 10.7]) AC_DEFINE([DARWIN_10_8], 100800, [DARWIN_VERS value for Mac OS X 10.8]) 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_MSG_CHECKING([for the kernel version]) kernel=`uname -r` @@ -401,9 +402,15 @@ case "${host_os}" in DEFAULT_SUPP="darwin13.supp ${DEFAULT_SUPP}" DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" ;; + 14.*) + AC_MSG_RESULT([Darwin 14.x (${kernel}) / Mac OS X 10.10 Yosemite]) + AC_DEFINE([DARWIN_VERS], DARWIN_10_10, [Darwin / Mac OS X version]) + DEFAULT_SUPP="darwin14.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 and 13.x (Mac OS X 10.6/7/8/9)]) + AC_MSG_ERROR([Valgrind works on Darwin 10.x, 11.x, 12.x, 13.x and 14.x (Mac OS X 10.6/7/8/9/10)]) ;; esac ;; diff --git a/darwin14.supp b/darwin14.supp new file mode 100644 index 0000000000..1575048394 --- /dev/null +++ b/darwin14.supp @@ -0,0 +1,269 @@ + +# Suppressions for Darwin 14.x / Mac OS X 10.10 Yosemite + +############################################ +## Leaks. For other stuff see below. + +#{ +# OSX1010:1-Leak +# Memcheck:Leak +# match-leak-kinds: possible +# fun:malloc_zone_?alloc +# ... +# fun:_read_images +#} +# +#{ +# OSX1010:2-Leak +# Memcheck:Leak +# match-leak-kinds: definite +# fun:?alloc +# ... +# fun:_ZN4dyld24initializeMainExecutableEv +#} +# +#{ +# OSX1010:3-Leak +# Memcheck:Leak +# match-leak-kinds: definite +# fun:malloc_zone_?alloc +# fun:recursive_mutex_init +# fun:_objc_init +# fun:_os_object_init +# fun:libSystem_initializer +# ... +#} +# +#{ +# OSX1010:4-Leak +# Memcheck:Leak +# match-leak-kinds: reachable +# fun:malloc_zone_?alloc +# ... +# fun:dyld_register_image_state_change_handler +# ... +#} +# +#{ +# OSX1010:5-Leak +# Memcheck:Leak +# match-leak-kinds: reachable +# fun:?alloc +# ... +# fun:dyld_register_image_state_change_handler +# ... +#} +# +#{ +# OSX1010:6-Leak +# Memcheck:Leak +# match-leak-kinds: reachable +# fun:malloc_zone_?alloc +# ... +# fun:map_images_nolock +# fun:map_images +# ... +#} +# +#{ +# OSX1010:7-Leak +# Memcheck:Leak +# match-leak-kinds: possible +# fun:malloc_zone_?alloc +# ... +# fun:map_images_nolock +# fun:map_images +# ... +#} +# +#{ +# OSX1010:8-Leak +# Memcheck:Leak +# match-leak-kinds: indirect +# fun:?alloc +# ... +# fun:libSystem_initializer +# ... +#} +# +#{ +# OSX1010:9-Leak +# Memcheck:Leak +# match-leak-kinds: reachable +# fun:malloc_zone_?alloc +# ... +# fun:libSystem_initializer +# ... +#} +# +#{ +# OSX1010:10-Leak +# Memcheck:Leak +# match-leak-kinds: reachable +# fun:?alloc +# ... +# fun:libSystem_initializer +# ... +#} +# +#{ +# OSX1010:11-Leak +# Memcheck:Leak +# match-leak-kinds: definite +# fun:malloc +# fun:currentlocale +#} +# +#{ +# OSX1010:12-Leak +# Memcheck:Leak +# match-leak-kinds: possible +# fun:malloc +# fun:tzsetwall_basic +# fun:_st_tzset_basic +#} + +############################################ +## Non-leak errors + +#{ +# OSX1010:AppKit-1 +# Memcheck:Cond +# obj:*AppKit.framework*AppKit* +# obj:*AppKit.framework*AppKit* +# obj:*AppKit.framework*AppKit* +#} +# +#{ +# OSX1010:AppKit-2 +# Memcheck:Cond +# obj:*AppKit.framework*AppKit* +# obj:*AppKit.framework*AppKit* +# obj:*libdispatch.dylib* +#} +# +#{ +# OSX1010:AppKit-3 +# Memcheck:Cond +# obj:*AppKit.framework*AppKit* +# obj:*libdispatch.dylib* +# obj:*libdispatch.dylib* +#} +# +#{ +# OSX1010:ColorSync-1 +# Memcheck:Cond +# obj:*ColorSync.framework*ColorSync* +# obj:*ColorSync.framework*ColorSync* +# obj:*ColorSync.framework*ColorSync* +#} +# +#{ +# OSX1010:ColorSync-2 +# Memcheck:Value8 +# obj:*ColorSync.framework*ColorSync* +# obj:*ColorSync.framework*ColorSync* +# obj:*ColorSync.framework*ColorSync* +#} +# +#{ +# OSX1010:CoreGraphics-1 +# Memcheck:Cond +# obj:*CoreGraphics.framework*CoreGraphics* +# obj:*CoreGraphics.framework*CoreGraphics* +# obj:*CoreGraphics.framework*CoreGraphics* +#} +# +#{ +# OSX1010:CoreGraphics-2 +# Memcheck:Value8 +# obj:*CoreGraphics.framework*CoreGraphics* +# obj:*CoreGraphics.framework*CoreGraphics* +# obj:*CoreGraphics.framework*CoreGraphics* +#} +# +#{ +# OSX1010:CoreGraphics-3 +# Memcheck:Cond +# obj:*CoreGraphics.framework*CoreGraphics* +# obj:*CoreGraphics.framework*libRIP* +# obj:*CoreGraphics.framework*libRIP* +#} +# +#{ +# OSX1010:CoreGraphics-4 +# Memcheck:Cond +# obj:*CoreGraphics.framework*CoreGraphics* +# obj:*CoreGraphics.framework*CoreGraphics* +# obj:*CoreGraphics.framework*libRIP* +#} +# +#{ +# OSX1010:CoreGraphics-5 +# Memcheck:Cond +# obj:*CoreGraphics.framework*CoreGraphics* +# obj:*libdispatch.dylib* +# obj:*libdispatch.dylib* +#} +# +#{ +# OSX1010:dyld-2 +# Memcheck:Cond +# obj:/usr/lib/dyld +# obj:/usr/lib/dyld +# obj:/usr/lib/dyld +#} +# +#{ +# OSX1010:HIServices-1 +# Memcheck:Cond +# obj:*HIServices.framework*HIServices* +# obj:*HIToolbox.framework*HIToolbox* +# obj:*HIToolbox.framework*HIToolbox* +#} +# +#{ +# OSX1010:LaunchServices-1 +# Memcheck:Cond +# obj:*LaunchServices.framework*LaunchServices* +# obj:*AppKit.framework*AppKit* +# obj:*AppKit.framework*AppKit* +#} +# +#{ +# OSX1010:QuartzCore-1 +# Memcheck:Cond +# obj:*QuartzCore.framework*QuartzCore +# obj:*QuartzCore.framework*QuartzCore +# obj:*QuartzCore.framework*QuartzCore +#} +# +#{ +# OSX1010:vImage-1 +# Memcheck:Cond +# obj:*vImage.framework*vImage* +# obj:*vImage.framework*vImage* +# obj:*CoreGraphics.framework*CoreGraphics* +#} +# +#{ +# OSX1010:zlib-C +# Memcheck:Cond +# obj:/usr/lib/libz.*dylib +# obj:/usr/lib/libz.*dylib +#} +# +#{ +# OSX1010:zlib-8 +# Memcheck:Value8 +# obj:/usr/lib/libz.*dylib +# obj:/usr/lib/libz.*dylib +#} +# +#{ +# OSX1010:32bit:_libxpc_initializer +# Memcheck:Cond +# fun:_libxpc_initializer +# fun:libSystem_initializer +# fun:*ImageLoaderMachO*doModInitFunctions* +#}