PERFORCE change 167722 for review

[Stanislav Sedov]

http://perforce.freebsd.org/chv.cgi?CH=167722

Change 167722 by stas at stas_yandex on 2009/08/24 11:20:32

	- Perform memory functions replacements for FreeBSD rtld.

Affected files ...

.. //depot/projects/valgrind/memcheck/mc_replace_strmem.c#7 edit

Differences ...

==== //depot/projects/valgrind/memcheck/mc_replace_strmem.c#7 (text+ko) ====

@@ -116,6 +116,9 @@
 STRRCHR(VG_Z_LIBC_SONAME,   rindex)
 #if defined(VGO_linux)
 STRRCHR(VG_Z_LD_LINUX_SO_2, rindex)
+#elif defined(VGO_freebsd)
+STRRCHR(VG_Z_LD_ELF_SO_1, strrchr)
+STRRCHR(VG_Z_LD_ELF32_SO_1, strrchr)
 #elif defined(VGO_darwin)
 STRRCHR(VG_Z_DYLD,          strrchr)
 STRRCHR(VG_Z_DYLD,          rindex)
@@ -143,6 +146,9 @@
 STRCHR(VG_Z_LD_LINUX_SO_2,        index)
 STRCHR(VG_Z_LD_LINUX_X86_64_SO_2, strchr)
 STRCHR(VG_Z_LD_LINUX_X86_64_SO_2, index)
+#elif defined(VGO_freebsd)
+STRCHR(VG_Z_LD_ELF_SO_1, strchr)
+STRCHR(VG_Z_LD_ELF32_SO_1, strchr)
 #elif defined(VGO_darwin)
 STRCHR(VG_Z_DYLD,                 strchr)
 STRCHR(VG_Z_DYLD,                 index)
@@ -171,6 +177,10 @@
    }
 
 STRCAT(VG_Z_LIBC_SONAME, strcat)
+#if defined(VGO_freebsd)
+STRCAT(VG_Z_LD_ELF_SO_1, strcat)
+STRCAT(VG_Z_LD_ELF32_SO_1, strcat)
+#endif
 
 
 #define STRNCAT(soname, fnname) \
@@ -243,6 +253,9 @@
 #if defined(VGO_darwin)
 STRLCAT(VG_Z_LIBC_SONAME, strlcat)
 STRLCAT(VG_Z_DYLD,        strlcat)
+#elif defined(VGO_freebsd)
+STRLCAT(VG_Z_LD_ELF_SO_1, strlcat)
+STRLCAT(VG_Z_LD_ELF32_SO_1, strlcat)
 #endif
 
 
@@ -275,6 +288,9 @@
 #if defined(VGO_linux)
 STRLEN(VG_Z_LD_LINUX_SO_2,        strlen)
 STRLEN(VG_Z_LD_LINUX_X86_64_SO_2, strlen)
+#elif defined(VGO_freebsd)
+STRLEN(VG_Z_LD_ELF_SO_1, strlen)
+STRLEN(VG_Z_LD_ELF32_SO_1, strlen)
 #endif
 
 
@@ -302,6 +318,9 @@
 STRCPY(VG_Z_LIBC_SONAME, strcpy)
 #if defined(VGO_darwin)
 STRCPY(VG_Z_DYLD,        strcpy)
+#elif defined(VGO_freebsd)
+STRCPY(VG_Z_LD_ELF_SO_1, strcpy)
+STRCPY(VG_Z_LD_ELF32_SO_1, strcpy)
 #endif
 
 
@@ -328,6 +347,9 @@
 STRNCPY(VG_Z_LIBC_SONAME, strncpy)
 #if defined(VGO_darwin)
 STRNCPY(VG_Z_DYLD,        strncpy)
+#elif defined(VGO_freebsd)
+STRNCPY(VG_Z_LD_ELF_SO_1, strncpy)
+STRNCPY(VG_Z_LD_ELF32_SO_1, strncpy)
 #endif
 
 
@@ -359,6 +381,9 @@
 #if defined(VGO_darwin)
 STRLCPY(VG_Z_LIBC_SONAME, strlcpy)
 STRLCPY(VG_Z_DYLD,        strlcpy)
+#elif defined(VGO_freebsd)
+STRLCPY(VG_Z_LD_ELF_SO_1, strlcpy)
+STRLCPY(VG_Z_LD_ELF32_SO_1, strlcpy)
 #endif
 
 
@@ -385,6 +410,9 @@
 STRNCMP(VG_Z_LIBC_SONAME, strncmp)
 #if defined(VGO_darwin)
 STRNCMP(VG_Z_DYLD,        strncmp)
+#elif defined(VGO_freebsd)
+STRNCMP(VG_Z_LD_ELF_SO_1, strncmp)
+STRNCMP(VG_Z_LD_ELF32_SO_1, strncmp)
 #endif
 
 
@@ -412,6 +440,9 @@
 #if defined(VGO_linux)
 STRCMP(VG_Z_LD_LINUX_X86_64_SO_2, strcmp)
 STRCMP(VG_Z_LD64_SO_1,            strcmp)
+#elif defined(VGO_freebsd)
+STRCMP(VG_Z_LD_ELF_SO_1, strcmp)
+STRCMP(VG_Z_LD_ELF32_SO_1, strcmp)
 #endif
 
 
@@ -430,6 +461,9 @@
 MEMCHR(VG_Z_LIBC_SONAME, memchr)
 #if defined(VGO_darwin)
 MEMCHR(VG_Z_DYLD,        memchr)
+#elif defined(VGO_freebsd)
+MEMCHR(VG_Z_LD_ELF_SO_1, memchr)
+MEMCHR(VG_Z_LD_ELF32_SO_1, memchr)
 #endif
 
 
@@ -482,6 +516,9 @@
 #if defined(VGO_linux)
 MEMCPY(VG_Z_LD_SO_1,     memcpy) /* ld.so.1 */
 MEMCPY(VG_Z_LD64_SO_1,   memcpy) /* ld64.so.1 */
+#elif defined(VGO_freebsd)
+MEMCPY(VG_Z_LD_ELF_SO_1, memcpy)
+MEMCPY(VG_Z_LD_ELF32_SO_1, memcpy)
 #elif defined(VGO_darwin)
 MEMCPY(VG_Z_DYLD,        memcpy)
 #endif
@@ -558,6 +595,9 @@
 #if defined(VGO_linux)
 STPCPY(VG_Z_LD_LINUX_SO_2,        stpcpy)
 STPCPY(VG_Z_LD_LINUX_X86_64_SO_2, stpcpy)
+#elif defined(VGO_freebsd)
+STPCPY(VG_Z_LD_ELF_SO_1, stpcpy)
+STPCPY(VG_Z_LD_ELF32_SO_1, stpcpy)
 #elif defined(VGO_darwin)
 STPCPY(VG_Z_DYLD,                 stpcpy)
 #endif
@@ -585,6 +625,9 @@
 MEMSET(VG_Z_LIBC_SONAME, memset)
 #if defined(VGO_darwin)
 MEMSET(VG_Z_DYLD,        memset)
+#elif defined(VGO_freebsd)
+MEMSET(VG_Z_LD_ELF_SO_1, memset)
+MEMSET(VG_Z_LD_ELF32_SO_1, memset)
 #endif
 
 
@@ -612,6 +655,9 @@
 MEMMOVE(VG_Z_LIBC_SONAME, memmove)
 #if defined(VGO_darwin)
 MEMMOVE(VG_Z_DYLD,        memmove)
+#elif defined(VGO_freebsd)
+MEMMOVE(VG_Z_LD_ELF_SO_1, memmove)
+MEMMOVE(VG_Z_LD_ELF32_SO_1, memmove)
 #endif
 
 
@@ -638,6 +684,9 @@
 #if defined(VGO_darwin)
 BCOPY(VG_Z_LIBC_SONAME, bcopy)
 BCOPY(VG_Z_DYLD,        bcopy)
+#elif defined(VGO_freebsd)
+BCOPY(VG_Z_LD_ELF_SO_1, bcopy)
+BCOPY(VG_Z_LD_ELF32_SO_1, bcopy)
 #endif