diff options
| author | njn <njn@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2009-05-28 01:53:07 +0000 |
|---|---|---|
| committer | njn <njn@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2009-05-28 01:53:07 +0000 |
| commit | f76d27a697a7b0bf3b84490baf60623fc96a23af (patch) | |
| tree | 682ff0946c0b8b501714e055ff1269c6b0bf5d91 /tests/asm.h | |
| parent | da8549df7939ee3024938cdd8a4cc64e6c2279b8 (diff) | |
| download | valgrind-f76d27a697a7b0bf3b84490baf60623fc96a23af.tar.gz | |
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
Diffstat (limited to 'tests/asm.h')
| -rw-r--r-- | tests/asm.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/asm.h b/tests/asm.h index 99f9cc5a5..e2c2524ed 100644 --- a/tests/asm.h +++ b/tests/asm.h @@ -5,7 +5,15 @@ // general, any symbol named in asm code should be wrapped by VG_SYM. // This one is for use in inline asm in C files. +#if defined(VGO_darwin) +#define VG_SYM(x) "_"#x +#else #define VG_SYM(x) #x +#endif // This one is for use in asm files. +#if defined(VGO_darwin) +#define VG_SYM_ASM(x) _##x +#else #define VG_SYM_ASM(x) x +#endif |