Make statically initialised read-write locks work.

BUG: 91604

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2790

diff --git a/coregrind/vg_libpthread.c b/coregrind/vg_libpthread.c
index 29ed6af7ab2b5af951735837ec53d66ad6f82ccc..18a3d566c3b9728d66b495003c084ee3ded3471b 100644 (file)
--- a/coregrind/vg_libpthread.c
+++ b/coregrind/vg_libpthread.c
@@ -3063,7 +3063,7 @@ static vg_rwlock_t* rw_lookup ( pthread_rwlock_t* orig )
    CONVERT(rwlock, orig, vg_orig);
 
    if (vg_orig->__vg_rw_writer == NULL)
-      rwl = rw_new (orig);
+      rwl = rw_new ((pthread_rwlock_t*)orig);
    else if (((Addr)vg_orig->__vg_rw_writer ^ RWLOCK_CHECK_MAGIC) == (Addr)vg_orig->__vg_rw_read_waiting)
       rwl = vg_orig->__vg_rw_writer;
    else

diff --git a/coregrind/vg_replace_malloc.c.base b/coregrind/vg_replace_malloc.c.base
index 9069984e9d2cd1b91cc6b7e0bb0b87658e1aeffe..5b38b46a245d8d9483d8fa035a9873c64ec935cb 100644 (file)
--- a/coregrind/vg_replace_malloc.c.base
+++ b/coregrind/vg_replace_malloc.c.base
@@ -57,6 +57,12 @@
    ret VG_INTERCEPT(soname:libc.so.6, __##name) args \
       __attribute__((alias(VG_INTERCEPT_ALIAS(soname:libc.so.6, ##name)), \
                      visibility("protected"))); \
+   ret VG_INTERCEPT(soname:libstdc++*, __##name##_internal) args \
+      __attribute__((alias(VG_INTERCEPT_ALIAS(soname:libc.so.6, ##name)), \
+                     visibility("protected"))); \
+   ret VG_INTERCEPT(soname:libc.so.6, __##name##_internal) args \
+      __attribute__((alias(VG_INTERCEPT_ALIAS(soname:libc.so.6, ##name)), \
+                     visibility("protected"))); \
    ret VG_INTERCEPT(soname:libstdc++*, ##name) args \
       __attribute__((alias(VG_INTERCEPT_ALIAS(soname:libc.so.6, ##name)), \
                      visibility("protected"))); \