diff options
| author | sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2014-11-07 00:08:13 +0000 |
|---|---|---|
| committer | sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2014-11-07 00:08:13 +0000 |
| commit | 312bcb109bfb6899086dda47b02a5436f26516d4 (patch) | |
| tree | 1575ed4b49ea2f0b1bd3dc198cb7a2b6aaa36d80 /shared | |
| parent | 1889f77bf847e01be92c46bcceec15ea610f860c (diff) | |
| download | valgrind-312bcb109bfb6899086dda47b02a5436f26516d4.tar.gz | |
Add some Mac OSX 10.10 specific wrappers.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14703 a5019735-40e9-0310-863c-91ae7b9d1cf9
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/vg_replace_strmem.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/shared/vg_replace_strmem.c b/shared/vg_replace_strmem.c index 8f699db14..79f842092 100644 --- a/shared/vg_replace_strmem.c +++ b/shared/vg_replace_strmem.c @@ -427,7 +427,7 @@ static inline void my_exit ( int x ) #elif defined(VGO_darwin) STRLEN(VG_Z_LIBC_SONAME, strlen) -# if DARWIN_VERS == DARWIN_10_9 +# if DARWIN_VERS == DARWIN_10_9 || DARWIN_VERS == DARWIN_10_10 STRLEN(libsystemZucZddylib, strlen) # endif #endif @@ -501,7 +501,7 @@ static inline void my_exit ( int x ) #elif defined(VGO_darwin) STRNCPY(VG_Z_LIBC_SONAME, strncpy) -# if DARWIN_VERS == DARWIN_10_9 +# if DARWIN_VERS == DARWIN_10_9 || DARWIN_VERS == DARWIN_10_10 STRNCPY(libsystemZucZddylib, strncpy) # endif @@ -773,7 +773,7 @@ static inline void my_exit ( int x ) #elif defined(VGO_darwin) STRCMP(VG_Z_LIBC_SONAME, strcmp) -# if DARWIN_VERS == DARWIN_10_9 +# if DARWIN_VERS == DARWIN_10_9 || DARWIN_VERS == DARWIN_10_10 STRCMP(libsystemZuplatformZddylib, _platform_strcmp) # endif @@ -805,6 +805,10 @@ static inline void my_exit ( int x ) MEMCHR(VG_Z_DYLD, memchr) MEMCHR(libsystemZuplatformZddylib, _platform_memchr) # endif +# if DARWIN_VERS == DARWIN_10_10 + /* _platform_memchr$VARIANT$Generic */ + MEMCHR(libsystemZuplatformZddylib, _platform_memchr$VARIANT$Generic) +# endif #endif @@ -982,7 +986,7 @@ static inline void my_exit ( int x ) MEMCMP(VG_Z_LD_SO_1, bcmp) #elif defined(VGO_darwin) -# if DARWIN_VERS == DARWIN_10_9 +# if DARWIN_VERS == DARWIN_10_9 || DARWIN_VERS == DARWIN_10_10 MEMCMP(libsystemZuplatformZddylib, _platform_memcmp) # endif @@ -1123,8 +1127,8 @@ static inline void my_exit ( int x ) # endif MEMMOVE(VG_Z_LIBC_SONAME, memmoveZDVARIANTZDsse3x) /* memmove$VARIANT$sse3x */ MEMMOVE(VG_Z_LIBC_SONAME, memmoveZDVARIANTZDsse42) /* memmove$VARIANT$sse42 */ -# if DARWIN_VERS == DARWIN_10_9 - /* _platform_memmove$VARIANT$Nehalem */ +# if DARWIN_VERS == DARWIN_10_9 || DARWIN_VERS == DARWIN_10_10 + /* _platform_memmove$VARIANT$Ivybridge */ MEMMOVE(libsystemZuplatformZddylib, ZuplatformZumemmoveZDVARIANTZDIvybridge) # endif #endif |