]> granicus.if.org Git - gc/commitdiff
Add finalized_mlc.* to various makefiles.
authorPetter Urkedal <paurkedal@gmail.com>
Wed, 28 Sep 2011 18:12:51 +0000 (20:12 +0200)
committerPetter Urkedal <paurkedal@gmail.com>
Wed, 28 Sep 2011 18:12:51 +0000 (20:12 +0200)
21 files changed:
BCC_MAKEFILE
EMX_MAKEFILE
NT_MAKEFILE
NT_STATIC_THREADS_MAKEFILE
NT_X64_STATIC_THREADS_MAKEFILE
NT_X64_THREADS_MAKEFILE
OS2_MAKEFILE
PCR-Makefile
SMakefile.amiga
WCC_MAKEFILE
digimars.mak
gc.mak
windows-untested/vc60/gc.dsp
windows-untested/vc60/libgc.dsp
windows-untested/vc60/libgcmt.dsp
windows-untested/vc70/gc.vcproj
windows-untested/vc70/libgc.vcproj
windows-untested/vc70/libgcmt.vcproj
windows-untested/vc71/gc.vcproj
windows-untested/vc71/libgc.vcproj
windows-untested/vc71/libgcmt.vcproj

index 208bb5bc3b9e32c22fda00f74ecd6c2eebede187..a134e430f116235f3faed30a57e648a088e4891c 100644 (file)
@@ -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 \\r
     XXXobj_map.obj XXXblacklst.obj XXXfinalize.obj XXXnew_hblk.obj \\r
     XXXdbg_mlc.obj XXXmalloc.obj XXXstubborn.obj XXXdyn_load.obj \\r
-    XXXtypd_mlc.obj XXXptr_chck.obj XXXgc_cpp.obj XXXmallocx.obj\r
+    XXXtypd_mlc.obj XXXptr_chck.obj XXXgc_cpp.obj XXXmallocx.obj \\r
+    XXXfinalized_mlc.obj\r
 \r
 OBJS= $(XXXOBJS:XXX=)\r
 \r
index 0cf80d8694d0edf95c57440129f20e90b725c597..00f70e14cd7da91601893368cce60d946da9b212 100644 (file)
@@ -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
 
index 38f7275edfc0aed30a4751a6a3faccfc21c2681b..fc190a24f08b0c625499597c19b765756b46446d 100644 (file)
@@ -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
 
index ffff3cf26e7fa70d5cf177092e21fb1b2243adc7..3d75f58c2e3318fa0cfd14bd811f0a0ff39e15da 100644 (file)
@@ -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
 
index 045c3eebe714fabd8d4f8f0268b65f3ff9edf231..38c37009e6f4182cba1d1734d1b08a81d73b3d1b 100644 (file)
@@ -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
 
index 967b18ff0faee30d040f225ade83c22fdcdde02e..3df5cc46b44a18ac8fcc5dfc28a96ef96cb71403 100644 (file)
@@ -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
 
index 5c2adbac9d07e077e08e3abe5eb48dadf70da27a..59c6c686de9161003a9a067c18fe1154d5d44749 100644 (file)
@@ -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
 
index 044b9642f0df9b26afbf2b0780a135570d482c68..f9781d922dc2098c35290e681ecafba963242155 100644 (file)
@@ -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
 
index ae7651253f4b71ad7fe5562ef1df942682b35e0b..c31fd1ecad0b339ff62e2f77ca702ee51346d2c9 100644 (file)
@@ -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)
 
index 6b1d78baecd7d96b8cd29cc52f63b6afe0110e36..3741f774e2e4db73acc36b77d48e8d703aaf61f2 100644 (file)
@@ -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
 
index 41178fdce77cfb26fad1560aba3eb461adbd44e8..6c58d29209a71152e549b4d5c1716f4fb1118c74 100644 (file)
@@ -20,6 +20,7 @@ OBJS= \
        blacklst.obj\\r
        checksums.obj\\r
        dbg_mlc.obj\\r
+       finalized_mlc.obj\\r
        dyn_load.obj\\r
        finalize.obj\\r
        gc_cpp.obj\\r
diff --git a/gc.mak b/gc.mak
index 445a736d78ec5922d967d0eff53ed7dba9d4aa4a..68e76a330b9c9f3d5ab2d4abd29dceda0f11e993 100644 (file)
--- 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" \
@@ -1621,6 +1623,54 @@ NODEP_CPP_DBG_M=\
 ".\Debug\dbg_mlc.sbr" : $(SOURCE) $(DEP_CPP_DBG_M) "$(INTDIR)"
 
 
+!ENDIF
+
+# End Source File
+################################################################################
+# 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
index 9237e20ed7b6a99ed66f755d680363ad8e6bec43..fa93ad085f3a28946a56ae8850197e778eb875ab 100644 (file)
@@ -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
index 0ceac11c451ab9c8b1a518a3ed4ec0654d99bd49..2438e07ffc9dd5dfe14510ed603c6c916573b87d 100644 (file)
@@ -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
index 175eb22cfa0dcb5cd0fb120b92ce7561f380851d..f85cb0c4ea75de93578cbc069e68db4d5a31ef41 100644 (file)
@@ -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
index d1e36f4ffa19a5f934752e3ead395d528f3d5052..d04e2406ffb04f3f13e89cdbe792c9189d0e3145 100644 (file)
             <File
                 RelativePath="..\..\dbg_mlc.c">
             </File>
+            <File
+                RelativePath="..\..\finalized_mlc.c">
+            </File>
             <File
                 RelativePath="..\..\dyn_load.c">
             </File>
index 5fbf2aec39ac80d2872f5e5c0103235e580e159a..968835f8aabfc572cbfb17dde82c9b870fe15017 100644 (file)
             <File
                 RelativePath="..\..\dbg_mlc.c">
             </File>
+            <File
+                RelativePath="..\..\finalized_mlc.c">
+            </File>
             <File
                 RelativePath="..\..\dyn_load.c">
             </File>
index 7e212db45a65b1f7316f9cdb9196475fd771193a..c243b16750bf979623a9258c1e85aa15b515fc4e 100644 (file)
             <File
                 RelativePath="..\..\dbg_mlc.c">
             </File>
+            <File
+                RelativePath="..\..\finalized_mlc.c">
+            </File>
             <File
                 RelativePath="..\..\dyn_load.c">
             </File>
index 6598990bf374b07b3d18c7e9645d3bc99535b80a..5a07499900794da52ba45948bdbd06e5a959d855 100644 (file)
                         ForcedIncludeFiles=""/>
                 </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
index e6fe5fac0dffddb48be7caef2c75a8d9d83d0543..3c3f06a601fd5d6e0027ab68d7f43697bb395eb5 100644 (file)
                         ForcedIncludeFiles=""/>
                 </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
index e398ea3b3a2f0c824eee9e299038f70a44daaada..d573d419864a288654fd9a722637efeac0d5e3b8 100644 (file)
                         ForcedIncludeFiles=""/>
                 </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