merge revs
vg_libpthread.c 1.90.2.10
vg_libpthread_unimp.c 1.30.2.5
Implement (sort-of) pthread_attr_{set,get}guardsize.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@1240 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/coregrind/vg_libpthread_unimp.c b/coregrind/vg_libpthread_unimp.c
index 2184c77..95e08ee 100644
--- a/coregrind/vg_libpthread_unimp.c
+++ b/coregrind/vg_libpthread_unimp.c
@@ -223,16 +223,16 @@
__attribute__((weak)) void tcdrain ( void ) { vgPlain_unimp("tcdrain"); }
//--//__attribute__((weak)) void vfork ( void ) { vgPlain_unimp("vfork"); }
-__attribute__((weak)) void pthread_attr_getguardsize ( void )
- { vgPlain_unimp("pthread_attr_getguardsize"); }
+//__attribute__((weak)) void pthread_attr_getguardsize ( void )
+// { vgPlain_unimp("pthread_attr_getguardsize"); }
__attribute__((weak)) void pthread_attr_getstack ( void )
{ vgPlain_unimp("pthread_attr_getstack"); }
__attribute__((weak)) void pthread_attr_getstackaddr ( void )
{ vgPlain_unimp("pthread_attr_getstackaddr"); }
__attribute__((weak)) void pthread_attr_getstacksize ( void )
{ vgPlain_unimp("pthread_attr_getstacksize"); }
-__attribute__((weak)) void pthread_attr_setguardsize ( void )
- { vgPlain_unimp("pthread_attr_setguardsize"); }
+//__attribute__((weak)) void pthread_attr_setguardsize ( void )
+// { vgPlain_unimp("pthread_attr_setguardsize"); }
__attribute__((weak)) void pthread_attr_setstack ( void )
{ vgPlain_unimp("pthread_attr_setstack"); }
__attribute__((weak)) void pthread_attr_setstackaddr ( void )