Added a couple of small #ifdefs so that Valgrind works with Erik Anderson's

uClibc (micro libc, a small alternative to glibc).

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

diff --git a/coregrind/arch/x86-linux/vg_libpthread.c b/coregrind/arch/x86-linux/vg_libpthread.c
index b5d3c46ccb0c332312df4e9fa0fac0b0c0ec3f1d..ee194fc1106455d50a28938cd1dd63fbd1b20bf8 100644 (file)
--- a/coregrind/arch/x86-linux/vg_libpthread.c
+++ b/coregrind/arch/x86-linux/vg_libpthread.c
@@ -3123,6 +3123,7 @@ weak_alias(pthread_rwlock_trywrlock, __pthread_rwlock_trywrlock)
 /* I've no idea what these are, but they get called quite a lot.
    Anybody know? */
 
+#ifndef __UCLIBC__
 #undef _IO_flockfile
 void _IO_flockfile ( _IO_FILE * file )
 {
@@ -3130,13 +3131,13 @@ void _IO_flockfile ( _IO_FILE * file )
 }
 weak_alias(_IO_flockfile, flockfile);
 
-
 #undef _IO_funlockfile
 void _IO_funlockfile ( _IO_FILE * file )
 {
    pthread_mutex_unlock(file->_lock);
 }
 weak_alias(_IO_funlockfile, funlockfile);
+#endif
 
 
 /* This doesn't seem to be needed to simulate libpthread.so's external

diff --git a/coregrind/vg_intercept.c b/coregrind/vg_intercept.c
index 3a024ddbf1575d5e8c13b917cd5c54a34f3e6935..6497f224371c7be875e32d72bdc0caaf89de78c5 100644 (file)
--- a/coregrind/vg_intercept.c
+++ b/coregrind/vg_intercept.c
@@ -827,8 +827,10 @@ pid_t waitpid(pid_t pid, int *status, int options)
 void VG_(__libc_freeres_wrapper)( void )
 {
    int res;
+#ifndef __UCLIBC__
    extern void __libc_freeres(void);
    __libc_freeres();
+#endif
    VALGRIND_MAGIC_SEQUENCE(res, 0 /* default */,
                            VG_USERREQ__LIBC_FREERES_DONE, 0, 0, 0, 0);
    /*NOTREACHED*/

diff --git a/coregrind/vg_libpthread.c b/coregrind/vg_libpthread.c
index b5d3c46ccb0c332312df4e9fa0fac0b0c0ec3f1d..ee194fc1106455d50a28938cd1dd63fbd1b20bf8 100644 (file)
--- a/coregrind/vg_libpthread.c
+++ b/coregrind/vg_libpthread.c
@@ -3123,6 +3123,7 @@ weak_alias(pthread_rwlock_trywrlock, __pthread_rwlock_trywrlock)
 /* I've no idea what these are, but they get called quite a lot.
    Anybody know? */
 
+#ifndef __UCLIBC__
 #undef _IO_flockfile
 void _IO_flockfile ( _IO_FILE * file )
 {
@@ -3130,13 +3131,13 @@ void _IO_flockfile ( _IO_FILE * file )
 }
 weak_alias(_IO_flockfile, flockfile);
 
-
 #undef _IO_funlockfile
 void _IO_funlockfile ( _IO_FILE * file )
 {
    pthread_mutex_unlock(file->_lock);
 }
 weak_alias(_IO_funlockfile, funlockfile);
+#endif
 
 
 /* This doesn't seem to be needed to simulate libpthread.so's external