Merge the DARWIN branch onto the trunk.
I tried using 'svn merge' to do the merge but it did a terrible job and
there were bazillions of conflicts. So instead I just took the diff between
the branch and trunk at r10155, applied the diff to the trunk, 'svn add'ed
the added files (no files needed to be 'svn remove'd) and committed.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10156 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/include/pub_tool_basics_asm.h b/include/pub_tool_basics_asm.h
index 201c1b5..42a8a31 100644
--- a/include/pub_tool_basics_asm.h
+++ b/include/pub_tool_basics_asm.h
@@ -48,8 +48,15 @@
#define VGAPPEND(str1,str2) str1##str2
-#define VG_(str) VGAPPEND(vgPlain_, str)
-#define ML_(str) VGAPPEND(vgModuleLocal_, str)
+#if defined(VGO_linux) || defined(VGO_aix5)
+# define VG_(str) VGAPPEND( vgPlain_, str)
+# define ML_(str) VGAPPEND( vgModuleLocal_, str)
+#elif defined(VGO_darwin)
+# define VG_(str) VGAPPEND(_vgPlain_, str)
+# define ML_(str) VGAPPEND(_vgModuleLocal_, str)
+#else
+# error Unknown OS
+#endif
#endif /* __PUB_TOOL_BASICS_ASM_H */