Remove references to old missing gc_alloc.h and gc_local_alloc.h files.

Remove unused HPUX GC_test_and_clear implementation.

* hpux_test_and_clear.s: Remove.
* Makefile.am (EXTRA_DIST): Remove hpux_test_and_clear.s.
* Makefile.direct (SRCS): Ditto.
* Makefile.dj (SRCS): Ditto.
* Makefile.dj (SRCS): Remove missing gcc_support.c,
include/gc_alloc.h, include/gc_local_alloc.h.
* doc/gcdescr.html: Remove information about gc_local_alloc.h.
* doc/gcinterface.html: Ditto.
* doc/scale.html: Ditto.
* doc/gcinterface.html: Remove information about gc_alloc.h.
* tests/test_cpp.cc: Don't include missing old gc_alloc.h (include
new_gc_alloc.h instead); don't test __GNUC__.
* tests/test_cpp.cc (main): Use gc_alloc class instead of alloc (don't
test __GNUC__).
* windows-untested/vc60/gc.dsp (SOURCE): Don't include missing
gc_alloc.h, gc_local_alloc.h.
* windows-untested/vc60/libgc.dsp (SOURCE): Ditto.
* windows-untested/vc70/gc.vcproj (Header Files): Ditto.
* windows-untested/vc70/libgc.vcproj (Header Files): Ditto.
* windows-untested/vc71/gc.vcproj (Header Files): Ditto.
* windows-untested/vc71/libgc.vcproj (Header Files): Ditto.

diff --git a/Makefile.am b/Makefile.am
index f652c723a944f1f55e389ce3c18e2442df3aff9c..8424239d60fba9b1fb11722d82933aa2aaa3e1c7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -169,7 +169,7 @@ EXTRA_DIST += README.QUICK TODO
 # :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        Makefile.DLLs SMakefile.amiga \
+    Makefile.direct Makefile.dj Makefile.DLLs SMakefile.amiga \
     WCC_MAKEFILE autogen.sh build_atomic_ops.sh build_atomic_ops.sh.cygwin \
     NT_STATIC_THREADS_MAKEFILE NT_X64_STATIC_THREADS_MAKEFILE \
     NT_X64_THREADS_MAKEFILE CMakeLists.txt tests/CMakeLists.txt
@@ -177,7 +177,7 @@ EXTRA_DIST += BCC_MAKEFILE NT_MAKEFILE \
 # files used by makefiles other than Makefile.am
 #
 EXTRA_DIST += extra/add_gc_prefix.c extra/gc.c extra/gcname.c \
-    extra/if_mach.c extra/if_not_there.c hpux_test_and_clear.s gc.mak \
+    extra/if_mach.c extra/if_not_there.c gc.mak \
     extra/MacOS.c MacProjects.sit.hqx mach_dep.c extra/setjmp_t.c \
     extra/threadlibs.c extra/AmigaOS.c \
     Mac_files/datastart.c Mac_files/dataend.c \

diff --git a/Makefile.direct b/Makefile.direct
index adf438de74521db9474069a5cc87b53d1e8abd42..460c94addcf044f492123a981f06910f83d971dd 100644 (file)
--- a/Makefile.direct
+++ b/Makefile.direct
@@ -96,11 +96,8 @@ SRCS= $(CSRCS) mips_sgi_mach_dep.s rs6000_mach_dep.s alpha_mach_dep.S \
     mips_ultrix_mach_dep.s \
     include/new_gc_alloc.h include/gc_allocator.h \
     include/javaxfc.h sparc_sunos4_mach_dep.s sparc_netbsd_mach_dep.s \
-    include/gc_backptr.h \
-    hpux_test_and_clear.s include/gc_gcj.h \
-    include/private/dbg_mlc.h \
-    include/private/specific.h \
-    include/leak_detector.h \
+    include/gc_backptr.h include/gc_gcj.h include/private/dbg_mlc.h \
+    include/private/specific.h include/leak_detector.h \
     include/gc_pthread_redirects.h ia64_save_regs_in_stack.s \
     include/gc_config_macros.h include/private/pthread_support.h \
     include/private/pthread_stop_world.h include/private/darwin_semaphore.h \

diff --git a/Makefile.dj b/Makefile.dj
index 04aab8c502e78bcadae969d7afc80e698302127e..e51988946bd4975025a0a652c4d0eb127bafc8c1 100644 (file)
--- a/Makefile.dj
+++ b/Makefile.dj
@@ -52,11 +52,10 @@ SRCS= $(CSRCS) mips_sgi_mach_dep.S rs6000_mach_dep.s alpha_mach_dep.S \
     include/gc_inline.h gc.man extra/threadlibs.c \
     extra/if_mach.c extra/if_not_there.c gc_cpp.cc include/gc_cpp.h \
     include/weakpointer.h include/private/gc_locks.h \
-    gcc_support.c mips_ultrix_mach_dep.s include/gc_alloc.h \
+    mips_ultrix_mach_dep.s \
     include/new_gc_alloc.h include/javaxfc.h sparc_sunos4_mach_dep.s \
     include/private/solaris_threads.h include/gc_backptr.h \
-    hpux_test_and_clear.s include/gc_gcj.h \
-    include/gc_local_alloc.h include/private/dbg_mlc.h \
+    include/gc_gcj.h include/private/dbg_mlc.h \
     include/private/specific.h \
     include/leak_detector.h $(CORD_SRCS)
 

diff --git a/doc/gcdescr.html b/doc/gcdescr.html
index 29e946cc4bb6bbbea9fd438db211d97312fe9deb..68448e6146f1ea41f6b87893218df96f95ed4d93 100644 (file)
--- a/doc/gcdescr.html
+++ b/doc/gcdescr.html
@@ -612,9 +612,6 @@ transferred back to the global free list.
 Note that if the collector is configured for thread-local allocation,
 GC versions before 7 do not invoke the thread-local allocator by default.
 <TT>GC_malloc</tt> only uses thread-local allocation in version 7 and later.
-In earlier versions, <TT>GC_MALLOC</tt> (all caps) may be directed
-to use thread-local allocation by defining <TT>GC_REDIRECT_TO_LOCAL</tt>
-and then include <TT>gc_local_alloc.h</tt>.
 <P>
 For some more details see <A HREF="scale.html">here</a>, and the
 technical report entitled

diff --git a/doc/gcinterface.html b/doc/gcinterface.html
index bb0995d86f1dd29d024dae36fb3befd3ca8ef1d6..c78f6a9e86eab809f79e9a7a7c113ff302041509 100644 (file)
--- a/doc/gcinterface.html
+++ b/doc/gcinterface.html
@@ -158,12 +158,6 @@ for details.
 <P>
 If you are concerned with multiprocessor performance and scalability,
 you should consider enabling and using thread local allocation.
-For GC versions before 7.0, use <I>e.g.</i>
-<TT>GC_LOCAL_MALLOC</tt> and see <TT>gc_local_alloc.h</tt>;
-for later versions enabling thread-local allocations when the collector
-library is built changes the
-implementation of <TT>GC_MALLOC</tt>, so the client doesn't need to
-change.
 <P>
 If your platform
 supports it, you should build the collector with parallel marking support
@@ -242,9 +236,6 @@ Users of the <A HREF="http://www.sgi.com/tech/stl">SGI extended STL</a>
 or its derivatives (including most g++ versions)
 may instead be able to include <TT>new_gc_alloc.h</tt> before including
 STL header files.  This is increasingly discouraged.
-(<TT>gc_alloc.h</tt> corresponds to now obsolete versions of the
-SGI STL.)  This interface is no longer recommended, but it has existed
-for much longer.
 <P>
 This defines SGI-style allocators
 <UL>

diff --git a/doc/scale.html b/doc/scale.html
index 59da7bcf7d8c9f5d67871ff45303e12d29587b74..3d976ea41b36c3a7b6e30fae80027b0829824933 100644 (file)
--- a/doc/scale.html
+++ b/doc/scale.html
@@ -52,11 +52,8 @@ implementation of <TT>GC_malloc_many</tt>, so that free lists can be
 built, and memory can be cleared, by more than one thread concurrently.
 <LI>
 Building the collector with -DTHREAD_LOCAL_ALLOC adds support for thread
-local allocation.  Before GC version 7.0, it did not, by itself, cause
-thread local allocation to be used.  It simply allowed the use of the
-interface in <TT>gc_local_alloc.h</tt>.  Since version 7.0, this causes
-GC_malloc, GC_malloc_atomic, and GC_gcj_malloc to be redefined to perform
-thread-local allocation.
+local allocation.  This causes GC_malloc, GC_malloc_atomic, and
+GC_gcj_malloc to be redefined to perform thread-local allocation.
 <P>
 Memory returned from thread-local allocators is completely interchangeable
 with that returned by the standard allocators.  It may be used by other

diff --git a/hpux_test_and_clear.s b/hpux_test_and_clear.s
deleted file mode 100644 (file)
index f09b211..0000000
--- a/hpux_test_and_clear.s
+++ /dev/null
@@ -1,21 +0,0 @@
-       .SPACE $PRIVATE$
-       .SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
-       .SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
-       .SPACE $TEXT$
-       .SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44
-       .SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
-       .IMPORT $global$,DATA
-       .IMPORT $$dyncall,MILLICODE
-       .SPACE $TEXT$
-       .SUBSPA $CODE$
-
-       .align 4
-       .EXPORT GC_test_and_clear,ENTRY,PRIV_LEV=3,ARGW0=GR,RTNVAL=GR
-GC_test_and_clear
-       .PROC
-       .CALLINFO FRAME=0,NO_CALLS
-       .ENTRY
-       ldcw,co (%r26),%r28
-       bv,n 0(%r2)
-       .EXIT
-       .PROCEND

diff --git a/tests/test_cpp.cc b/tests/test_cpp.cc
index ce683af41101769a2cb4c1c369ce7e01e0dc8ba6..9352b6a9b0d43824ef05f5f1cb9acad84e2e503a 100644 (file)
--- a/tests/test_cpp.cc
+++ b/tests/test_cpp.cc
@@ -40,10 +40,8 @@ few minutes to complete.
 
 #ifdef USE_STD_ALLOCATOR
 #   include "gc_allocator.h"
-#elif __GNUC__
-#   include "new_gc_alloc.h"
 #else
-#   include "gc_alloc.h"
+#   include "new_gc_alloc.h"
 #endif
 
 extern "C" {
@@ -215,11 +213,7 @@ int APIENTRY WinMain(
       xio = gc_allocator_ignore_off_page<int>().allocate(1);
       int **xptr = traceable_allocator<int *>().allocate(1);
 #   else
-#     ifdef __GNUC__
-          int *x = (int *)gc_alloc::allocate(sizeof(int));
-#     else
-          int *x = (int *)alloc::allocate(sizeof(int));
-#     endif
+      int *x = (int *)gc_alloc::allocate(sizeof(int));
 #   endif
     *x = 29;
 #   ifdef USE_STD_ALLOCATOR

diff --git a/windows-untested/vc60/gc.dsp b/windows-untested/vc60/gc.dsp
index e207fc546925fb923569ddbb9457125378fdf45a..b27867a8953a5d9fc5c75b26c771b6185195d579 100644 (file)
--- a/windows-untested/vc60/gc.dsp
+++ b/windows-untested/vc60/gc.dsp
@@ -213,10 +213,6 @@ SOURCE=..\..\include\gc.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\gc_alloc.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\gc_allocator.h
 # End Source File
 # Begin Source File
@@ -249,10 +245,6 @@ SOURCE=..\..\include\gc_inline.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\gc_local_alloc.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\private\gc_locks.h
 # End Source File
 # Begin Source File

diff --git a/windows-untested/vc60/libgc.dsp b/windows-untested/vc60/libgc.dsp
index 89b877322abf47bd11f8a8173801d1a087337759..0ceac11c451ab9c8b1a518a3ed4ec0654d99bd49 100644 (file)
--- a/windows-untested/vc60/libgc.dsp
+++ b/windows-untested/vc60/libgc.dsp
@@ -202,10 +202,6 @@ SOURCE=..\..\win32_threads.c
 # PROP Default_Filter "h;hh;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE=..\..\include\gc_alloc.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\gc_allocator.h
 # End Source File
 # Begin Source File
@@ -230,10 +226,6 @@ SOURCE=..\..\include\gc_inline.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\gc_local_alloc.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\gc_pthread_redirects.h
 # End Source File
 # Begin Source File

diff --git a/windows-untested/vc70/gc.vcproj b/windows-untested/vc70/gc.vcproj
index 3e7292672cd74fbbc1f2d23bac486d2df57fbb77..ea2b5d9eb8e96cb10c9bc6918eee0db16b981bfa 100644 (file)
--- a/windows-untested/vc70/gc.vcproj
+++ b/windows-untested/vc70/gc.vcproj
@@ -240,9 +240,6 @@
             <File
                 RelativePath="..\..\include\gc.h">
             </File>
-            <File
-                RelativePath="..\..\include\gc_alloc.h">
-            </File>
             <File
                 RelativePath="..\..\include\gc_allocator.h">
             </File>
@@ -267,9 +264,6 @@
             <File
                 RelativePath="..\..\include\gc_inline.h">
             </File>
-            <File
-                RelativePath="..\..\include\gc_local_alloc.h">
-            </File>
             <File
                 RelativePath="..\..\include\private\gc_locks.h">
             </File>

diff --git a/windows-untested/vc70/libgc.vcproj b/windows-untested/vc70/libgc.vcproj
index 2379aa22694d1e35446f07b1aac1005190c70dc3..5fbf2aec39ac80d2872f5e5c0103235e580e159a 100644 (file)
--- a/windows-untested/vc70/libgc.vcproj
+++ b/windows-untested/vc70/libgc.vcproj
@@ -203,9 +203,6 @@
         <Filter
             Name="Header Files"
             Filter="h;hh;hpp;hxx;hm;inl">
-            <File
-                RelativePath="..\..\include\gc_alloc.h">
-            </File>
             <File
                 RelativePath="..\..\include\gc_allocator.h">
             </File>
@@ -224,9 +221,6 @@
             <File
                 RelativePath="..\..\include\gc_inline.h">
             </File>
-            <File
-                RelativePath="..\..\include\gc_local_alloc.h">
-            </File>
             <File
                 RelativePath="..\..\include\gc_pthread_redirects.h">
             </File>

diff --git a/windows-untested/vc71/gc.vcproj b/windows-untested/vc71/gc.vcproj
index 804d5bbf6554d5cc734ab959442212b8c3b4dccf..dc61c6e8f6413c052e9c81cbb094e9e759e0c194 100644 (file)
--- a/windows-untested/vc71/gc.vcproj
+++ b/windows-untested/vc71/gc.vcproj
@@ -722,9 +722,6 @@
             <File
                 RelativePath="..\..\include\gc.h">
             </File>
-            <File
-                RelativePath="..\..\include\gc_alloc.h">
-            </File>
             <File
                 RelativePath="..\..\include\gc_allocator.h">
             </File>
@@ -749,9 +746,6 @@
             <File
                 RelativePath="..\..\include\gc_inline.h">
             </File>
-            <File
-                RelativePath="..\..\include\gc_local_alloc.h">
-            </File>
             <File
                 RelativePath="..\..\include\private\gc_locks.h">
             </File>

diff --git a/windows-untested/vc71/libgc.vcproj b/windows-untested/vc71/libgc.vcproj
index 3af146940ced4fd4660ce140c569507a2e358db5..e6fe5fac0dffddb48be7caef2c75a8d9d83d0543 100644 (file)
--- a/windows-untested/vc71/libgc.vcproj
+++ b/windows-untested/vc71/libgc.vcproj
@@ -683,9 +683,6 @@
         <Filter
             Name="Header Files"
             Filter="h;hh;hpp;hxx;hm;inl">
-            <File
-                RelativePath="..\..\include\gc_alloc.h">
-            </File>
             <File
                 RelativePath="..\..\include\gc_allocator.h">
             </File>
@@ -704,9 +701,6 @@
             <File
                 RelativePath="..\..\include\gc_inline.h">
             </File>
-            <File
-                RelativePath="..\..\include\gc_local_alloc.h">
-            </File>
             <File
                 RelativePath="..\..\include\gc_pthread_redirects.h">
             </File>