2010-08-14 Ivan Maidanski <ivmai@mail.ru>

	* extra/threadlibs.c (main): Remove --wrap for "read" (since not
	wrapped anymore).
	* doc/README.linux (GC_USE_LD_WRAP): Ditto.
	* os_dep.c (__wrap_read): Ditto (in the comment).

diff --git a/ChangeLog b/ChangeLog
index 9a558a930f1b0f3ca425d777e881512429a8aeed..c6e11189e266c09082498f5bc9b9eb0ff8f9db63 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-14  Ivan Maidanski <ivmai@mail.ru>
+       * extra/threadlibs.c (main): Remove --wrap for "read" (since not
+       wrapped anymore).
+       * doc/README.linux (GC_USE_LD_WRAP): Ditto.
+       * os_dep.c (__wrap_read): Ditto (in the comment).
+
 2010-08-14  Ivan Maidanski <ivmai@mail.ru> (with help from Hans Boehm)
 
        * include/gc_pthread_redirects.h: Test GC_PTHREADS and GC_H at the

diff --git a/doc/README.linux b/doc/README.linux
index e462e711f22c2e2465192c93125e235fc8f5810a..dc0fa543dc2377f4f13c6e9c85b134e93d1dbfa0 100644 (file)
--- a/doc/README.linux
+++ b/doc/README.linux
@@ -37,14 +37,14 @@ To use threads, you need to abide by the following requirements:
 3b) A new alternative to (3a) is to build the collector and compile GC clients
    with -DGC_USE_LD_WRAP, and to link the final program with
 
-   (for ld) --wrap read --wrap dlopen --wrap pthread_create \
+   (for ld) --wrap dlopen --wrap pthread_create \
             --wrap pthread_join --wrap pthread_detach \
             --wrap pthread_sigmask --wrap pthread_exit --wrap pthread_cancel
 
-   (for gcc) -Wl,--wrap -Wl,read -Wl,--wrap -Wl,dlopen -Wl,--wrap \
-             -Wl,pthread_create -Wl,--wrap -Wl,pthread_join -Wl,--wrap \
-             -Wl,pthread_detach -Wl,--wrap -Wl,pthread_sigmask \
-             -Wl,--wrap -Wl,pthread_exit -Wl,--wrap -Wl,pthread_cancel
+   (for gcc) -Wl,--wrap -Wl,dlopen -Wl,--wrap -Wl,pthread_create \
+             -Wl,--wrap -Wl,pthread_join -Wl,--wrap -Wl,pthread_detach \
+             -Wl,--wrap -Wl,pthread_sigmask -Wl,--wrap -Wl,pthread_exit \
+             -Wl,--wrap -Wl,pthread_cancel
 
    In any case, _REENTRANT should be defined during compilation.
 

diff --git a/extra/threadlibs.c b/extra/threadlibs.c
index 5184ef88a9d8245baf84bf606938b49b7686b17c..aaf43e40245d639aa4dccc55a777160a60c4aa62 100644 (file)
--- a/extra/threadlibs.c
+++ b/extra/threadlibs.c
@@ -23,7 +23,7 @@
 int main(void)
 {
 #   if defined(GC_USE_LD_WRAP)
-        printf("-Wl,--wrap -Wl,read -Wl,--wrap -Wl,dlopen "
+        printf("-Wl,--wrap -Wl,dlopen "
                "-Wl,--wrap -Wl,pthread_create -Wl,--wrap -Wl,pthread_join "
                "-Wl,--wrap -Wl,pthread_detach -Wl,--wrap -Wl,pthread_sigmask "
                "-Wl,--wrap -Wl,pthread_exit -Wl,--wrap -Wl,pthread_cancel\n");

diff --git a/os_dep.c b/os_dep.c
index e7bb4a2872030acd07afb6db1227242e76e4366a..1a0f794f05fcc7ade298d7e40d2a90dea04d34de 100644 (file)
--- a/os_dep.c
+++ b/os_dep.c
@@ -3489,8 +3489,6 @@ ssize_t read(int fd, void *buf, size_t nbyte)
 
 #if defined(GC_USE_LD_WRAP) && !defined(THREADS)
     /* We use the GNU ld call wrapping facility.                        */
-    /* This requires that the linker be invoked with "--wrap read".     */
-    /* This can be done by passing -Wl,"--wrap read" to gcc.            */
     /* I'm not sure that this actually wraps whatever version of read   */
     /* is called by stdio.  That code also mentions __read.             */
 #   include <unistd.h>