Move asm machine-dependent files to "src" folder.

* .gitignore: Add entries from "src" folder; add auto-generated files
by CMake; allow a suffix for "libatomic_ops" folder.
* Makefile.direct (SRCS, mach_dep.o): Move sparc_mach_dep.S,
sparc_sunos4_mach_dep.s, sparc_netbsd_mach_dep.s,
ia64_save_regs_in_stack.s to "src" directory.
* Makefile.dj (SRCS): Ditto.
* configure.ac (machdep): Move sparc_mach_dep.lo,
sparc_netbsd_mach_dep.lo, ia64_save_regs_in_stack.lo to "src" folder.
* PCR-Makefile (mach_dep.o): Remove "if_mach" statement for MIPS.
* PCR-Makefile (if_mach, if_not_there): Remove rules.
* gc.mak (CPP_PROJ): Prefix libatomic_ops folder with "./".

diff --git a/.gitignore b/.gitignore
index 605f08e..63b8d0d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,8 @@
 /*.lo
 /*.o
 /*.obj
+/src/*.lo
+/src/*.o
 
 /.deps/
 /.libs/
@@ -43,7 +45,7 @@
 /include/private/stamp-h1
 
 # External library (without trailing slash to allow symlinks):
-/libatomic_ops
+/libatomic_ops*
 
 # These files are generated by autoreconf:
 /Makefile.in
@@ -65,6 +67,9 @@
 /missing
 /mkinstalldirs
 
+# These files are generated by CMake:
+/gc.sln
+
 # Rarely generated files (mostly by some Win/DOS compilers):
 /*.bsc
 /*.csm

diff --git a/Makefile.am b/Makefile.am
index d3f5c23..f0e465c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -86,8 +86,8 @@ libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(ATOMIC_OPS_LIBS)
 libgc_la_DEPENDENCIES = @addobjs@
 libgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info 1:3:0 -no-undefined
 
-EXTRA_libgc_la_SOURCES = sparc_mach_dep.S sparc_netbsd_mach_dep.s \
-    sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
+EXTRA_libgc_la_SOURCES = src/ia64_save_regs_in_stack.s src/sparc_mach_dep.S \
+    src/sparc_netbsd_mach_dep.s src/sparc_sunos4_mach_dep.s
 
 
 # C++ Interface

diff --git a/Makefile.direct b/Makefile.direct
index ee9517a..53fdf2a 100644 (file)
--- a/Makefile.direct
+++ b/Makefile.direct
@@ -89,21 +89,22 @@ CORD_SRCS= cord/cordbscs.c cord/cordxtra.c cord/cordprnt.c cord/de.c \
 CORD_OBJS= cord/cordbscs.o cord/cordxtra.o cord/cordprnt.o
 
 SRCS= $(CSRCS) \
-    sparc_mach_dep.S include/gc.h include/gc_typed.h include/gc_tiny_fl.h \
+    include/gc.h include/gc_typed.h include/gc_tiny_fl.h \
     include/gc_version.h include/private/gc_hdrs.h include/private/gc_priv.h \
     include/private/gcconfig.h include/private/gc_pmark.h \
     include/gc_inline.h include/gc_mark.h tools/threadlibs.c \
     tools/if_mach.c tools/if_not_there.c gc_cpp.cc include/gc_cpp.h \
     tools/gcname.c include/weakpointer.h include/private/gc_locks.h \
     include/new_gc_alloc.h include/gc_allocator.h \
-    include/javaxfc.h sparc_sunos4_mach_dep.s sparc_netbsd_mach_dep.s \
+    include/javaxfc.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_pthread_redirects.h \
     include/gc_config_macros.h include/private/pthread_support.h \
     include/private/pthread_stop_world.h include/private/darwin_semaphore.h \
     include/private/darwin_stop_world.h include/private/thread_local_alloc.h \
-    $(CORD_SRCS)
+    src/ia64_save_regs_in_stack.s src/sparc_mach_dep.S \
+    src/sparc_netbsd_mach_dep.s src/sparc_sunos4_mach_dep.s $(CORD_SRCS)
 
 DOC_FILES= README.QUICK TODO doc/README.Mac doc/README.MacOSX doc/README.OS2 \
        doc/README.amiga doc/README.cords doc/debugging.html \
@@ -308,17 +309,17 @@ dyn_test:
 #      gcc -shared -Wl,-soname=libgc.so.0 -o libgc.so.0 $(LIBOBJS) dyn_load.lo
 #      touch liblinuxgc.so
 
-mach_dep.o: $(srcdir)/mach_dep.c $(srcdir)/sparc_mach_dep.S \
-           $(srcdir)/sparc_sunos4_mach_dep.s \
-           $(srcdir)/ia64_save_regs_in_stack.s \
-           $(srcdir)/sparc_netbsd_mach_dep.s $(UTILS)
+mach_dep.o: $(srcdir)/mach_dep.c $(srcdir)/src/sparc_mach_dep.S \
+           $(srcdir)/src/sparc_sunos4_mach_dep.s \
+           $(srcdir)/src/ia64_save_regs_in_stack.s \
+           $(srcdir)/src/sparc_netbsd_mach_dep.s $(UTILS)
        rm -f mach_dep.o
-       ./if_mach SPARC SOLARIS $(CC) -c -o mach_dep2.o $(srcdir)/sparc_mach_dep.S
-       ./if_mach SPARC OPENBSD $(AS) -o mach_dep2.o $(srcdir)/sparc_sunos4_mach_dep.s
-       ./if_mach SPARC NETBSD $(AS) -o mach_dep2.o $(srcdir)/sparc_netbsd_mach_dep.s
+       ./if_mach SPARC SOLARIS $(CC) -c -o mach_dep2.o $(srcdir)/src/sparc_mach_dep.S
+       ./if_mach SPARC OPENBSD $(AS) -o mach_dep2.o $(srcdir)/src/sparc_sunos4_mach_dep.s
+       ./if_mach SPARC NETBSD $(AS) -o mach_dep2.o $(srcdir)/src/sparc_netbsd_mach_dep.s
        ./if_mach SPARC "" $(CC) -c -o mach_dep1.o $(SPECIALCFLAGS) $(srcdir)/mach_dep.c
        ./if_mach SPARC "" ld -r -o mach_dep.o mach_dep1.o mach_dep2.o
-       ./if_mach IA64 "" as $(AS_ABI_FLAG) -o ia64_save_regs_in_stack.o $(srcdir)/ia64_save_regs_in_stack.s
+       ./if_mach IA64 "" as $(AS_ABI_FLAG) -o ia64_save_regs_in_stack.o $(srcdir)/src/ia64_save_regs_in_stack.s
        ./if_mach IA64 "" $(CC) -c -o mach_dep1.o $(SPECIALCFLAGS) $(srcdir)/mach_dep.c
        ./if_mach IA64 "" ld -r -o mach_dep.o mach_dep1.o ia64_save_regs_in_stack.o
        ./if_not_there mach_dep.o $(CC) -c $(SPECIALCFLAGS) $(srcdir)/mach_dep.c

diff --git a/Makefile.dj b/Makefile.dj
index 6c2ddad..16af469 100644 (file)
--- a/Makefile.dj
+++ b/Makefile.dj
@@ -48,13 +48,13 @@ CORD_SRCS= cord/cordbscs.c cord/cordxtra.c cord/cordprnt.c cord/de.c \
 CORD_OBJS= cord/cordbscs.o cord/cordxtra.o cord/cordprnt.o
 
 SRCS= $(CSRCS) \
-    sparc_mach_dep.S include/gc.h include/gc_version.h include/gc_typed.h \
+    src/sparc_mach_dep.S include/gc.h include/gc_version.h include/gc_typed.h \
     include/private/gc_hdrs.h include/private/gc_priv.h \
     include/private/gcconfig.h include/private/gc_mark.h \
     include/gc_inline.h gc.man tools/threadlibs.c \
     tools/if_mach.c tools/if_not_there.c gc_cpp.cc include/gc_cpp.h \
     include/weakpointer.h include/private/gc_locks.h \
-    include/new_gc_alloc.h include/javaxfc.h sparc_sunos4_mach_dep.s \
+    include/new_gc_alloc.h include/javaxfc.h src/sparc_sunos4_mach_dep.s \
     include/private/solaris_threads.h include/gc_backptr.h \
     include/gc_gcj.h include/private/dbg_mlc.h \
     include/private/specific.h \

diff --git a/PCR-Makefile b/PCR-Makefile
index 518d826..044b964 100644 (file)
--- a/PCR-Makefile
+++ b/PCR-Makefile
@@ -10,7 +10,6 @@ include ../config/common.mk
 # compilation flags, etc.
 #
 
-
 CPPFLAGS = $(INCLUDE) $(CONFIG_CPPFLAGS) \
        -DPCR_NO_RENAME -DPCR_NO_HOSTDEP_ERR
 #CFLAGS        = -DPCR $(CONFIG_CFLAGS)
@@ -27,14 +26,8 @@ LDRFLAGS = $(CONFIG_LDRFLAGS)
 LDFLAGS = $(CONFIG_LDFLAGS)
 
 #
-#
-#
-#
 # BEGIN PACKAGE-SPECIFIC PART
 #
-#
-#
-#
 
 # Fix to point to local pcr installation directory.
 PCRDIR= ..
@@ -50,14 +43,5 @@ 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 mips_mach_dep.s if_mach if_not_there
-       rm -f mach_dep.o
-       ./if_mach MIPS "" as -o mach_dep.o mips_mach_dep.s
-       ./if_not_there mach_dep.o $(CC) -c $(SPECIALCFLAGS) mach_dep.c
-
-if_mach: tools/if_mach.c gcconfig.h
-       $(CC) $(CFLAGS) -o if_mach tools/if_mach.c
-
-if_not_there: tools/if_not_there.c
-       $(CC) $(CFLAGS) -o if_not_there tools/if_not_there.c
+mach_dep.o: mach_dep.c
+       $(CC) -c $(SPECIALCFLAGS) mach_dep.c

diff --git a/configure.ac b/configure.ac
index 4376ed5..9f7b3fa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ dnl Process this file with autoconf to produce configure.
 # Initialization
 # ==============
 
-AC_INIT(gc,7.2alpha7,Hans.Boehm@hp.com)
+AC_INIT(gc,7.2alpha7,hans.boehm@hp.com)
     ## version must conform to [0-9]+[.][0-9]+(alpha[0-9]+)?
 AC_CONFIG_SRCDIR(gcj_mlc.c)
 AC_CONFIG_MACRO_DIR([m4])
@@ -429,27 +429,27 @@ case "$host" in
     dnl performance under Irix.
     ;;
  sparc*-*-linux*)
-    machdep="mach_dep.lo sparc_mach_dep.lo"
+    machdep="mach_dep.lo src/sparc_mach_dep.lo"
     ;;
  sparc-*-netbsd*)
-    machdep="mach_dep.lo sparc_netbsd_mach_dep.lo"
+    machdep="mach_dep.lo src/sparc_netbsd_mach_dep.lo"
     ;;
  sparc64-*-netbsd*)
-    machdep="mach_dep.lo sparc_mach_dep.lo"
+    machdep="mach_dep.lo src/sparc_mach_dep.lo"
     ;;
  sparc*-*-openbsd*)
-    machdep="mach_dep.lo sparc_mach_dep.lo"
+    machdep="mach_dep.lo src/sparc_mach_dep.lo"
     ;;
  sparc-sun-solaris2.3)
-    machdep="mach_dep.lo sparc_mach_dep.lo"
+    machdep="mach_dep.lo src/sparc_mach_dep.lo"
     AC_DEFINE(SUNOS53_SHARED_LIB, 1,
               [Define to work around a Solaris 5.3 bug (see dyn_load.c).])
     ;;
  sparc*-sun-solaris2*)
-    machdep="mach_dep.lo sparc_mach_dep.lo"
+    machdep="mach_dep.lo src/sparc_mach_dep.lo"
     ;;
  ia64-*-*)
-    machdep="mach_dep.lo ia64_save_regs_in_stack.lo"
+    machdep="mach_dep.lo src/ia64_save_regs_in_stack.lo"
     ;;
 esac
 if test x"$machdep" = x; then

diff --git a/gc.mak b/gc.mak
index 22ee909..a25fcdc 100644 (file)
--- a/gc.mak
+++ b/gc.mak
@@ -8,7 +8,7 @@
 !IF "$(CFG)" == ""
 CFG=gctest - Win32 Release
 !MESSAGE No configuration specified.  Defaulting to cord - Win32 Debug.
-!ENDIF 
+!ENDIF
 
 !IF "$(CFG)" != "gc - Win32 Release" && "$(CFG)" != "gc - Win32 Debug" &&\
  "$(CFG)" != "gctest - Win32 Release" && "$(CFG)" != "gctest - Win32 Debug" &&\
@@ -16,26 +16,26 @@ CFG=gctest - Win32 Release
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE on this makefile
 !MESSAGE by defining the macro CFG on the command line.  For example:
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "gc.mak" CFG="cord - Win32 Debug"
-!MESSAGE 
+!MESSAGE
 !MESSAGE Possible choices for configuration are:
-!MESSAGE 
+!MESSAGE
 !MESSAGE "gc - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "gc - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "gctest - Win32 Release" (based on "Win32 (x86) Application")
 !MESSAGE "gctest - Win32 Debug" (based on "Win32 (x86) Application")
 !MESSAGE "cord - Win32 Release" (based on "Win32 (x86) Application")
 !MESSAGE "cord - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE 
+!MESSAGE
 !ERROR An invalid configuration is specified.
-!ENDIF 
+!ENDIF
 
 !IF "$(OS)" == "Windows_NT"
 NULL=
-!ELSE 
+!ELSE
 NULL=nul
-!ENDIF 
+!ENDIF
 ################################################################################
 # Begin Project
 # PROP Target_Last_Scanned "gctest - Win32 Debug"
@@ -57,7 +57,7 @@ INTDIR=.\Release
 
 ALL : ".\Release\gc.dll" ".\Release\gc.bsc"
 
-CLEAN : 
+CLEAN :
        -@erase ".\Release\allchblk.obj"
        -@erase ".\Release\allchblk.sbr"
        -@erase ".\Release\alloc.obj"
@@ -120,39 +120,39 @@ CPP=cl.exe
 CPP_PROJ=/nologo /MD /W3 /GX /O2 /I include /D "NDEBUG" /D\
  "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /D "GC_THREADS" \
  /FR"$(INTDIR)/" /Fp"$(INTDIR)/gc.pch" \
- /Ilibatomic_ops/src /YX /Fo"$(INTDIR)/" /c 
+ /I./libatomic_ops/src /YX /Fo"$(INTDIR)/" /c
 CPP_OBJS=.\Release/
 CPP_SBRS=.\Release/
 
 .c{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
+   $(CPP) $(CPP_PROJ) $<
 
 .cpp{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
+   $(CPP) $(CPP_PROJ) $<
 
 .cxx{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
+   $(CPP) $(CPP_PROJ) $<
 
 .c{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
+   $(CPP) $(CPP_PROJ) $<
 
 .cpp{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
+   $(CPP) $(CPP_PROJ) $<
 
 .cxx{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
+   $(CPP) $(CPP_PROJ) $<
 
 MTL=mktyplib.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /win32
 # ADD MTL /nologo /D "NDEBUG" /win32
-MTL_PROJ=/nologo /D "NDEBUG" /win32 
+MTL_PROJ=/nologo /D "NDEBUG" /win32
 RSC=rc.exe
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
 # ADD RSC /l 0x809 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/gc.bsc" 
+BSC32_FLAGS=/nologo /o"$(OUTDIR)/gc.bsc"
 BSC32_SBRS= \
        ".\Release\allchblk.sbr" \
        ".\Release\alloc.sbr" \
@@ -191,7 +191,7 @@ LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
  advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
  odbccp32.lib /nologo /subsystem:windows /dll /incremental:no\
  /pdb:"$(OUTDIR)/gc.pdb" /machine:I386 /out:"$(OUTDIR)/gc.dll"\
- /implib:"$(OUTDIR)/gc.lib" 
+ /implib:"$(OUTDIR)/gc.lib"
 LINK32_OBJS= \
        ".\Release\allchblk.obj" \
        ".\Release\alloc.obj" \
@@ -240,7 +240,7 @@ INTDIR=.\Debug
 
 ALL : ".\Debug\gc.dll" ".\Debug\gc.bsc"
 
-CLEAN : 
+CLEAN :
        -@erase ".\Debug\allchblk.obj"
        -@erase ".\Debug\allchblk.sbr"
        -@erase ".\Debug\alloc.obj"
@@ -308,39 +308,39 @@ CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I include /D "_DEBUG"\
  /D "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" \
  /D "GC_ASSERTIONS" /D "GC_THREADS" \
  /FR"$(INTDIR)/" /Fp"$(INTDIR)/gc.pch" /YX /Fo"$(INTDIR)/"\
- /Ilibatomic_ops/src /Fd"$(INTDIR)/" /c 
+ /I./libatomic_ops/src /Fd"$(INTDIR)/" /c
 CPP_OBJS=.\Debug/
 CPP_SBRS=.\Debug/
 
 .c{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
+   $(CPP) $(CPP_PROJ) $<
 
 .cpp{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
+   $(CPP) $(CPP_PROJ) $<
 
 .cxx{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
+   $(CPP) $(CPP_PROJ) $<
 
 .c{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
+   $(CPP) $(CPP_PROJ) $<
 
 .cpp{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
+   $(CPP) $(CPP_PROJ) $<
 
 .cxx{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
+   $(CPP) $(CPP_PROJ) $<
 
 MTL=mktyplib.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /win32
 # ADD MTL /nologo /D "_DEBUG" /win32
-MTL_PROJ=/nologo /D "_DEBUG" /win32 
+MTL_PROJ=/nologo /D "_DEBUG" /win32
 RSC=rc.exe
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
 # ADD RSC /l 0x809 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/gc.bsc" 
+BSC32_FLAGS=/nologo /o"$(OUTDIR)/gc.bsc"
 BSC32_SBRS= \
        ".\Debug\allchblk.sbr" \
        ".\Debug\alloc.sbr" \
@@ -379,7 +379,7 @@ LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
  advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
  odbccp32.lib /nologo /subsystem:windows /dll /incremental:no\
  /pdb:"$(OUTDIR)/gc.pdb" /map:"$(INTDIR)/gc.map" /debug /machine:I386\
- /out:"$(OUTDIR)/gc.dll" /implib:"$(OUTDIR)/gc.lib" 
+ /out:"$(OUTDIR)/gc.dll" /implib:"$(OUTDIR)/gc.lib"
 LINK32_OBJS= \
        ".\Debug\allchblk.obj" \
        ".\Debug\alloc.obj" \
@@ -428,7 +428,7 @@ INTDIR=.\gctest\Release
 
 ALL : "gc - Win32 Release" ".\Release\gctest.exe"
 
-CLEAN : 
+CLEAN :
        -@erase ".\gctest\Release\test.obj"
        -@erase ".\Release\gctest.exe"
 
@@ -443,49 +443,49 @@ CPP=cl.exe
 # ADD CPP /nologo /MD /W3 /GX /O2 /I include /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /D "GC_THREADS" /YX /c
 CPP_PROJ=/nologo /MD /W3 /GX /O2 /I include /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D\
  "ALL_INTERIOR_POINTERS" /D "GC_THREADS" \
- /Ilibatomic_ops/src /Fp"$(INTDIR)/gctest.pch" \
- /YX /Fo"$(INTDIR)/" /c 
+ /I./libatomic_ops/src /Fp"$(INTDIR)/gctest.pch" \
+ /YX /Fo"$(INTDIR)/" /c
 CPP_OBJS=.\gctest\Release/
 CPP_SBRS=.\.
 
 .c{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
+   $(CPP) $(CPP_PROJ) $<
 
 .cpp{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
+   $(CPP) $(CPP_PROJ) $<
 
 .cxx{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
+   $(CPP) $(CPP_PROJ) $<
 
 .c{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
+   $(CPP) $(CPP_PROJ) $<
 
 .cpp{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
+   $(CPP) $(CPP_PROJ) $<
 
 .cxx{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
+   $(CPP) $(CPP_PROJ) $<
 
 MTL=mktyplib.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /win32
 # ADD MTL /nologo /D "NDEBUG" /win32
-MTL_PROJ=/nologo /D "NDEBUG" /win32 
+MTL_PROJ=/nologo /D "NDEBUG" /win32
 RSC=rc.exe
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
 # ADD RSC /l 0x809 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/gctest.bsc" 
+BSC32_FLAGS=/nologo /o"$(OUTDIR)/gctest.bsc"
 BSC32_SBRS= \
-       
+
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 /out:"Release/gctest.exe"
 LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
  advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
  odbccp32.lib /nologo /subsystem:windows /incremental:no\
- /pdb:"$(OUTDIR)/gctest.pdb" /machine:I386 /out:"Release/gctest.exe" 
+ /pdb:"$(OUTDIR)/gctest.pdb" /machine:I386 /out:"Release/gctest.exe"
 LINK32_OBJS= \
        ".\gctest\Release\test.obj" \
        ".\Release\gc.lib"
@@ -512,7 +512,7 @@ INTDIR=.\gctest\Debug
 
 ALL : "gc - Win32 Debug" ".\Debug\gctest.exe" ".\gctest\Debug\gctest.bsc"
 
-CLEAN : 
+CLEAN :
        -@erase ".\Debug\gctest.exe"
        -@erase ".\gctest\Debug\gctest.bsc"
        -@erase ".\gctest\Debug\gctest.map"
@@ -530,39 +530,39 @@ CPP=cl.exe
 # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /D "GC_THREADS" /FR /YX /c
 CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I include /D "_DEBUG" /D "WIN32" /D "_WINDOWS"\
  /D "ALL_INTERIOR_POINTERS" /D "GC_THREADS" /FR"$(INTDIR)/"\
- /Ilibatomic_ops/src /Fp"$(INTDIR)/gctest.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 
+ /I./libatomic_ops/src /Fp"$(INTDIR)/gctest.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
 CPP_OBJS=.\gctest\Debug/
 CPP_SBRS=.\gctest\Debug/
 
 .c{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
+   $(CPP) $(CPP_PROJ) $<
 
 .cpp{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
+   $(CPP) $(CPP_PROJ) $<
 
 .cxx{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
+   $(CPP) $(CPP_PROJ) $<
 
 .c{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
+   $(CPP) $(CPP_PROJ) $<
 
 .cpp{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
+   $(CPP) $(CPP_PROJ) $<
 
 .cxx{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
+   $(CPP) $(CPP_PROJ) $<
 
 MTL=mktyplib.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /win32
 # ADD MTL /nologo /D "_DEBUG" /win32
-MTL_PROJ=/nologo /D "_DEBUG" /win32 
+MTL_PROJ=/nologo /D "_DEBUG" /win32
 RSC=rc.exe
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
 # ADD RSC /l 0x809 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/gctest.bsc" 
+BSC32_FLAGS=/nologo /o"$(OUTDIR)/gctest.bsc"
 BSC32_SBRS= \
        ".\gctest\Debug\test.sbr"
 
@@ -578,7 +578,7 @@ LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
  advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
  odbccp32.lib /nologo /subsystem:windows /incremental:no\
  /pdb:"$(OUTDIR)/gctest.pdb" /map:"$(INTDIR)/gctest.map" /debug /machine:I386\
- /out:"Debug/gctest.exe" 
+ /out:"Debug/gctest.exe"
 LINK32_OBJS= \
        ".\Debug\gc.lib" \
        ".\gctest\Debug\test.obj"
@@ -605,7 +605,7 @@ INTDIR=.\cord\Release
 
 ALL : "gc - Win32 Release" ".\Release\de.exe"
 
-CLEAN : 
+CLEAN :
        -@erase ".\cord\Release\cordbscs.obj"
        -@erase ".\cord\Release\cordxtra.obj"
        -@erase ".\cord\Release\de.obj"
@@ -620,49 +620,49 @@ CPP=cl.exe
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
 # ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /YX /c
 CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "." /I include /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D\
- /Ilibatomic_ops/src "ALL_INTERIOR_POINTERS" /Fp"$(INTDIR)/cord.pch" /YX /Fo"$(INTDIR)/" /c 
+ /I./libatomic_ops/src "ALL_INTERIOR_POINTERS" /Fp"$(INTDIR)/cord.pch" /YX /Fo"$(INTDIR)/" /c
 CPP_OBJS=.\cord\Release/
 CPP_SBRS=.\.
 
 .c{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
+   $(CPP) $(CPP_PROJ) $<
 
 .cpp{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
+   $(CPP) $(CPP_PROJ) $<
 
 .cxx{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
+   $(CPP) $(CPP_PROJ) $<
 
 .c{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
+   $(CPP) $(CPP_PROJ) $<
 
 .cpp{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
+   $(CPP) $(CPP_PROJ) $<
 
 .cxx{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
+   $(CPP) $(CPP_PROJ) $<
 
 MTL=mktyplib.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /win32
 # ADD MTL /nologo /D "NDEBUG" /win32
-MTL_PROJ=/nologo /D "NDEBUG" /win32 
+MTL_PROJ=/nologo /D "NDEBUG" /win32
 RSC=rc.exe
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
 # ADD RSC /l 0x809 /d "NDEBUG"
-RSC_PROJ=/l 0x809 /fo"$(INTDIR)/de_win.res" /d "NDEBUG" 
+RSC_PROJ=/l 0x809 /fo"$(INTDIR)/de_win.res" /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/cord.bsc" 
+BSC32_FLAGS=/nologo /o"$(OUTDIR)/cord.bsc"
 BSC32_SBRS= \
-       
+
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 /out:"Release/de.exe"
 LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
  advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
  odbccp32.lib /nologo /subsystem:windows /incremental:no /pdb:"$(OUTDIR)/de.pdb"\
- /machine:I386 /out:"Release/de.exe" 
+ /machine:I386 /out:"Release/de.exe"
 LINK32_OBJS= \
        ".\cord\Release\cordbscs.obj" \
        ".\cord\Release\cordxtra.obj" \
@@ -693,7 +693,7 @@ INTDIR=.\cord\Debug
 
 ALL : "gc - Win32 Debug" ".\Debug\de.exe"
 
-CLEAN : 
+CLEAN :
        -@erase ".\cord\Debug\cordbscs.obj"
        -@erase ".\cord\Debug\cordxtra.obj"
        -@erase ".\cord\Debug\de.obj"
@@ -713,49 +713,49 @@ CPP=cl.exe
 # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /YX /c
 CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "." /I include /D "_DEBUG" /D "WIN32" /D\
  "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /Fp"$(INTDIR)/cord.pch" /YX\
- /Ilibatomic_ops/src /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 
+ /I./libatomic_ops/src /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
 CPP_OBJS=.\cord\Debug/
 CPP_SBRS=.\.
 
 .c{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
+   $(CPP) $(CPP_PROJ) $<
 
 .cpp{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
+   $(CPP) $(CPP_PROJ) $<
 
 .cxx{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
+   $(CPP) $(CPP_PROJ) $<
 
 .c{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
+   $(CPP) $(CPP_PROJ) $<
 
 .cpp{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
+   $(CPP) $(CPP_PROJ) $<
 
 .cxx{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
+   $(CPP) $(CPP_PROJ) $<
 
 MTL=mktyplib.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /win32
 # ADD MTL /nologo /D "_DEBUG" /win32
-MTL_PROJ=/nologo /D "_DEBUG" /win32 
+MTL_PROJ=/nologo /D "_DEBUG" /win32
 RSC=rc.exe
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
 # ADD RSC /l 0x809 /d "_DEBUG"
-RSC_PROJ=/l 0x809 /fo"$(INTDIR)/de_win.res" /d "_DEBUG" 
+RSC_PROJ=/l 0x809 /fo"$(INTDIR)/de_win.res" /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/cord.bsc" 
+BSC32_FLAGS=/nologo /o"$(OUTDIR)/cord.bsc"
 BSC32_SBRS= \
-       
+
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /out:"Debug/de.exe"
 LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
  advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
  odbccp32.lib /nologo /subsystem:windows /incremental:yes\
- /pdb:"$(OUTDIR)/de.pdb" /debug /machine:I386 /out:"Debug/de.exe" 
+ /pdb:"$(OUTDIR)/de.pdb" /debug /machine:I386 /out:"Debug/de.exe"
 LINK32_OBJS= \
        ".\cord\Debug\cordbscs.obj" \
        ".\cord\Debug\cordxtra.obj" \
@@ -769,7 +769,7 @@ LINK32_OBJS= \
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
 
-!ENDIF 
+!ENDIF
 
 ################################################################################
 # Begin Target
@@ -781,7 +781,7 @@ LINK32_OBJS= \
 
 !ELSEIF  "$(CFG)" == "gc - Win32 Debug"
 
-!ENDIF 
+!ENDIF
 
 ################################################################################
 # Begin Source File
@@ -797,12 +797,12 @@ DEP_CPP_RECLA=\
        ".\include\private\gc_priv.h"\
        ".\include\gc_cpp.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_RECLA=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Release\gc_cpp.obj" : $(SOURCE) $(DEP_CPP_RECLA) "$(INTDIR)"
 
@@ -818,19 +818,19 @@ DEP_CPP_RECLA=\
        ".\include\private\gc_priv.h"\
        ".\include\gc_cpp.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_RECLA=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Debug\gc_cpp.obj" : $(SOURCE) $(DEP_CPP_RECLA) "$(INTDIR)"
 
 ".\Debug\gc_cpp.sbr" : $(SOURCE) $(DEP_CPP_RECLA) "$(INTDIR)"
 
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 ################################################################################
@@ -846,12 +846,12 @@ DEP_CPP_RECLA=\
        ".\include\private\gc_hdrs.h"\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_RECLA=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Release\reclaim.obj" : $(SOURCE) $(DEP_CPP_RECLA) "$(INTDIR)"
 
@@ -866,19 +866,19 @@ DEP_CPP_RECLA=\
        ".\include\private\gc_hdrs.h"\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_RECLA=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Debug\reclaim.obj" : $(SOURCE) $(DEP_CPP_RECLA) "$(INTDIR)"
 
 ".\Debug\reclaim.sbr" : $(SOURCE) $(DEP_CPP_RECLA) "$(INTDIR)"
 
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 
@@ -896,7 +896,7 @@ DEP_CPP_OS_DE=\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\STAT.H"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_OS_DE=\
        ".\il\PCR_IL.h"\
        ".\mm\PCR_MM.h"\
@@ -904,7 +904,7 @@ NODEP_CPP_OS_DE=\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
        ".\vd\PCR_VD.h"\
-       
+
 
 ".\Release\os_dep.obj" : $(SOURCE) $(DEP_CPP_OS_DE) "$(INTDIR)"
 
@@ -920,7 +920,7 @@ DEP_CPP_OS_DE=\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\STAT.H"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_OS_DE=\
        ".\il\PCR_IL.h"\
        ".\mm\PCR_MM.h"\
@@ -928,14 +928,14 @@ NODEP_CPP_OS_DE=\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
        ".\vd\PCR_VD.h"\
-       
+
 
 ".\Debug\os_dep.obj" : $(SOURCE) $(DEP_CPP_OS_DE) "$(INTDIR)"
 
 ".\Debug\os_dep.sbr" : $(SOURCE) $(DEP_CPP_OS_DE) "$(INTDIR)"
 
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 ################################################################################
@@ -951,13 +951,13 @@ DEP_CPP_MISC_=\
        ".\include\private\gc_hdrs.h"\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_MISC_=\
        ".\il\PCR_IL.h"\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Release\misc.obj" : $(SOURCE) $(DEP_CPP_MISC_) "$(INTDIR)"
 
@@ -972,20 +972,20 @@ DEP_CPP_MISC_=\
        ".\include\private\gc_hdrs.h"\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_MISC_=\
        ".\il\PCR_IL.h"\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Debug\misc.obj" : $(SOURCE) $(DEP_CPP_MISC_) "$(INTDIR)"
 
 ".\Debug\misc.sbr" : $(SOURCE) $(DEP_CPP_MISC_) "$(INTDIR)"
 
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 ################################################################################
@@ -1001,12 +1001,12 @@ DEP_CPP_MARK_=\
        ".\include\private\gc_hdrs.h"\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_MARK_=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Release\mark_rts.obj" : $(SOURCE) $(DEP_CPP_MARK_) "$(INTDIR)"
 
@@ -1021,19 +1021,19 @@ DEP_CPP_MARK_=\
        ".\include\private\gc_hdrs.h"\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_MARK_=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Debug\mark_rts.obj" : $(SOURCE) $(DEP_CPP_MARK_) "$(INTDIR)"
 
 ".\Debug\mark_rts.sbr" : $(SOURCE) $(DEP_CPP_MARK_) "$(INTDIR)"
 
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 ################################################################################
@@ -1049,12 +1049,12 @@ DEP_CPP_MACH_=\
        ".\include\private\gc_hdrs.h"\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_MACH_=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Release\mach_dep.obj" : $(SOURCE) $(DEP_CPP_MACH_) "$(INTDIR)"
 
@@ -1069,19 +1069,19 @@ DEP_CPP_MACH_=\
        ".\include\private\gc_hdrs.h"\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_MACH_=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Debug\mach_dep.obj" : $(SOURCE) $(DEP_CPP_MACH_) "$(INTDIR)"
 
 ".\Debug\mach_dep.sbr" : $(SOURCE) $(DEP_CPP_MACH_) "$(INTDIR)"
 
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 ################################################################################
@@ -1097,12 +1097,12 @@ DEP_CPP_HEADE=\
        ".\include\private\gc_hdrs.h"\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_HEADE=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Release\headers.obj" : $(SOURCE) $(DEP_CPP_HEADE) "$(INTDIR)"
 
@@ -1117,19 +1117,19 @@ DEP_CPP_HEADE=\
        ".\include\private\gc_hdrs.h"\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_HEADE=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Debug\headers.obj" : $(SOURCE) $(DEP_CPP_HEADE) "$(INTDIR)"
 
 ".\Debug\headers.sbr" : $(SOURCE) $(DEP_CPP_HEADE) "$(INTDIR)"
 
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 ################################################################################
@@ -1145,12 +1145,12 @@ DEP_CPP_ALLOC=\
        ".\include\private\gc_hdrs.h"\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_ALLOC=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Release\alloc.obj" : $(SOURCE) $(DEP_CPP_ALLOC) "$(INTDIR)"
 
@@ -1165,19 +1165,19 @@ DEP_CPP_ALLOC=\
        ".\include\private\gc_hdrs.h"\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_ALLOC=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Debug\alloc.obj" : $(SOURCE) $(DEP_CPP_ALLOC) "$(INTDIR)"
 
 ".\Debug\alloc.sbr" : $(SOURCE) $(DEP_CPP_ALLOC) "$(INTDIR)"
 
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 ################################################################################
@@ -1193,12 +1193,12 @@ DEP_CPP_ALLCH=\
        ".\include\private\gc_hdrs.h"\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_ALLCH=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Release\allchblk.obj" : $(SOURCE) $(DEP_CPP_ALLCH) "$(INTDIR)"
 
@@ -1213,19 +1213,19 @@ DEP_CPP_ALLCH=\
        ".\include\private\gc_hdrs.h"\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_ALLCH=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Debug\allchblk.obj" : $(SOURCE) $(DEP_CPP_ALLCH) "$(INTDIR)"
 
 ".\Debug\allchblk.sbr" : $(SOURCE) $(DEP_CPP_ALLCH) "$(INTDIR)"
 
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 ################################################################################
@@ -1241,12 +1241,12 @@ DEP_CPP_STUBB=\
        ".\include\private\gc_hdrs.h"\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_STUBB=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Release\stubborn.obj" : $(SOURCE) $(DEP_CPP_STUBB) "$(INTDIR)"
 
@@ -1261,19 +1261,19 @@ DEP_CPP_STUBB=\
        ".\include\private\gc_hdrs.h"\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_STUBB=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Debug\stubborn.obj" : $(SOURCE) $(DEP_CPP_STUBB) "$(INTDIR)"
 
 ".\Debug\stubborn.sbr" : $(SOURCE) $(DEP_CPP_STUBB) "$(INTDIR)"
 
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 ################################################################################
@@ -1289,12 +1289,12 @@ DEP_CPP_OBJ_M=\
        ".\include\private\gc_hdrs.h"\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_OBJ_M=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Release\obj_map.obj" : $(SOURCE) $(DEP_CPP_OBJ_M) "$(INTDIR)"
 
@@ -1309,19 +1309,19 @@ DEP_CPP_OBJ_M=\
        ".\include\private\gc_hdrs.h"\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_OBJ_M=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Debug\obj_map.obj" : $(SOURCE) $(DEP_CPP_OBJ_M) "$(INTDIR)"
 
 ".\Debug\obj_map.sbr" : $(SOURCE) $(DEP_CPP_OBJ_M) "$(INTDIR)"
 
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 ################################################################################
@@ -1337,12 +1337,12 @@ DEP_CPP_NEW_H=\
        ".\include\private\gc_hdrs.h"\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_NEW_H=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Release\new_hblk.obj" : $(SOURCE) $(DEP_CPP_NEW_H) "$(INTDIR)"
 
@@ -1357,19 +1357,19 @@ DEP_CPP_NEW_H=\
        ".\include\private\gc_hdrs.h"\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_NEW_H=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Debug\new_hblk.obj" : $(SOURCE) $(DEP_CPP_NEW_H) "$(INTDIR)"
 
 ".\Debug\new_hblk.sbr" : $(SOURCE) $(DEP_CPP_NEW_H) "$(INTDIR)"
 
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 ################################################################################
@@ -1387,12 +1387,12 @@ DEP_CPP_MARK_C=\
        ".\include\gc_mark.h"\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_MARK_C=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Release\mark.obj" : $(SOURCE) $(DEP_CPP_MARK_C) "$(INTDIR)"
 
@@ -1409,19 +1409,19 @@ DEP_CPP_MARK_C=\
        ".\include\gc_mark.h"\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_MARK_C=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Debug\mark.obj" : $(SOURCE) $(DEP_CPP_MARK_C) "$(INTDIR)"
 
 ".\Debug\mark.sbr" : $(SOURCE) $(DEP_CPP_MARK_C) "$(INTDIR)"
 
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 ################################################################################
@@ -1437,12 +1437,12 @@ DEP_CPP_MALLO=\
        ".\include\private\gc_hdrs.h"\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_MALLO=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Release\malloc.obj" : $(SOURCE) $(DEP_CPP_MALLO) "$(INTDIR)"
 
@@ -1457,19 +1457,19 @@ DEP_CPP_MALLO=\
        ".\include\private\gc_hdrs.h"\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_MALLO=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Debug\malloc.obj" : $(SOURCE) $(DEP_CPP_MALLO) "$(INTDIR)"
 
 ".\Debug\malloc.sbr" : $(SOURCE) $(DEP_CPP_MALLO) "$(INTDIR)"
 
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 ################################################################################
@@ -1485,12 +1485,12 @@ DEP_CPP_MALLX=\
        ".\include\private\gc_hdrs.h"\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_MALLX=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Release\mallocx.obj" : $(SOURCE) $(DEP_CPP_MALLX) "$(INTDIR)"
 
@@ -1505,19 +1505,19 @@ DEP_CPP_MALLX=\
        ".\include\private\gc_hdrs.h"\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_MALLX=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Debug\mallocx.obj" : $(SOURCE) $(DEP_CPP_MALLX) "$(INTDIR)"
 
 ".\Debug\mallocx.sbr" : $(SOURCE) $(DEP_CPP_MALLX) "$(INTDIR)"
 
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 ################################################################################
@@ -1535,12 +1535,12 @@ DEP_CPP_FINAL=\
        ".\include\gc_mark.h"\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_FINAL=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Release\finalize.obj" : $(SOURCE) $(DEP_CPP_FINAL) "$(INTDIR)"
 
@@ -1557,19 +1557,19 @@ DEP_CPP_FINAL=\
        ".\include\gc_mark.h"\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_FINAL=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Debug\finalize.obj" : $(SOURCE) $(DEP_CPP_FINAL) "$(INTDIR)"
 
 ".\Debug\finalize.sbr" : $(SOURCE) $(DEP_CPP_FINAL) "$(INTDIR)"
 
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 ################################################################################
@@ -1585,12 +1585,12 @@ DEP_CPP_DBG_M=\
        ".\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\dbg_mlc.obj" : $(SOURCE) $(DEP_CPP_DBG_M) "$(INTDIR)"
 
@@ -1605,19 +1605,19 @@ DEP_CPP_DBG_M=\
        ".\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\dbg_mlc.obj" : $(SOURCE) $(DEP_CPP_DBG_M) "$(INTDIR)"
 
 ".\Debug\dbg_mlc.sbr" : $(SOURCE) $(DEP_CPP_DBG_M) "$(INTDIR)"
 
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 ################################################################################
@@ -1633,12 +1633,12 @@ DEP_CPP_BLACK=\
        ".\include\private\gc_hdrs.h"\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_BLACK=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Release\blacklst.obj" : $(SOURCE) $(DEP_CPP_BLACK) "$(INTDIR)"
 
@@ -1653,19 +1653,19 @@ DEP_CPP_BLACK=\
        ".\include\private\gc_hdrs.h"\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_BLACK=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Debug\blacklst.obj" : $(SOURCE) $(DEP_CPP_BLACK) "$(INTDIR)"
 
 ".\Debug\blacklst.sbr" : $(SOURCE) $(DEP_CPP_BLACK) "$(INTDIR)"
 
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 ################################################################################
@@ -1684,12 +1684,12 @@ DEP_CPP_TYPD_=\
        ".\include\private\gc_priv.h"\
        ".\include\gc_typed.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_TYPD_=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Release\typd_mlc.obj" : $(SOURCE) $(DEP_CPP_TYPD_) "$(INTDIR)"
 
@@ -1707,19 +1707,19 @@ DEP_CPP_TYPD_=\
        ".\include\private\gc_priv.h"\
        ".\include\gc_typed.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_TYPD_=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Debug\typd_mlc.obj" : $(SOURCE) $(DEP_CPP_TYPD_) "$(INTDIR)"
 
 ".\Debug\typd_mlc.sbr" : $(SOURCE) $(DEP_CPP_TYPD_) "$(INTDIR)"
 
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 ################################################################################
@@ -1737,12 +1737,12 @@ DEP_CPP_PTR_C=\
        ".\include\gc_mark.h"\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_PTR_C=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Release\ptr_chck.obj" : $(SOURCE) $(DEP_CPP_PTR_C) "$(INTDIR)"
 
@@ -1759,19 +1759,19 @@ DEP_CPP_PTR_C=\
        ".\include\gc_mark.h"\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_PTR_C=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Debug\ptr_chck.obj" : $(SOURCE) $(DEP_CPP_PTR_C) "$(INTDIR)"
 
 ".\Debug\ptr_chck.sbr" : $(SOURCE) $(DEP_CPP_PTR_C) "$(INTDIR)"
 
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 ################################################################################
@@ -1788,14 +1788,14 @@ DEP_CPP_DYN_L=\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\STAT.H"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_DYN_L=\
        ".\il\PCR_IL.h"\
        ".\mm\PCR_MM.h"\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Release\dyn_load.obj" : $(SOURCE) $(DEP_CPP_DYN_L) "$(INTDIR)"
 
@@ -1811,21 +1811,21 @@ DEP_CPP_DYN_L=\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\STAT.H"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_DYN_L=\
        ".\il\PCR_IL.h"\
        ".\mm\PCR_MM.h"\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Debug\dyn_load.obj" : $(SOURCE) $(DEP_CPP_DYN_L) "$(INTDIR)"
 
 ".\Debug\dyn_load.sbr" : $(SOURCE) $(DEP_CPP_DYN_L) "$(INTDIR)"
 
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 ################################################################################
@@ -1841,12 +1841,12 @@ DEP_CPP_WIN32=\
        ".\include\private\gc_hdrs.h"\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_WIN32=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Release\win32_threads.obj" : $(SOURCE) $(DEP_CPP_WIN32) "$(INTDIR)"
 
@@ -1861,19 +1861,19 @@ DEP_CPP_WIN32=\
        ".\include\private\gc_hdrs.h"\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_WIN32=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Debug\win32_threads.obj" : $(SOURCE) $(DEP_CPP_WIN32) "$(INTDIR)"
 
 ".\Debug\win32_threads.sbr" : $(SOURCE) $(DEP_CPP_WIN32) "$(INTDIR)"
 
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 ################################################################################
@@ -1890,12 +1890,12 @@ DEP_CPP_WIN32=\
        ".\include\private\gc_priv.h"\
        ".\include\private\msvc_dbg.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_WIN32=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Release\msvc_dbg.obj" : $(SOURCE) $(DEP_CPP_WIN32) "$(INTDIR)"
 
@@ -1911,19 +1911,19 @@ DEP_CPP_WIN32=\
        ".\include\private\gc_priv.h"\
        ".\include\private\msvc_dbg.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_WIN32=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Debug\msvc_dbg.obj" : $(SOURCE) $(DEP_CPP_WIN32) "$(INTDIR)"
 
 ".\Debug\msvc_dbg.sbr" : $(SOURCE) $(DEP_CPP_WIN32) "$(INTDIR)"
 
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 ################################################################################
@@ -1939,12 +1939,12 @@ DEP_CPP_CHECK=\
        ".\include\private\gc_hdrs.h"\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_CHECK=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Release\checksums.obj" : $(SOURCE) $(DEP_CPP_CHECK) "$(INTDIR)"
 
@@ -1959,19 +1959,19 @@ DEP_CPP_CHECK=\
        ".\include\private\gc_hdrs.h"\
        ".\include\private\gc_priv.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_CHECK=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 ".\Debug\checksums.obj" : $(SOURCE) $(DEP_CPP_CHECK) "$(INTDIR)"
 
 ".\Debug\checksums.sbr" : $(SOURCE) $(DEP_CPP_CHECK) "$(INTDIR)"
 
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # End Target
@@ -1985,7 +1985,7 @@ NODEP_CPP_CHECK=\
 
 !ELSEIF  "$(CFG)" == "gctest - Win32 Debug"
 
-!ENDIF 
+!ENDIF
 
 ################################################################################
 # Begin Project Dependency
@@ -1994,15 +1994,15 @@ NODEP_CPP_CHECK=\
 
 !IF  "$(CFG)" == "gctest - Win32 Release"
 
-"gc - Win32 Release" : 
-   $(MAKE) /$(MAKEFLAGS) /F ".\gc.mak" CFG="gc - Win32 Release" 
+"gc - Win32 Release" :
+   $(MAKE) /$(MAKEFLAGS) /F ".\gc.mak" CFG="gc - Win32 Release"
 
 !ELSEIF  "$(CFG)" == "gctest - Win32 Debug"
 
-"gc - Win32 Debug" : 
-   $(MAKE) /$(MAKEFLAGS) /F ".\gc.mak" CFG="gc - Win32 Debug" 
+"gc - Win32 Debug" :
+   $(MAKE) /$(MAKEFLAGS) /F ".\gc.mak" CFG="gc - Win32 Debug"
 
-!ENDIF 
+!ENDIF
 
 # End Project Dependency
 ################################################################################
@@ -2016,12 +2016,12 @@ DEP_CPP_TEST_=\
        ".\include\private\gc_priv.h"\
        ".\include\gc_typed.h"\
        {$(INCLUDE)}"\sys\TYPES.H"\
-       
+
 NODEP_CPP_TEST_=\
        ".\th\PCR_Th.h"\
        ".\th\PCR_ThCrSec.h"\
        ".\th\PCR_ThCtl.h"\
-       
+
 
 !IF  "$(CFG)" == "gctest - Win32 Release"
 
@@ -2037,7 +2037,7 @@ NODEP_CPP_TEST_=\
 ".\gctest\Debug\test.sbr" : $(SOURCE) $(DEP_CPP_TEST_) "$(INTDIR)"
 
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # End Target
@@ -2051,7 +2051,7 @@ NODEP_CPP_TEST_=\
 
 !ELSEIF  "$(CFG)" == "cord - Win32 Debug"
 
-!ENDIF 
+!ENDIF
 
 ################################################################################
 # Begin Project Dependency
@@ -2060,15 +2060,15 @@ NODEP_CPP_TEST_=\
 
 !IF  "$(CFG)" == "cord - Win32 Release"
 
-"gc - Win32 Release" : 
-   $(MAKE) /$(MAKEFLAGS) /F ".\gc.mak" CFG="gc - Win32 Release" 
+"gc - Win32 Release" :
+   $(MAKE) /$(MAKEFLAGS) /F ".\gc.mak" CFG="gc - Win32 Release"
 
 !ELSEIF  "$(CFG)" == "cord - Win32 Debug"
 
-"gc - Win32 Debug" : 
-   $(MAKE) /$(MAKEFLAGS) /F ".\gc.mak" CFG="gc - Win32 Debug" 
+"gc - Win32 Debug" :
+   $(MAKE) /$(MAKEFLAGS) /F ".\gc.mak" CFG="gc - Win32 Debug"
 
-!ENDIF 
+!ENDIF
 
 # End Project Dependency
 ################################################################################
@@ -2080,10 +2080,10 @@ DEP_CPP_DE_WI=\
        ".\cord\de_cmds.h"\
        ".\cord\de_win.h"\
        ".\include\private\cord_pos.h"\
-       
+
 NODEP_CPP_DE_WI=\
        ".\include\gc.h"\
-       
+
 
 !IF  "$(CFG)" == "cord - Win32 Release"
 
@@ -2099,7 +2099,7 @@ NODEP_CPP_DE_WI=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 ################################################################################
@@ -2111,10 +2111,10 @@ DEP_CPP_DE_C2e=\
        ".\cord\de_cmds.h"\
        ".\cord\de_win.h"\
        ".\include\private\cord_pos.h"\
-       
+
 NODEP_CPP_DE_C2e=\
        ".\include\gc.h"\
-       
+
 
 !IF  "$(CFG)" == "cord - Win32 Release"
 
@@ -2130,7 +2130,7 @@ NODEP_CPP_DE_C2e=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 ################################################################################
@@ -2141,10 +2141,10 @@ DEP_CPP_CORDX=\
        ".\include\cord.h"\
        ".\include\ec.h"\
        ".\include\private\cord_pos.h"\
-       
+
 NODEP_CPP_CORDX=\
        ".\include\gc.h"\
-       
+
 
 !IF  "$(CFG)" == "cord - Win32 Release"
 
@@ -2160,7 +2160,7 @@ NODEP_CPP_CORDX=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 ################################################################################
@@ -2170,10 +2170,10 @@ SOURCE=.\cord\cordbscs.c
 DEP_CPP_CORDB=\
        ".\include\cord.h"\
        ".\include\private\cord_pos.h"\
-       
+
 NODEP_CPP_CORDB=\
        ".\include\gc.h"\
-       
+
 
 !IF  "$(CFG)" == "cord - Win32 Release"
 
@@ -2189,7 +2189,7 @@ NODEP_CPP_CORDB=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 ################################################################################
@@ -2211,7 +2211,7 @@ SOURCE=.\cord\de_win.RC
    $(RSC) /l 0x809 /fo"$(INTDIR)/de_win.res" /i "cord" /d "_DEBUG" $(SOURCE)
 
 
-!ENDIF 
+!ENDIF
 
 # End Source File
 # End Target

diff --git a/ia64_save_regs_in_stack.s b/src/ia64_save_regs_in_stack.s
similarity index 100%
rename from ia64_save_regs_in_stack.s
rename to src/ia64_save_regs_in_stack.s

diff --git a/sparc_mach_dep.S b/src/sparc_mach_dep.S
similarity index 100%
rename from sparc_mach_dep.S
rename to src/sparc_mach_dep.S

diff --git a/sparc_netbsd_mach_dep.s b/src/sparc_netbsd_mach_dep.s
similarity index 100%
rename from sparc_netbsd_mach_dep.s
rename to src/sparc_netbsd_mach_dep.s

diff --git a/sparc_sunos4_mach_dep.s b/src/sparc_sunos4_mach_dep.s
similarity index 100%
rename from sparc_sunos4_mach_dep.s
rename to src/sparc_sunos4_mach_dep.s