|
From: <sv...@va...> - 2015-03-26 10:14:32
|
Author: rhyskidd
Date: Thu Mar 26 10:14:25 2015
New Revision: 15038
Log:
Further fixes for bz#345394 specifically for OS X 10.10
Modified:
trunk/memcheck/tests/filter_strchr
trunk/shared/vg_replace_strmem.c
Modified: trunk/memcheck/tests/filter_strchr
==============================================================================
--- trunk/memcheck/tests/filter_strchr (original)
+++ trunk/memcheck/tests/filter_strchr Thu Mar 26 10:14:25 2015
@@ -4,4 +4,5 @@
./filter_stderr "$@" |
sed -e "s/: strchr (vg_replace_strmem.c:/: index (vg_replace_strmem.c:/;
s/: _platform_strchr (vg_replace_strmem.c:/: index (vg_replace_strmem.c:/;
+ s/: _platform_strchr\$VARIANT\$Generic (vg_replace_strmem.c:/: index (vg_replace_strmem.c:/;
s/: strrchr (vg_replace_strmem.c:/: rindex (vg_replace_strmem.c:/"
Modified: trunk/shared/vg_replace_strmem.c
==============================================================================
--- trunk/shared/vg_replace_strmem.c (original)
+++ trunk/shared/vg_replace_strmem.c Thu Mar 26 10:14:25 2015
@@ -204,7 +204,7 @@
//STRRCHR(VG_Z_DYLD, strrchr)
//STRRCHR(VG_Z_DYLD, rindex)
STRRCHR(VG_Z_LIBC_SONAME, strrchr)
-# if DARWIN_VERS == DARWIN_10_9
+# if DARWIN_VERS == DARWIN_10_9 || DARWIN_VERS == DARWIN_10_10
STRRCHR(libsystemZucZddylib, strrchr)
# endif
@@ -245,6 +245,10 @@
# if DARWIN_VERS == DARWIN_10_9
STRCHR(libsystemZuplatformZddylib, _platform_strchr)
# endif
+# if DARWIN_VERS == DARWIN_10_10
+ /* _platform_strchr$VARIANT$Generic */
+ STRCHR(libsystemZuplatformZddylib, _platform_strchr$VARIANT$Generic)
+# endif
#endif
|