diff options
| author | njn <njn@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2009-02-10 04:23:41 +0000 |
|---|---|---|
| committer | njn <njn@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2009-02-10 04:23:41 +0000 |
| commit | e61546621e9bca129420399d7c552f8f63c93509 (patch) | |
| tree | 161144afcab0383c137eab3b1ac5e0f955786343 /drd/drd_strmem_intercepts.c | |
| parent | 618ce21f5e07aab751835d8d7f5509a114931d2f (diff) | |
Merge part of r9129 (factor out duplicated Z-encodings of names) from the
DARWIN branch.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@9130 a5019735-40e9-0310-863c-91ae7b9d1cf9
Diffstat (limited to 'drd/drd_strmem_intercepts.c')
| -rw-r--r-- | drd/drd_strmem_intercepts.c | 31 |
1 files changed, 4 insertions, 27 deletions
diff --git a/drd/drd_strmem_intercepts.c b/drd/drd_strmem_intercepts.c index 3eaccac1..a40057e4 100644 --- a/drd/drd_strmem_intercepts.c +++ b/drd/drd_strmem_intercepts.c @@ -38,29 +38,6 @@ #include "valgrind.h" -/* --------- Some handy Z-encoded names. --------- */ - -/* --- Soname of the standard C library. --- */ - -#if defined(VGO_linux) -# define m_libc_soname libcZdsoZa // libc.so* -#elif defined(VGP_ppc32_aix5) - /* AIX has both /usr/lib/libc.a and /usr/lib/libc_r.a. */ -# define m_libc_soname libcZaZdaZLshrZdoZR // libc*.a(shr.o) -#elif defined(VGP_ppc64_aix5) -# define m_libc_soname libcZaZdaZLshrZu64ZdoZR // libc*.a(shr_64.o) -#else -# error "Unknown platform" -#endif - -/* --- Sonames for Linux ELF linkers. --- */ - -#define m_ld_linux_so_2 ldZhlinuxZdsoZd2 // ld-linux.so.2 -#define m_ld_linux_x86_64_so_2 ldZhlinuxZhx86Zh64ZdsoZd2 // ld-linux-x86-64.so.2 -#define m_ld64_so_1 ld64ZdsoZd1 // ld64.so.1 -#define m_ld_so_1 ldZdsoZd1 // ld.so.1 - - #define STRNLEN(soname, fnname) \ SizeT VG_REPLACE_FUNCTION_ZU(soname,fnname) ( const char* str, SizeT n ); \ SizeT VG_REPLACE_FUNCTION_ZU(soname,fnname) ( const char* str, SizeT n ) \ @@ -70,7 +47,7 @@ return i; \ } -STRNLEN(m_libc_soname, strnlen) +STRNLEN(VG_Z_LIBC_SONAME, strnlen) // Note that this replacement often doesn't get used because gcc inlines @@ -86,9 +63,9 @@ STRNLEN(m_libc_soname, strnlen) return i; \ } -STRLEN(m_libc_soname, strlen) -STRLEN(m_ld_linux_so_2, strlen) -STRLEN(m_ld_linux_x86_64_so_2, strlen) +STRLEN(VG_Z_LIBC_SONAME, strlen) +STRLEN(VG_Z_LD_LINUX_SO_2, strlen) +STRLEN(VG_Z_LD_LINUX_X86_64_SO_2, strlen) /*--------------------------------------------------------------------*/ /*--- end ---*/ |