summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am1
-rw-r--r--README.QUICK8
-rw-r--r--doc/README.linux2
-rw-r--r--doc/README.sgi4
4 files changed, 7 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am
index ee99f001..e3230c1d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -209,7 +209,6 @@ CCASFLAGS += $(DEFS)
EXTRA_DIST += README.QUICK
# other makefiles
-# :GOTCHA: deliberately we do not include 'Makefile'
EXTRA_DIST += NT_MAKEFILE OS2_MAKEFILE PCR-Makefile digimars.mak \
Makefile.direct SMakefile.amiga WCC_MAKEFILE autogen.sh CMakeLists.txt \
Config.cmake.in build/s60v3/bld.inf build/s60v3/libgc.mmp
diff --git a/README.QUICK b/README.QUICK
index a188fbbd..f15767a5 100644
--- a/README.QUICK
+++ b/README.QUICK
@@ -80,10 +80,10 @@ Do not store the only pointer to an object in memory allocated
with system malloc, since the collector usually does not scan
memory allocated in this way.
-Use with threads may be supported on your system, but requires the
-collector to be built with thread support. See Makefile. The collector
-does not guarantee to scan thread-local storage (e.g. of the kind
-accessed with pthread_getspecific()). The collector does scan
+Use with threads may be supported on your system, but requires the collector
+to be built with thread support. See Makefile.am or Makefile.direct.
+The collector does not guarantee to scan thread-local storage (e.g. of the
+kind accessed with pthread_getspecific()). The collector does scan
thread stacks though, so generally the best solution is to ensure that
any pointers stored in thread-local storage are also stored on the
thread's stack for the duration of their lifetime.
diff --git a/doc/README.linux b/doc/README.linux
index 29084fa0..c9ced481 100644
--- a/doc/README.linux
+++ b/doc/README.linux
@@ -26,7 +26,7 @@ To use threads, you need to abide by the following requirements:
MIT pthreads).
2) You must compile the collector with "-DGC_THREADS -D_REENTRANT" specified
- in the Makefile.
+ in the Makefile.direct file.
3a) Every file that makes thread calls should define GC_THREADS, and then
include gc.h. The latter redefines some of the pthread primitives as
diff --git a/doc/README.sgi b/doc/README.sgi
index 88182d87..4258dce4 100644
--- a/doc/README.sgi
+++ b/doc/README.sgi
@@ -2,7 +2,7 @@ Performance of the incremental collector can be greatly enhanced with
-DNO_EXECUTE_PERMISSION.
The collector should run with all of the -32, -n32 and -64 ABIs. Remember to
-define the AS macro in the Makefile to be "as -64", or "as -n32".
+define the AS macro in the Makefile.direct to be "as -64", or "as -n32".
If you use -DREDIRECT_MALLOC=GC_malloc with C++ code, your code should make
at least one explicit call to malloc instead of new to ensure that the proper
@@ -12,7 +12,7 @@ Sproc threads are not supported.
Pthreads support is provided. This requires that:
-1) You compile the collector with -DGC_THREADS specified in the Makefile.
+1) You compile the collector with -DGC_THREADS specified in Makefile.direct.
2) You have the latest pthreads patches installed.