summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Maidanski <ivmai@mail.ru>2021-11-03 09:09:56 +0300
committerIvan Maidanski <ivmai@mail.ru>2021-12-21 11:50:08 +0300
commit210d43b4d1d72c689dbfba287464fdf95e1ce3ed (patch)
treea1aa7e542e5b58835e1892866c09115f7bb16e4b
parent3549f188f8d5bf0570577431345bcbf9073705bb (diff)
downloadbdwgc-210d43b4d1d72c689dbfba287464fdf95e1ce3ed.tar.gz
Refer to Makefile.direct instead of deleted Makefile file in README
(a cherry-pick of commit bede37028 from 'release-8_0') * Makefile.am (EXTRA_DIST): Remove outdated comment exclusion of "Makefile" file. * README.QUICK (WARNINGS): Mention "Makefile.am or Makefile.direct" instead of "Makefile". * doc/README.linux: Mention "Makefile.direct" instead of "Makefile". * doc/README.sgi: Likewise.
-rw-r--r--Makefile.am1
-rw-r--r--README.QUICK8
-rw-r--r--doc/README.linux2
-rw-r--r--doc/README.sgi5
4 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am
index c9ec6766..e9067a04 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -187,7 +187,6 @@ CCASFLAGS += $(DEFS)
EXTRA_DIST += README.QUICK
# other makefiles
-# :GOTCHA: deliberately we do not include 'Makefile'
EXTRA_DIST += BCC_MAKEFILE NT_MAKEFILE \
OS2_MAKEFILE PCR-Makefile digimars.mak EMX_MAKEFILE \
Makefile.direct Makefile.dj SMakefile.amiga \
diff --git a/README.QUICK b/README.QUICK
index ee8f4a11..bf78252b 100644
--- a/README.QUICK
+++ b/README.QUICK
@@ -78,10 +78,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 f490365c..4e593e8b 100644
--- a/doc/README.linux
+++ b/doc/README.linux
@@ -27,7 +27,7 @@ To use threads, you need to abide by the following requirements:
MIT pthreads).
2) You must compile the collector with -DGC_LINUX_THREADS (or
- just -DGC_THREADS) and -D_REENTRANT specified in the Makefile.
+ just -DGC_THREADS) and -D_REENTRANT specified in the Makefile.direct file.
3a) Every file that makes thread calls should define GC_LINUX_THREADS and
_REENTRANT and then include gc.h. Gc.h redefines some of the
diff --git a/doc/README.sgi b/doc/README.sgi
index eceb3454..ee367a6e 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
@@ -13,7 +13,8 @@ ports.
Pthreads support is provided. This requires that:
-1) You compile the collector with -DGC_IRIX_THREADS specified in the Makefile.
+1) You compile the collector with -DGC_IRIX_THREADS specified in the
+Makefile.direct.
2) You have the latest pthreads patches installed.