aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9>2014-06-21 09:37:46 +0000
committersewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9>2014-06-21 09:37:46 +0000
commit34ffca6aec7d1e6f18d468cd5849e3e95226fcb6 (patch)
tree2c87604834b942bcc2c1e1697399a47d1ad03ad3
parent5601807cc746c423560406f5e98f11d7174b3c7b (diff)
downloadvalgrind-34ffca6aec7d1e6f18d468cd5849e3e95226fcb6.tar.gz
Whitespace and comment-only changes. No functional change.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14072 a5019735-40e9-0310-863c-91ae7b9d1cf9
-rw-r--r--include/pub_tool_redir.h15
1 files changed, 12 insertions, 3 deletions
diff --git a/include/pub_tool_redir.h b/include/pub_tool_redir.h
index 0a679e138..94b8766ee 100644
--- a/include/pub_tool_redir.h
+++ b/include/pub_tool_redir.h
@@ -246,11 +246,19 @@
#elif defined(VGO_darwin) && (DARWIN_VERS <= DARWIN_10_6)
# define VG_Z_LIBC_SONAME libSystemZdZaZddylib // libSystem.*.dylib
-#elif defined(VGO_darwin) && (DARWIN_VERS == DARWIN_10_7 || DARWIN_VERS == DARWIN_10_8)
+#elif defined(VGO_darwin) && (DARWIN_VERS == DARWIN_10_7 \
+ || DARWIN_VERS == DARWIN_10_8)
# define VG_Z_LIBC_SONAME libsystemZucZaZddylib // libsystem_c*.dylib
+ /* Note that the idea of a single name for the C library falls
+ apart on more recent Darwins (10.8 and later) since the
+ functionality (malloc, free, str*) is split between
+ libsystem_c.dylib, libsystem_malloc.dylib and
+ libsystem_platform.dylib. This makes VG_Z_LIBC_SONAME somewhat useless
+ at least inside vg_replace_strmem.c, and that hardwires some dylib
+ names directly, for OSX 10.9. */
#elif defined(VGO_darwin) && (DARWIN_VERS >= DARWIN_10_9)
-# define VG_Z_LIBC_SONAME libsystemZumallocZddylib // libsystem_malloc.dylib
+# define VG_Z_LIBC_SONAME libsystemZumallocZddylib // libsystem_malloc.dylib
#else
# error "Unknown platform"
@@ -282,7 +290,8 @@
#define VG_Z_LD_LINUX_SO_2 ldZhlinuxZdsoZd2 // ld-linux.so.2
#define VG_U_LD_LINUX_SO_2 "ld-linux.so.2"
-#define VG_Z_LD_LINUX_X86_64_SO_2 ldZhlinuxZhx86Zh64ZdsoZd2 // ld-linux-x86-64.so.2
+#define VG_Z_LD_LINUX_X86_64_SO_2 ldZhlinuxZhx86Zh64ZdsoZd2
+ // ld-linux-x86-64.so.2
#define VG_U_LD_LINUX_X86_64_SO_2 "ld-linux-x86-64.so.2"
#define VG_Z_LD64_SO_1 ld64ZdsoZd1 // ld64.so.1