diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | Makefile.direct | 8 | ||||
| -rw-r--r-- | PCR-Makefile | 47 | ||||
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | doc/README.macros | 3 | ||||
| -rw-r--r-- | tests/test.c | 1 |
6 files changed, 7 insertions, 60 deletions
diff --git a/Makefile.am b/Makefile.am index 301290f0..12c01c60 100644 --- a/Makefile.am +++ b/Makefile.am @@ -182,8 +182,8 @@ CCASFLAGS += $(DEFS) # # other makefiles -EXTRA_DIST += NT_MAKEFILE PCR-Makefile digimars.mak \ - Makefile.direct WCC_MAKEFILE autogen.sh CMakeLists.txt Config.cmake.in +EXTRA_DIST += Makefile.direct NT_MAKEFILE WCC_MAKEFILE digimars.mak \ + autogen.sh CMakeLists.txt Config.cmake.in # files used by makefiles other than Makefile.am # diff --git a/Makefile.direct b/Makefile.direct index 6e09165f..366812fb 100644 --- a/Makefile.direct +++ b/Makefile.direct @@ -37,7 +37,7 @@ AS=as $(AS_ABI_FLAG) LD=ld -# Redefining srcdir allows object code for the nonPCR version of the collector +# Redefining srcdir allows object code of the collector # to be generated in different directories. srcdir= . VPATH= $(srcdir) @@ -180,12 +180,6 @@ BSD-pkg-install: BSD-pkg-all ${INSTALL_DATA} gc.h gc_cpp.h ${PREFIX}/include ${INSTALL_MAN} gc.man ${PREFIX}/man/man3/gc.3 -pcr: PCR-Makefile include/private/gc_private.h include/private/gc_hdrs.h \ - include/private/gc_locks.h include/gc.h include/private/gcconfig.h \ - mach_dep.o $(SRCS) - $(MAKE) -f PCR-Makefile depend - $(MAKE) -f PCR-Makefile - $(OBJS) tests/test.o dyn_load.o dyn_load_sunos53.o: \ $(srcdir)/include/private/gc_priv.h \ $(srcdir)/include/private/gc_hdrs.h $(srcdir)/include/private/gc_locks.h \ diff --git a/PCR-Makefile b/PCR-Makefile deleted file mode 100644 index 4af42ed4..00000000 --- a/PCR-Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# -# Default target -# - -default: gc.o - -include ../config/common.mk - -# -# compilation flags, etc. -# - -CPPFLAGS = $(INCLUDE) $(CONFIG_CPPFLAGS) \ - -DPCR_NO_RENAME -DPCR_NO_HOSTDEP_ERR -#CFLAGS = -DPCR $(CONFIG_CFLAGS) -CFLAGS = -DPCR -DENABLE_DISCLAIM $(CONFIG_CFLAGS) -SPECIALCFLAGS = # For code involving asm's - -ASPPFLAGS = $(INCLUDE) $(CONFIG_ASPPFLAGS) \ - -DPCR_NO_RENAME -DPCR_NO_HOSTDEP_ERR -DASM - -ASFLAGS = $(CONFIG_ASFLAGS) - -LDRFLAGS = $(CONFIG_LDRFLAGS) - -LDFLAGS = $(CONFIG_LDFLAGS) - -# -# BEGIN PACKAGE-SPECIFIC PART -# - -# Fix to point to local pcr installation directory. -PCRDIR= .. - -COBJ= alloc.o reclaim.o allchblk.o misc.o os_dep.o mark_rts.o headers.o mark.o obj_map.o blacklst.o finalize.o new_hblk.o extra/pcr_interface.o extra/real_malloc.o dyn_load.o dbg_mlc.o fnlz_mlc.o malloc.o checksums.o typd_mlc.o ptr_chck.o mallocx.o - -CSRC= reclaim.c allchblk.c misc.c alloc.c mach_dep.c os_dep.c mark_rts.c headers.c mark.c obj_map.c blacklst.c finalize.c new_hblk.c extra/pcr_interface.c extra/real_malloc.c dyn_load.c dbg_mlc.c fnlz_mlc.c malloc.c checksums.c typd_mlc.c ptr_chck.c mallocx.c - -SHELL= /bin/sh - -default: gc.o - -gc.o: $(COBJ) mach_dep.o - $(LDR) $(CONFIG_LDRFLAGS) -o gc.o $(COBJ) mach_dep.o - -mach_dep.o: mach_dep.c - $(CC) -c $(SPECIALCFLAGS) mach_dep.c @@ -261,8 +261,8 @@ The collector currently is designed to run essentially unmodified on machines that use a flat 32-bit or 64-bit address space. That includes the vast majority of Workstations and X86 (X >= 3) PCs. -In a few cases (OS/2, PCR, Win32) a separate makefile is supplied. Many of -these have a separate host-specific doc/README.* file. +In a few cases (OS/2, Win32) a separate makefile is supplied; these have +a separate host-specific doc/README.* file. Dynamic libraries are completely supported only under SunOS/Solaris, (and even that support is not functional on the last Sun 3 release), diff --git a/doc/README.macros b/doc/README.macros index 9b1c03bc..e013566c 100644 --- a/doc/README.macros +++ b/doc/README.macros @@ -118,7 +118,8 @@ SUNOS5SIGS Solaris-like signal handling. This is probably misnamed, platforms. PCR Set if the collector is being built as part of the Xerox Portable - Common Runtime. + Common Runtime. The client might need to define PCR_NO_RENAME and + PCR_NO_HOSTDEP_ERR as well. GC_THREADS Should set the appropriate one of the below macros, except GC_WIN32_PTHREADS, which must be set explicitly. Tested by gc.h. diff --git a/tests/test.c b/tests/test.c index 8d767fca..2ed664bb 100644 --- a/tests/test.c +++ b/tests/test.c @@ -45,7 +45,6 @@ #ifndef NTHREADS /* Number of additional threads to fork. */ # define NTHREADS 5 /* Excludes main thread, which also runs a test. */ /* In the single-threaded case, the number of times to rerun it. */ - /* Not respected by PCR test. */ #endif # if defined(mips) && defined(SYSTYPE_BSD43) |