Add finalized_mlc.* to various makefiles.

21 files changed, 153 insertions, 10 deletions

diff --git a/BCC_MAKEFILE b/BCC_MAKEFILE
index 208bb5bc..a134e430 100644
--- a/BCC_MAKEFILE
+++ b/BCC_MAKEFILE
@@ -34,7 +34,8 @@ XXXOBJS= XXXalloc.obj XXXreclaim.obj XXXallchblk.obj XXXmisc.obj \
     XXXmach_dep.obj XXXos_dep.obj XXXmark_rts.obj XXXheaders.obj XXXmark.obj \

     XXXobj_map.obj XXXblacklst.obj XXXfinalize.obj XXXnew_hblk.obj \

     XXXdbg_mlc.obj XXXmalloc.obj XXXstubborn.obj XXXdyn_load.obj \

-    XXXtypd_mlc.obj XXXptr_chck.obj XXXgc_cpp.obj XXXmallocx.obj

+    XXXtypd_mlc.obj XXXptr_chck.obj XXXgc_cpp.obj XXXmallocx.obj \

+    XXXfinalized_mlc.obj

 

 OBJS= $(XXXOBJS:XXX=)

 

diff --git a/EMX_MAKEFILE b/EMX_MAKEFILE
index 0cf80d86..00f70e14 100644
--- a/EMX_MAKEFILE
+++ b/EMX_MAKEFILE
@@ -48,7 +48,7 @@ RANLIB= ar s
 srcdir = .
 VPATH = $(srcdir)
 
-OBJS= alloc.o reclaim.o allchblk.o misc.o mach_dep.o os_dep.o mark_rts.o headers.o mark.o obj_map.o blacklst.o finalize.o new_hblk.o dyn_load.o dbg_mlc.o malloc.o stubborn.o checksums.o typd_mlc.o ptr_chck.o mallocx.o
+OBJS= alloc.o reclaim.o allchblk.o misc.o mach_dep.o os_dep.o mark_rts.o headers.o mark.o obj_map.o blacklst.o finalize.o new_hblk.o dyn_load.o dbg_mlc.o finalized_mlc.o malloc.o stubborn.o checksums.o typd_mlc.o ptr_chck.o mallocx.o
 
 CORD_OBJS=  cord/cordbscs.o cord/cordxtra.o cord/cordprnt.o
 
diff --git a/NT_MAKEFILE b/NT_MAKEFILE
index 38f7275e..fc190a24 100644
--- a/NT_MAKEFILE
+++ b/NT_MAKEFILE
@@ -10,7 +10,7 @@ CPU=$(MY_CPU)
 .SUFFIXES:
 .SUFFIXES: .obj .cpp .c
 
-OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj malloc.obj stubborn.obj dyn_load.obj typd_mlc.obj ptr_chck.obj gc_cpp.obj mallocx.obj extra\msvc_dbg.obj
+OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj finalized_mlc.obj malloc.obj stubborn.obj dyn_load.obj typd_mlc.obj ptr_chck.obj gc_cpp.obj mallocx.obj extra\msvc_dbg.obj
 
 all: gctest.exe cord\de.exe test_cpp.exe
 
diff --git a/NT_STATIC_THREADS_MAKEFILE b/NT_STATIC_THREADS_MAKEFILE
index ffff3cf2..3d75f58c 100644
--- a/NT_STATIC_THREADS_MAKEFILE
+++ b/NT_STATIC_THREADS_MAKEFILE
@@ -17,7 +17,7 @@ CPU=$(MY_CPU)
 AO_SRC_DIR=libatomic_ops/src
 AO_INCLUDE_DIR=$(AO_SRC_DIR)
 
-OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj malloc.obj stubborn.obj dyn_load.obj typd_mlc.obj ptr_chck.obj gc_cpp.obj mallocx.obj win32_threads.obj extra\msvc_dbg.obj thread_local_alloc.obj
+OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj finalized_mlc.obj malloc.obj stubborn.obj dyn_load.obj typd_mlc.obj ptr_chck.obj gc_cpp.obj mallocx.obj win32_threads.obj extra\msvc_dbg.obj thread_local_alloc.obj
 
 all: gctest.exe cord\de.exe test_cpp.exe
 
diff --git a/NT_X64_STATIC_THREADS_MAKEFILE b/NT_X64_STATIC_THREADS_MAKEFILE
index 045c3eeb..38c37009 100644
--- a/NT_X64_STATIC_THREADS_MAKEFILE
+++ b/NT_X64_STATIC_THREADS_MAKEFILE
@@ -17,7 +17,7 @@ CPU=$(MY_CPU)
 AO_SRC_DIR=libatomic_ops/src
 AO_INCLUDE_DIR=$(AO_SRC_DIR)
 
-OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj malloc.obj stubborn.obj dyn_load.obj typd_mlc.obj ptr_chck.obj gc_cpp.obj mallocx.obj win32_threads.obj extra\msvc_dbg.obj thread_local_alloc.obj
+OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj finalized_mlc.obj malloc.obj stubborn.obj dyn_load.obj typd_mlc.obj ptr_chck.obj gc_cpp.obj mallocx.obj win32_threads.obj extra\msvc_dbg.obj thread_local_alloc.obj
 
 all: gctest.exe cord\de.exe test_cpp.exe
 
diff --git a/NT_X64_THREADS_MAKEFILE b/NT_X64_THREADS_MAKEFILE
index 967b18ff..3df5cc46 100644
--- a/NT_X64_THREADS_MAKEFILE
+++ b/NT_X64_THREADS_MAKEFILE
@@ -25,7 +25,7 @@ CPU=$(MY_CPU)
 AO_SRC_DIR=libatomic_ops/src
 AO_INCLUDE_DIR=$(AO_SRC_DIR)
 
-OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj malloc.obj stubborn.obj dyn_load.obj typd_mlc.obj ptr_chck.obj gc_cpp.obj mallocx.obj win32_threads.obj extra\msvc_dbg.obj thread_local_alloc.obj
+OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj finalized_mlc.obj malloc.obj stubborn.obj dyn_load.obj typd_mlc.obj ptr_chck.obj gc_cpp.obj mallocx.obj win32_threads.obj extra\msvc_dbg.obj thread_local_alloc.obj
 
 all: gc64.dll gctest.exe cord\de.exe test_cpp.exe
 
diff --git a/OS2_MAKEFILE b/OS2_MAKEFILE
index 5c2adbac..59c6c686 100644
--- a/OS2_MAKEFILE
+++ b/OS2_MAKEFILE
@@ -5,7 +5,7 @@
 
 # Significantly revised for GC version 4.4 by Mark Boulter (Jan 1994).
 
-OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj malloc.obj stubborn.obj typd_mlc.obj ptr_chck.obj mallocx.obj
+OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj finalized_mlc.obj malloc.obj stubborn.obj typd_mlc.obj ptr_chck.obj mallocx.obj
 
 CORDOBJS= cord\cordbscs.obj cord\cordxtra.obj cord\cordprnt.obj
 
diff --git a/PCR-Makefile b/PCR-Makefile
index 044b9642..f9781d92 100644
--- a/PCR-Makefile
+++ b/PCR-Makefile
@@ -32,7 +32,7 @@ LDFLAGS = $(CONFIG_LDFLAGS)
 # 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 pcr_interface.o blacklst.o finalize.o new_hblk.o real_malloc.o dyn_load.o dbg_mlc.o malloc.o stubborn.o checksums.o solaris_threads.o typd_mlc.o ptr_chck.o mallocx.o
+COBJ= alloc.o reclaim.o allchblk.o misc.o os_dep.o mark_rts.o headers.o mark.o obj_map.o pcr_interface.o blacklst.o finalize.o new_hblk.o real_malloc.o dyn_load.o dbg_mlc.o finalized_mlc.o malloc.o stubborn.o checksums.o solaris_threads.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 pcr_interface.c blacklst.c finalize.c new_hblk.c real_malloc.c dyn_load.c dbg_mlc.c malloc.c stubborn.c checksums.c solaris_threads.c typd_mlc.c ptr_chck.c mallocx.c
 
diff --git a/SMakefile.amiga b/SMakefile.amiga
index ae765125..c31fd1ec 100644
--- a/SMakefile.amiga
+++ b/SMakefile.amiga
@@ -72,7 +72,7 @@ cord/cordtest: cord/cordtest.o cord/cord$(CPU).lib gc$(CPU).lib
 
 #------------------LIBBING----------------------------
 
-OBJS= alloc.o reclaim.o allchblk.o misc.o mach_dep.o os_dep.o mark_rts.o headers.o mark.o obj_map.o blacklst.o finalize.o new_hblk.o real_malloc.o dyn_load.o dbg_mlc.o malloc.o stubborn.o checksums.o typd_mlc.o ptr_chck.o mallocx.o
+OBJS= alloc.o reclaim.o allchblk.o misc.o mach_dep.o os_dep.o mark_rts.o headers.o mark.o obj_map.o blacklst.o finalize.o new_hblk.o real_malloc.o dyn_load.o dbg_mlc.o malloc.o stubborn.o checksums.o typd_mlc.o ptr_chck.o mallocx.o finalized_mlc.o
 
 gc$(CPU).lib: $(OBJS)
    $(LIBER) gc$(CPU).lib r $(OBJS)
@@ -132,6 +132,9 @@ dyn_load.o : dyn_load.c $(INC)
 dbg_mlc.o : dbg_mlc.c $(INC)
 	$(CC) dbg_mlc.c $(SCOPT)
 
+finalized_mlc.o : finalized_mlc.c $(INC)
+	$(CC) finalized_mlc.c $(SCOPT)
+
 malloc.o : malloc.c $(INC)
 	$(CC) malloc.c $(SCOPT)
 
diff --git a/WCC_MAKEFILE b/WCC_MAKEFILE
index 6b1d78ba..3741f774 100644
--- a/WCC_MAKEFILE
+++ b/WCC_MAKEFILE
@@ -76,7 +76,8 @@ OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj &
       mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj &
       obj_map.obj blacklst.obj finalize.obj new_hblk.obj &
       dbg_mlc.obj malloc.obj stubborn.obj dyn_load.obj &
-      typd_mlc.obj ptr_chck.obj mallocx.obj
+      typd_mlc.obj ptr_chck.obj mallocx.obj &
+      finalized_mlc.obj
 
 all: gc.lib gctest.exe test_cpp.exe
 
diff --git a/digimars.mak b/digimars.mak
index 41178fdc..6c58d292 100644
--- a/digimars.mak
+++ b/digimars.mak
@@ -20,6 +20,7 @@ OBJS=	\
 	blacklst.obj\

 	checksums.obj\

 	dbg_mlc.obj\

+	finalized_mlc.obj\

 	dyn_load.obj\

 	finalize.obj\

 	gc_cpp.obj\

diff --git a/gc.mak b/gc.mak
index 445a736d..68e76a33 100644
--- a/gc.mak
+++ b/gc.mak
@@ -347,6 +347,7 @@ BSC32_SBRS= \
 	".\Debug\blacklst.sbr" \
 	".\Debug\checksums.sbr" \
 	".\Debug\dbg_mlc.sbr" \
+	".\Debug\finalized_mlc.sbr" \
 	".\Debug\dyn_load.sbr" \
 	".\Debug\finalize.sbr" \
 	".\Debug\gc_cpp.sbr" \
@@ -386,6 +387,7 @@ LINK32_OBJS= \
 	".\Debug\blacklst.obj" \
 	".\Debug\checksums.obj" \
 	".\Debug\dbg_mlc.obj" \
+	".\Debug\finalized_mlc.obj" \
 	".\Debug\dyn_load.obj" \
 	".\Debug\finalize.obj" \
 	".\Debug\gc_cpp.obj" \
@@ -1627,6 +1629,54 @@ NODEP_CPP_DBG_M=\
 ################################################################################
 # Begin Source File
 
+SOURCE=.\finalized_mlc.c
+
+!IF  "$(CFG)" == "gc - Win32 Release"
+
+DEP_CPP_DBG_M=\
+	".\include\private\gcconfig.h"\
+	".\include\gc.h"\
+	".\include\private\gc_hdrs.h"\
+	".\include\private\gc_priv.h"\
+	{$(INCLUDE)}"\sys\TYPES.H"\
+
+NODEP_CPP_DBG_M=\
+	".\th\PCR_Th.h"\
+	".\th\PCR_ThCrSec.h"\
+	".\th\PCR_ThCtl.h"\
+
+
+".\Release\finalized_mlc.obj" : $(SOURCE) $(DEP_CPP_DBG_M) "$(INTDIR)"
+
+".\Release\finalized_mlc.sbr" : $(SOURCE) $(DEP_CPP_DBG_M) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
+
+DEP_CPP_DBG_M=\
+	".\include\private\gcconfig.h"\
+	".\include\gc.h"\
+	".\include\private\gc_hdrs.h"\
+	".\include\private\gc_priv.h"\
+	{$(INCLUDE)}"\sys\TYPES.H"\
+
+NODEP_CPP_DBG_M=\
+	".\th\PCR_Th.h"\
+	".\th\PCR_ThCrSec.h"\
+	".\th\PCR_ThCtl.h"\
+
+
+".\Debug\finalized_mlc.obj" : $(SOURCE) $(DEP_CPP_DBG_M) "$(INTDIR)"
+
+".\Debug\finalized_mlc.sbr" : $(SOURCE) $(DEP_CPP_DBG_M) "$(INTDIR)"
+
+
+!ENDIF
+
+# End Source File
+################################################################################
+# Begin Source File
+
 SOURCE=.\blacklst.c
 
 !IF  "$(CFG)" == "gc - Win32 Release"
diff --git a/windows-untested/vc60/gc.dsp b/windows-untested/vc60/gc.dsp
index 9237e20e..fa93ad08 100644
--- a/windows-untested/vc60/gc.dsp
+++ b/windows-untested/vc60/gc.dsp
@@ -128,6 +128,10 @@ SOURCE=..\..\dbg_mlc.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\finalized_mlc.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\dyn_load.c
 # End Source File
 # Begin Source File
diff --git a/windows-untested/vc60/libgc.dsp b/windows-untested/vc60/libgc.dsp
index 0ceac11c..2438e07f 100644
--- a/windows-untested/vc60/libgc.dsp
+++ b/windows-untested/vc60/libgc.dsp
@@ -121,6 +121,10 @@ SOURCE=..\..\dbg_mlc.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\finalized_mlc.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\dyn_load.c
 # End Source File
 # Begin Source File
diff --git a/windows-untested/vc60/libgcmt.dsp b/windows-untested/vc60/libgcmt.dsp
index 175eb22c..f85cb0c4 100644
--- a/windows-untested/vc60/libgcmt.dsp
+++ b/windows-untested/vc60/libgcmt.dsp
@@ -121,6 +121,10 @@ SOURCE=..\..\dbg_mlc.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\finalized_mlc.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\dyn_load.c
 # End Source File
 # Begin Source File
diff --git a/windows-untested/vc70/gc.vcproj b/windows-untested/vc70/gc.vcproj
index d1e36f4f..d04e2406 100644
--- a/windows-untested/vc70/gc.vcproj
+++ b/windows-untested/vc70/gc.vcproj
@@ -165,6 +165,9 @@
                 RelativePath="..\..\dbg_mlc.c">
             </File>
             <File
+                RelativePath="..\..\finalized_mlc.c">
+            </File>
+            <File
                 RelativePath="..\..\dyn_load.c">
             </File>
             <File
diff --git a/windows-untested/vc70/libgc.vcproj b/windows-untested/vc70/libgc.vcproj
index 5fbf2aec..968835f8 100644
--- a/windows-untested/vc70/libgc.vcproj
+++ b/windows-untested/vc70/libgc.vcproj
@@ -131,6 +131,9 @@
                 RelativePath="..\..\dbg_mlc.c">
             </File>
             <File
+                RelativePath="..\..\finalized_mlc.c">
+            </File>
+            <File
                 RelativePath="..\..\dyn_load.c">
             </File>
             <File
diff --git a/windows-untested/vc70/libgcmt.vcproj b/windows-untested/vc70/libgcmt.vcproj
index 7e212db4..c243b167 100644
--- a/windows-untested/vc70/libgcmt.vcproj
+++ b/windows-untested/vc70/libgcmt.vcproj
@@ -131,6 +131,9 @@
                 RelativePath="..\..\dbg_mlc.c">
             </File>
             <File
+                RelativePath="..\..\finalized_mlc.c">
+            </File>
+            <File
                 RelativePath="..\..\dyn_load.c">
             </File>
             <File
diff --git a/windows-untested/vc71/gc.vcproj b/windows-untested/vc71/gc.vcproj
index 6598990b..5a074999 100644
--- a/windows-untested/vc71/gc.vcproj
+++ b/windows-untested/vc71/gc.vcproj
@@ -296,6 +296,28 @@
                 </FileConfiguration>
             </File>
             <File
+                RelativePath="..\..\finalized_mlc.c">
+                <FileConfiguration
+                    Name="Release|Win32">
+                    <Tool
+                        Name="VCCLCompilerTool"
+                        Optimization="2"
+                        AdditionalIncludeDirectories=""
+                        PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        ForcedIncludeFiles=""/>
+                </FileConfiguration>
+                <FileConfiguration
+                    Name="Debug|Win32">
+                    <Tool
+                        Name="VCCLCompilerTool"
+                        Optimization="0"
+                        AdditionalIncludeDirectories=""
+                        PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;GC_BUILD;GC_DLL;WIN32;_MBCS;GC_THREADS;$(NoInherit)"
+                        BasicRuntimeChecks="3"
+                        ForcedIncludeFiles=""/>
+                </FileConfiguration>
+            </File>
+            <File
                 RelativePath="..\..\dyn_load.c">
                 <FileConfiguration
                     Name="Release|Win32">
diff --git a/windows-untested/vc71/libgc.vcproj b/windows-untested/vc71/libgc.vcproj
index e6fe5fac..3c3f06a6 100644
--- a/windows-untested/vc71/libgc.vcproj
+++ b/windows-untested/vc71/libgc.vcproj
@@ -260,6 +260,28 @@
                 </FileConfiguration>
             </File>
             <File
+                RelativePath="..\..\finalized_mlc.c">
+                <FileConfiguration
+                    Name="Release|Win32">
+                    <Tool
+                        Name="VCCLCompilerTool"
+                        Optimization="2"
+                        AdditionalIncludeDirectories=""
+                        PreprocessorDefinitions=""
+                        ForcedIncludeFiles=""/>
+                </FileConfiguration>
+                <FileConfiguration
+                    Name="Debug|Win32">
+                    <Tool
+                        Name="VCCLCompilerTool"
+                        Optimization="0"
+                        AdditionalIncludeDirectories=""
+                        PreprocessorDefinitions=""
+                        BasicRuntimeChecks="3"
+                        ForcedIncludeFiles=""/>
+                </FileConfiguration>
+            </File>
+            <File
                 RelativePath="..\..\dyn_load.c">
                 <FileConfiguration
                     Name="Release|Win32">
diff --git a/windows-untested/vc71/libgcmt.vcproj b/windows-untested/vc71/libgcmt.vcproj
index e398ea3b..d573d419 100644
--- a/windows-untested/vc71/libgcmt.vcproj
+++ b/windows-untested/vc71/libgcmt.vcproj
@@ -260,6 +260,28 @@
                 </FileConfiguration>
             </File>
             <File
+                RelativePath="..\..\finalized_mlc.c">
+                <FileConfiguration
+                    Name="Debug|Win32">
+                    <Tool
+                        Name="VCCLCompilerTool"
+                        Optimization="0"
+                        AdditionalIncludeDirectories=""
+                        PreprocessorDefinitions=""
+                        BasicRuntimeChecks="3"
+                        ForcedIncludeFiles=""/>
+                </FileConfiguration>
+                <FileConfiguration
+                    Name="Release|Win32">
+                    <Tool
+                        Name="VCCLCompilerTool"
+                        Optimization="2"
+                        AdditionalIncludeDirectories=""
+                        PreprocessorDefinitions=""
+                        ForcedIncludeFiles=""/>
+                </FileConfiguration>
+            </File>
+            <File
                 RelativePath="..\..\dyn_load.c">
                 <FileConfiguration
                     Name="Debug|Win32">