2009-09-19 Ivan Maidanski <ivmai@mail.ru>

	(ivmai147.diff)

	* add_gc_prefix.c: Move the file to the new "extra" directory.
	* AmigaOS.c: Ditto.
	* gcname.c: Ditto.
	* if_mach.c: Ditto.
	* if_not_there.c: Ditto.
	* MacOS.c: Ditto.
	* msvc_dbg.c: Ditto.
	* setjmp_t.c: Ditto.
	* threadlibs.c: Ditto.
	* EMX_MAKEFILE: Prepend setjmp_t.c with "extra" directory.
	* Makefile: Prepend AmigaOS.c, MacOS.c, add_gc_prefix.c, gcname.c,
	if_mach.c, if_not_there.c, msvc_dbg.c, setjmp_t.c, threadlibs.c
	with "extra" directory.
	* Makefile.am: Ditto.
	* Makefile.direct: Ditto.
	* Makefile.dj: Ditto.
	* Makefile.in: Ditto.
	* NT_MAKEFILE: Prepend msvc_dbg.obj with "extra" directory.
	* NT_STATIC_THREADS_MAKEFILE: Ditto.
	* NT_X64_STATIC_THREADS_MAKEFILE: Ditto.
	* NT_X64_THREADS_MAKEFILE: Ditto.
	* NT_THREADS_MAKEFILE: Prepend msvc_dbg.c with "extra" directory.
	* gc.mak: Ditto.
	* PCR-Makefile: Prepend if_mach.c, if_not_there.c with "extra"
	directory.
	* SMakefile.amiga: Prepend AmigaOS.c, setjmp_t.c with "extra"
	directory.
	* doc/simple_example.html: Update for threadlibs.c.
	* os_dep.c: Prepend included AmigaOS.c with "extra" directory.

diff --git a/ChangeLog b/ChangeLog
index 0c82e22b91de6817ec83fc06f04a71b9f051ae66..8335a5ecaa81c3bb6eaee95f4b520c9ac1e1120e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,38 @@
 2009-09-19  Ivan Maidanski <ivmai@mail.ru>
+       (ivmai147.diff)
+
+       * add_gc_prefix.c: Move the file to the new "extra" directory.
+       * AmigaOS.c: Ditto.
+       * gcname.c: Ditto.
+       * if_mach.c: Ditto.
+       * if_not_there.c: Ditto.
+       * MacOS.c: Ditto.
+       * msvc_dbg.c: Ditto.
+       * setjmp_t.c: Ditto.
+       * threadlibs.c: Ditto.
+       * EMX_MAKEFILE: Prepend setjmp_t.c with "extra" directory.
+       * Makefile: Prepend AmigaOS.c, MacOS.c, add_gc_prefix.c, gcname.c,
+       if_mach.c, if_not_there.c, msvc_dbg.c, setjmp_t.c, threadlibs.c
+       with "extra" directory.
+       * Makefile.am: Ditto.
+       * Makefile.direct: Ditto.
+       * Makefile.dj: Ditto.
+       * Makefile.in: Ditto.
+       * NT_MAKEFILE: Prepend msvc_dbg.obj with "extra" directory.
+       * NT_STATIC_THREADS_MAKEFILE: Ditto.
+       * NT_X64_STATIC_THREADS_MAKEFILE: Ditto.
+       * NT_X64_THREADS_MAKEFILE: Ditto.
+       * NT_THREADS_MAKEFILE: Prepend msvc_dbg.c with "extra" directory.
+       * gc.mak: Ditto.
+       * PCR-Makefile: Prepend if_mach.c, if_not_there.c with "extra"
+       directory.
+       * SMakefile.amiga: Prepend AmigaOS.c, setjmp_t.c with "extra"
+       directory.
+       * doc/simple_example.html: Update for threadlibs.c.
+       * os_dep.c: Prepend included AmigaOS.c with "extra" directory.
+
+2009-09-19  Ivan Maidanski <ivmai@mail.ru>
+
        * allchblk.c: Expand all tabs to spaces; remove trailing spaces at
        EOLn; remove multiple trailing blank lines.
        * mark.c: Ditto.

diff --git a/EMX_MAKEFILE b/EMX_MAKEFILE
index c7e5bb806ed0fd4178f91c556197fdf39a88f7d6..bb3a967d402b6f6e22726bf8fbbeca3fc681dcba 100644 (file)
--- a/EMX_MAKEFILE
+++ b/EMX_MAKEFILE
@@ -130,8 +130,8 @@ gctest.exe: tests/test.o gc.a
 # If an optimized setjmp_test generates a segmentation fault,
 # odds are your compiler is broken.  Gctest may still work.
 # Try compiling setjmp_t.c unoptimized.
-setjmp_test.exe: $(srcdir)/setjmp_t.c $(srcdir)/gc.h
-       $(CC) $(CFLAGS) -o setjmp_test.exe $(srcdir)/setjmp_t.c
+setjmp_test.exe: $(srcdir)/extra/setjmp_t.c $(srcdir)/gc.h
+       $(CC) $(CFLAGS) -o setjmp_test.exe $(srcdir)/extra/setjmp_t.c
 
 test: setjmp_test.exe gctest.exe
        ./setjmp_test

diff --git a/Makefile b/Makefile
index 6bb39feb2d075b4f10396e1452d6b9a7be7b5f2e..7273f923ff5b046971e388332be9926eb5fb17d0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -91,9 +91,9 @@ SRCS= $(CSRCS) mips_sgi_mach_dep.s rs6000_mach_dep.s alpha_mach_dep.S \
     sparc_mach_dep.S include/gc.h include/gc_typed.h include/gc_tiny_fl.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 \
-    threadlibs.c if_mach.c if_not_there.c gc_cpp.cc include/gc_cpp.h \
-    gcname.c include/weakpointer.h include/private/gc_locks.h \
+    include/gc_inline.h include/gc_mark.h extra/threadlibs.c \
+    extra/if_mach.c extra/if_not_there.c gc_cpp.cc include/gc_cpp.h \
+    extra/gcname.c include/weakpointer.h include/private/gc_locks.h \
     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 \
@@ -139,12 +139,12 @@ OTHER_MAKEFILES= OS2_MAKEFILE NT_MAKEFILE NT_THREADS_MAKEFILE gc.mak \
                 configure_atomic_ops.sh
 #      Makefile and Makefile.direct are copies of each other.
 
-OTHER_FILES= Makefile setjmp_t.c callprocs \
-           MacProjects.sit.hqx MacOS.c \
+OTHER_FILES= Makefile extra/setjmp_t.c callprocs \
+           MacProjects.sit.hqx extra/MacOS.c \
            Mac_files/datastart.c Mac_files/dataend.c \
            Mac_files/MacOS_config.h Mac_files/MacOS_Test_config.h \
-           add_gc_prefix.c gc_cpp.cpp include/gc_version.h \
-           AmigaOS.c msvc_dbg.c include/private/msvc_dbg.h \
+           extra/add_gc_prefix.c gc_cpp.cpp include/gc_version.h \
+           extra/AmigaOS.c extra/msvc_dbg.c include/private/msvc_dbg.h \
           $(TESTS) $(GNU_BUILD_FILES) $(OTHER_MAKEFILES)
 
 CORD_INCLUDE_FILES= $(srcdir)/include/gc.h $(srcdir)/include/cord.h \
@@ -373,14 +373,14 @@ cord/de: $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(UTILS)
        ./if_mach M68K AMIGA $(CC) $(CFLAGS) -UGC_AMIGA_MAKINGLIB -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses
        ./if_not_there cord/de $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(CURSES) `./threadlibs`
 
-if_mach: $(srcdir)/if_mach.c $(srcdir)/include/private/gcconfig.h
-       $(HOSTCC) $(HOSTCFLAGS) -o if_mach $(srcdir)/if_mach.c
+if_mach: $(srcdir)/extra/if_mach.c $(srcdir)/include/private/gcconfig.h
+       $(HOSTCC) $(HOSTCFLAGS) -o if_mach $(srcdir)/extra/if_mach.c
 
-threadlibs: $(srcdir)/threadlibs.c $(srcdir)/include/private/gcconfig.h Makefile
-       $(HOSTCC) $(HOSTCFLAGS) -o threadlibs $(srcdir)/threadlibs.c
+threadlibs: $(srcdir)/extra/threadlibs.c $(srcdir)/include/private/gcconfig.h Makefile
+       $(HOSTCC) $(HOSTCFLAGS) -o threadlibs $(srcdir)/extra/threadlibs.c
 
-if_not_there: $(srcdir)/if_not_there.c
-       $(HOSTCC) $(HOSTCFLAGS) -o if_not_there $(srcdir)/if_not_there.c
+if_not_there: $(srcdir)/extra/if_not_there.c
+       $(HOSTCC) $(HOSTCFLAGS) -o if_not_there $(srcdir)/extra/if_not_there.c
 
 clean: 
        rm -f gc.a *.o *.exe tests/*.o gctest gctest_dyn_link test_cpp \
@@ -398,8 +398,8 @@ gctest: tests/test.o gc.a $(UTILS)
 # If an optimized setjmp_test generates a segmentation fault,
 # odds are your compiler is broken.  Gctest may still work.
 # Try compiling setjmp_t.c unoptimized.
-setjmp_test: $(srcdir)/setjmp_t.c $(srcdir)/include/gc.h $(UTILS) $(AO_INSTALL_DIR)
-       $(CC) $(CFLAGS) -o setjmp_test $(srcdir)/setjmp_t.c
+setjmp_test: $(srcdir)/extra/setjmp_t.c $(srcdir)/include/gc.h $(UTILS) $(AO_INSTALL_DIR)
+       $(CC) $(CFLAGS) -o setjmp_test $(srcdir)/extra/setjmp_t.c
 
 test:  KandRtest cord/cordtest
        cord/cordtest
@@ -409,11 +409,11 @@ KandRtest: setjmp_test gctest
        ./setjmp_test
        ./gctest
 
-add_gc_prefix: $(srcdir)/add_gc_prefix.c $(srcdir)/include/gc_version.h
-       $(CC) -o add_gc_prefix $(srcdir)/add_gc_prefix.c
+add_gc_prefix: $(srcdir)/extra/add_gc_prefix.c $(srcdir)/include/gc_version.h
+       $(CC) -o add_gc_prefix $(srcdir)/extra/add_gc_prefix.c
 
-gcname: $(srcdir)/gcname.c $(srcdir)/include/gc_version.h
-       $(CC) -o gcname $(srcdir)/gcname.c
+gcname: $(srcdir)/extra/gcname.c $(srcdir)/include/gc_version.h
+       $(CC) -o gcname $(srcdir)/extra/gcname.c
 
 #We assume this is being done from source directory.
 dist gc.tar: $(SRCS) $(DOC_FILES) $(OTHER_FILES) add_gc_prefix gcname

diff --git a/Makefile.am b/Makefile.am
index fb658e27aed1fbe481fce88d9b4d8ed9a3297c67..375ebac2030c27f40d00bba445f43a6780335bab 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -170,13 +170,13 @@ EXTRA_DIST += BCC_MAKEFILE NT_MAKEFILE NT_THREADS_MAKEFILE \
 
 # files used by makefiles other than Makefile.am
 #
-EXTRA_DIST += add_gc_prefix.c gcname.c if_mach.c if_not_there.c \
-    hpux_test_and_clear.s gc.mak MacOS.c \
-    MacProjects.sit.hqx mach_dep.c setjmp_t.c \
-    threadlibs.c AmigaOS.c \
+EXTRA_DIST += extra/add_gc_prefix.c extra/gcname.c extra/if_mach.c \
+    extra/if_not_there.c hpux_test_and_clear.s 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 \
     Mac_files/MacOS_config.h Mac_files/MacOS_Test_config.h \
-    include/private/msvc_dbg.h msvc_dbg.c
+    include/private/msvc_dbg.h extra/msvc_dbg.c
 
 # The libatomic_ops library.  This is not ideal, since we pick up junk from
 # there.  The hard-coded version number should also go.

diff --git a/Makefile.direct b/Makefile.direct
index 176a85e68b8b8849a1780c37d58660696d796905..124135b6bc85b1cd5c3811be4bb97a6e3e9e1349 100644 (file)
--- a/Makefile.direct
+++ b/Makefile.direct
@@ -389,9 +389,9 @@ SRCS= $(CSRCS) mips_sgi_mach_dep.s rs6000_mach_dep.s alpha_mach_dep.S \
     sparc_mach_dep.S 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 \
-    threadlibs.c if_mach.c if_not_there.c gc_cpp.cc include/gc_cpp.h \
-    gcname.c include/weakpointer.h include/private/gc_locks.h \
+    include/gc_inline.h include/gc_mark.h extra/threadlibs.c \
+    extra/if_mach.c extra/if_not_there.c gc_cpp.cc include/gc_cpp.h \
+    extra/gcname.c include/weakpointer.h include/private/gc_locks.h \
     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 \
@@ -438,12 +438,12 @@ OTHER_MAKEFILES= OS2_MAKEFILE NT_MAKEFILE NT_THREADS_MAKEFILE gc.mak \
                 NT_X64_STATIC_THREADS_MAKEFILE NT_X64_THREADS_MAKEFILE \
                 build_atomic_ops.sh build_atomic_ops.sh.cygwin 
 
-OTHER_FILES= Makefile setjmp_t.c callprocs \
-           MacProjects.sit.hqx MacOS.c \
+OTHER_FILES= Makefile extra/setjmp_t.c callprocs \
+           MacProjects.sit.hqx extra/MacOS.c \
            Mac_files/datastart.c Mac_files/dataend.c \
            Mac_files/MacOS_config.h Mac_files/MacOS_Test_config.h \
-           add_gc_prefix.c gc_cpp.cpp \
-           AmigaOS.c msvc_dbg.c include/private/msvc_dbg.h \
+           extra/add_gc_prefix.c gc_cpp.cpp \
+           extra/AmigaOS.c extra/msvc_dbg.c include/private/msvc_dbg.h \
           $(TESTS) $(GNU_BUILD_FILES) $(OTHER_MAKEFILES)
 
 CORD_INCLUDE_FILES= $(srcdir)/include/gc.h $(srcdir)/include/cord.h \
@@ -671,14 +671,14 @@ cord/de: $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(UTILS)
        ./if_mach M68K AMIGA $(CC) $(CFLAGS) -UGC_AMIGA_MAKINGLIB -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses
        ./if_not_there cord/de $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(CURSES) `./threadlibs`
 
-if_mach: $(srcdir)/if_mach.c $(srcdir)/include/private/gcconfig.h
-       $(HOSTCC) $(HOSTCFLAGS) -o if_mach $(srcdir)/if_mach.c
+if_mach: $(srcdir)/extra/if_mach.c $(srcdir)/include/private/gcconfig.h
+       $(HOSTCC) $(HOSTCFLAGS) -o if_mach $(srcdir)/extra/if_mach.c
 
-threadlibs: $(srcdir)/threadlibs.c $(srcdir)/include/private/gcconfig.h Makefile
-       $(HOSTCC) $(HOSTCFLAGS) -o threadlibs $(srcdir)/threadlibs.c
+threadlibs: $(srcdir)/extra/threadlibs.c $(srcdir)/include/private/gcconfig.h Makefile
+       $(HOSTCC) $(HOSTCFLAGS) -o threadlibs $(srcdir)/extra/threadlibs.c
 
-if_not_there: $(srcdir)/if_not_there.c
-       $(HOSTCC) $(HOSTCFLAGS) -o if_not_there $(srcdir)/if_not_there.c
+if_not_there: $(srcdir)/extra/if_not_there.c
+       $(HOSTCC) $(HOSTCFLAGS) -o if_not_there $(srcdir)/extra/if_not_there.c
 
 clean: 
        rm -f gc.a *.o *.exe tests/*.o gctest gctest_dyn_link test_cpp \
@@ -696,8 +696,8 @@ gctest: tests/test.o gc.a $(UTILS)
 # If an optimized setjmp_test generates a segmentation fault,
 # odds are your compiler is broken.  Gctest may still work.
 # Try compiling setjmp_t.c unoptimized.
-setjmp_test: $(srcdir)/setjmp_t.c $(srcdir)/include/gc.h $(UTILS) $(AO_INSTALL_DIR)
-       $(CC) $(CFLAGS) -o setjmp_test $(srcdir)/setjmp_t.c
+setjmp_test: $(srcdir)/extra/setjmp_t.c $(srcdir)/include/gc.h $(UTILS) $(AO_INSTALL_DIR)
+       $(CC) $(CFLAGS) -o setjmp_test $(srcdir)/extra/setjmp_t.c
 
 test:  KandRtest cord/cordtest
        cord/cordtest
@@ -707,11 +707,11 @@ KandRtest: setjmp_test gctest
        ./setjmp_test
        ./gctest
 
-add_gc_prefix: $(srcdir)/add_gc_prefix.c $(srcdir)/include/gc_version.h
-       $(CC) -o add_gc_prefix $(srcdir)/add_gc_prefix.c
+add_gc_prefix: $(srcdir)/extra/add_gc_prefix.c $(srcdir)/include/gc_version.h
+       $(CC) -o add_gc_prefix $(srcdir)/extra/add_gc_prefix.c
 
-gcname: $(srcdir)/gcname.c $(srcdir)/include/gc_version.h
-       $(CC) -o gcname $(srcdir)/gcname.c
+gcname: $(srcdir)/extra/gcname.c $(srcdir)/include/gc_version.h
+       $(CC) -o gcname $(srcdir)/extra/gcname.c
 
 #We assume this is being done from source directory.
 dist gc.tar: $(SRCS) $(DOC_FILES) $(OTHER_FILES) add_gc_prefix gcname

diff --git a/Makefile.dj b/Makefile.dj
index 58b7c31706c46ed1ff8d7cbb270c7af74bc2ef8d..eff9f30565cf77e7445c37d83284d06b6ccba956 100644 (file)
--- a/Makefile.dj
+++ b/Makefile.dj
@@ -49,8 +49,8 @@ SRCS= $(CSRCS) mips_sgi_mach_dep.S rs6000_mach_dep.s alpha_mach_dep.S \
     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 \
-    threadlibs.c if_mach.c if_not_there.c gc_cpp.cc include/gc_cpp.h \
+    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 \
     include/new_gc_alloc.h include/javaxfc.h sparc_sunos4_mach_dep.s \
@@ -61,16 +61,16 @@ SRCS= $(CSRCS) mips_sgi_mach_dep.S rs6000_mach_dep.s alpha_mach_dep.S \
     include/leak_detector.h $(CORD_SRCS)
 
 OTHER_FILES= Makefile PCR-Makefile OS2_MAKEFILE NT_MAKEFILE BCC_MAKEFILE \
-           README tests/test.c test_cpp.cc setjmp_t.c SMakefile.amiga \
+           README tests/test.c test_cpp.cc extra/setjmp_t.c SMakefile.amiga \
            SCoptions.amiga README.amiga README.win32 cord/README \
           README.rs6000 README.QUICK callprocs pc_excludes \
            barrett_diagram README.OS2 README.Mac MacProjects.sit.hqx \
-           MacOS.c EMX_MAKEFILE README.debugging \
+           extra/MacOS.c EMX_MAKEFILE README.debugging \
            Mac_files/datastart.c Mac_files/dataend.c \
            Mac_files/MacOS_config.h Mac_files/MacOS_Test_config.h \
-           add_gc_prefix.c README.solaris2 README.sgi README.hp README.uts \
-          win32_threads.c NT_THREADS_MAKEFILE gc.mak README.dj Makefile.dj \
-          README.alpha README.linux README.MacOSX Makefile.DLLs \
+           extra/add_gc_prefix.c README.solaris2 README.sgi README.hp \
+           README.uts win32_threads.c NT_THREADS_MAKEFILE gc.mak README.dj \
+           Makefile.dj README.alpha README.linux README.MacOSX Makefile.DLLs \
           WCC_MAKEFILE
 
 CORD_INCLUDE_FILES= $(srcdir)/include/gc.h $(srcdir)/include/cord.h \
@@ -218,17 +218,17 @@ cord/de$(EXE_SUFFIX): $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a $
        ./if_mach ALPHA LINUX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses
        ./if_not_there cord/de$(EXE_SUFFIX) $(CC) $(CFLAGS) -o cord/de$(EXE_SUFFIX) $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(CURSES)
 
-if_mach$(EXE_SUFFIX): $(srcdir)/if_mach.c $(srcdir)/include/private/gcconfig.h
+if_mach$(EXE_SUFFIX): $(srcdir)/extra/if_mach.c $(srcdir)/include/private/gcconfig.h
        rm -f if_mach if_mach$(EXE_SUFFIX)
-       $(CC) $(CFLAGS) -o if_mach $(srcdir)/if_mach.c
+       $(CC) $(CFLAGS) -o if_mach $(srcdir)/extra/if_mach.c
 
-threadlibs$(EXE_SUFFIX): $(srcdir)/threadlibs.c $(srcdir)include/private/gcconfig.h Makefile
+threadlibs$(EXE_SUFFIX): $(srcdir)/extra/threadlibs.c $(srcdir)include/private/gcconfig.h Makefile
        rm -f threadlibs threadlibs$(EXE_SUFFIX)
-       $(CC) $(CFLAGS) -o threadlibs $(srcdir)/threadlibs.c
+       $(CC) $(CFLAGS) -o threadlibs $(srcdir)/extra/threadlibs.c
 
-if_not_there$(EXE_SUFFIX): $(srcdir)/if_not_there.c
+if_not_there$(EXE_SUFFIX): $(srcdir)/extra/if_not_there.c
        rm -f if_not_there if_not_there$(EXE_SUFFIX)
-       $(CC) $(CFLAGS) -o if_not_there $(srcdir)/if_not_there.c
+       $(CC) $(CFLAGS) -o if_not_there $(srcdir)/extra/if_not_there.c
 
 # Clean removes *.o several times,
 # because as the first one doesn't seem to get them all!
@@ -255,10 +255,10 @@ gctest$(EXE_SUFFIX): tests/test.o gc.a if_mach$(EXE_SUFFIX) if_not_there$(EXE_SU
 # If an optimized setjmp_test generates a segmentation fault,
 # odds are your compiler is broken.  Gctest may still work.
 # Try compiling setjmp_t.c unoptimized.
-setjmp_test$(EXE_SUFFIX): $(srcdir)/setjmp_t.c $(srcdir)/include/gc.h \
+setjmp_test$(EXE_SUFFIX): $(srcdir)/extra/setjmp_t.c $(srcdir)/include/gc.h \
                if_mach$(EXE_SUFFIX) if_not_there$(EXE_SUFFIX)
        rm -f setjmp_test$(EXE_SUFFIX)
-       $(CC) $(CFLAGS) -o setjmp_test $(srcdir)/setjmp_t.c
+       $(CC) $(CFLAGS) -o setjmp_test $(srcdir)/extra/setjmp_t.c
        rm -f setjmp_test
 
 test:  KandRtest cord/cordtest$(EXE_SUFFIX)
@@ -269,8 +269,8 @@ KandRtest: setjmp_test$(EXE_SUFFIX) gctest$(EXE_SUFFIX)
        ./setjmp_test$(EXE_SUFFIX)
        ./gctest$(EXE_SUFFIX)
 
-add_gc_prefix$(EXE_SUFFIX): add_gc_prefix.c
-       $(CC) -o add_gc_prefix$(EXE_SUFFIX) $(srcdir)/add_gc_prefix.c
+add_gc_prefix$(EXE_SUFFIX): extra/add_gc_prefix.c
+       $(CC) -o add_gc_prefix$(EXE_SUFFIX) $(srcdir)/extra/add_gc_prefix.c
        rm -f add_gc_prefix
 
 gc.tar: $(SRCS) $(OTHER_FILES) add_gc_prefix

diff --git a/Makefile.in b/Makefile.in
index 3272cba8dd9b2114a10cacd24bbee3e4d376e58f..15060849ea97d0af077f2b527115bf986926323e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -468,12 +468,12 @@ EXTRA_DIST = gc_cpp.cpp README.QUICK BCC_MAKEFILE NT_MAKEFILE \
        SMakefile.amiga WCC_MAKEFILE build_atomic_ops.sh \
        build_atomic_ops.sh.cygwin NT_STATIC_THREADS_MAKEFILE \
        NT_X64_STATIC_THREADS_MAKEFILE NT_X64_THREADS_MAKEFILE \
-       add_gc_prefix.c gcname.c if_mach.c if_not_there.c \
-       hpux_test_and_clear.s gc.mak MacOS.c MacProjects.sit.hqx \
-       mach_dep.c setjmp_t.c threadlibs.c AmigaOS.c \
-       Mac_files/datastart.c Mac_files/dataend.c \
+       extra/add_gc_prefix.c extra/gcname.c extra/if_mach.c \
+       extra/if_not_there.c hpux_test_and_clear.s 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 \
        Mac_files/MacOS_config.h Mac_files/MacOS_Test_config.h \
-       include/private/msvc_dbg.h msvc_dbg.c libatomic_ops-1.2 \
+       include/private/msvc_dbg.h extra/msvc_dbg.c libatomic_ops-1.2 \
        libtool.m4 cord/cordbscs.c cord/cordtest.c cord/de.c \
        cord/cordprnt.c cord/cordxtra.c cord/de_cmds.h cord/de_win.h \
        cord/de_win.c cord/de_win.RC cord/de_win.ICO

diff --git a/NT_MAKEFILE b/NT_MAKEFILE
index ff9ea69c807d0a3353ba52b0756a9f451d06b4bc..e4100b517f77c806bb4181b48db50a1dffa82466 100644 (file)
--- a/NT_MAKEFILE
+++ b/NT_MAKEFILE
@@ -6,7 +6,7 @@ MY_CPU=X86
 CPU=$(MY_CPU)
 !include <ntwin32.mak>
 
-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 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 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 51f67627875d489e4b2de00b7ca7a67581ab50e5..7258bd625b5d2ac94ca598759ea62feb29c078aa 100644 (file)
--- a/NT_STATIC_THREADS_MAKEFILE
+++ b/NT_STATIC_THREADS_MAKEFILE
@@ -19,7 +19,7 @@ AO_VERSION=1.2
 AO_SRC_DIR=libatomic_ops-$(AO_VERSION)/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 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 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_THREADS_MAKEFILE b/NT_THREADS_MAKEFILE
index c3730eb1d051cab73f9e95e0ac0ec21629061a4d..86ac2d3ca8d5c1706e9d78975dcafa1fb4f7f067 100644 (file)
--- a/NT_THREADS_MAKEFILE
+++ b/NT_THREADS_MAKEFILE
@@ -1880,7 +1880,7 @@ NODEP_CPP_WIN32=\
 ################################################################################
 # Begin Source File
 
-SOURCE=.\msvc_dbg.c
+SOURCE=.\extra\msvc_dbg.c
 
 !IF  "$(CFG)" == "gc - Win32 Release"
 

diff --git a/NT_X64_STATIC_THREADS_MAKEFILE b/NT_X64_STATIC_THREADS_MAKEFILE
index 47adec933892e97206b52f0eb599f2781564bb82..d985bdf9fc1dfe49f98b3c399ac2537531a4030d 100644 (file)
--- a/NT_X64_STATIC_THREADS_MAKEFILE
+++ b/NT_X64_STATIC_THREADS_MAKEFILE
@@ -19,7 +19,7 @@ AO_VERSION=1.2
 AO_SRC_DIR=libatomic_ops-$(AO_VERSION)/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 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 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 b07ce34b5378cd746cc7eb979e92e4c91113ff02..c51674b657f535aeb423a3ea2268f8dd4868aa38 100644 (file)
--- a/NT_X64_THREADS_MAKEFILE
+++ b/NT_X64_THREADS_MAKEFILE
@@ -26,7 +26,7 @@ AO_VERSION=1.2
 AO_SRC_DIR=libatomic_ops-$(AO_VERSION)/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 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 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.dll gctest.exe cord\de.exe test_cpp.exe
 

diff --git a/PCR-Makefile b/PCR-Makefile
index db4c9f01819d0d8df2b1466c259fa7b6e8439fef..d7b79d1512f88e66d486baa2e49123db506bf9f9 100644 (file)
--- a/PCR-Makefile
+++ b/PCR-Makefile
@@ -59,10 +59,10 @@ mach_dep.o: mach_dep.c mips_mach_dep.s rs6000_mach_dep.s if_mach if_not_there
        ./if_mach SPARC SOLARIS as -o mach_dep.o sparc_mach_dep.s
        ./if_not_there mach_dep.o $(CC) -c $(SPECIALCFLAGS) mach_dep.c
 
-if_mach: if_mach.c gcconfig.h
-       $(CC) $(CFLAGS) -o if_mach if_mach.c
+if_mach: extra/if_mach.c gcconfig.h
+       $(CC) $(CFLAGS) -o if_mach extra/if_mach.c
 
-if_not_there: if_not_there.c
-       $(CC) $(CFLAGS) -o if_not_there if_not_there.c
+if_not_there: extra/if_not_there.c
+       $(CC) $(CFLAGS) -o if_not_there extra/if_not_there.c
 
 

diff --git a/SMakefile.amiga b/SMakefile.amiga
index 94fb723865ca108ce3a54fdfc64746aab819ad10..acdca66ad86e7be422926ac74fce750e2e5fc824 100644 (file)
--- a/SMakefile.amiga
+++ b/SMakefile.amiga
@@ -99,7 +99,7 @@ allchblk.o : allchblk.c $(INC)
 misc.o : misc.c $(INC)
        $(CC) misc.c $(SCOPT)
 
-os_dep.o : os_dep.c $(INC) AmigaOS.c
+os_dep.o : os_dep.c $(INC) extra/AmigaOS.c
        $(CC) os_dep.c $(SCOPT)
 
 mark_rts.o : mark_rts.c $(INC)
@@ -156,8 +156,8 @@ ptr_chck.o: ptr_chck.c $(INC)
 test.o : test.c $(INC)
        $(CC) test.c $(SOPT)
 
-setjmp_t: setjmp_t.c gc.h
-   $(CC) setjmp_t.c $(SOPT)
+setjmp_t: extra/setjmp_t.c gc.h
+   $(CC) extra/setjmp_t.c $(SOPT)
 
 
 # cords:

diff --git a/doc/simple_example.html b/doc/simple_example.html
index 6ca3eee6735ef9c786475613f3f58167e3f34764..5448cfc90b368e32fcdab4d2f675ce629af6ef74 100644 (file)
--- a/doc/simple_example.html
+++ b/doc/simple_example.html
@@ -210,7 +210,7 @@ On pthread platforms, you will of course also have to link with
 and compile with any thread-safety options required by your compiler.
 On some platforms, you may also need to link with <TT>-ldl</tt>
 or <TT>-lrt</tt>.
-Looking at threadlibs.c in the GC build directory
+Looking at threadlibs.c in the GC "extra" directory
 should give you the appropriate
 list if a plain <TT>-lpthread</tt> doesn't work.
 </font>

diff --git a/AmigaOS.c b/extra/AmigaOS.c
similarity index 100%
rename from AmigaOS.c
rename to extra/AmigaOS.c

diff --git a/MacOS.c b/extra/MacOS.c
similarity index 100%
rename from MacOS.c
rename to extra/MacOS.c

diff --git a/add_gc_prefix.c b/extra/add_gc_prefix.c
similarity index 100%
rename from add_gc_prefix.c
rename to extra/add_gc_prefix.c

diff --git a/gcname.c b/extra/gcname.c
similarity index 100%
rename from gcname.c
rename to extra/gcname.c

diff --git a/if_mach.c b/extra/if_mach.c
similarity index 100%
rename from if_mach.c
rename to extra/if_mach.c

diff --git a/if_not_there.c b/extra/if_not_there.c
similarity index 100%
rename from if_not_there.c
rename to extra/if_not_there.c

diff --git a/msvc_dbg.c b/extra/msvc_dbg.c
similarity index 100%
rename from msvc_dbg.c
rename to extra/msvc_dbg.c

diff --git a/setjmp_t.c b/extra/setjmp_t.c
similarity index 100%
rename from setjmp_t.c
rename to extra/setjmp_t.c

diff --git a/threadlibs.c b/extra/threadlibs.c
similarity index 100%
rename from threadlibs.c
rename to extra/threadlibs.c

diff --git a/gc.mak b/gc.mak
index c3730eb1d051cab73f9e95e0ac0ec21629061a4d..86ac2d3ca8d5c1706e9d78975dcafa1fb4f7f067 100644 (file)
--- a/gc.mak
+++ b/gc.mak
@@ -1880,7 +1880,7 @@ NODEP_CPP_WIN32=\
 ################################################################################
 # Begin Source File
 
-SOURCE=.\msvc_dbg.c
+SOURCE=.\extra\msvc_dbg.c
 
 !IF  "$(CFG)" == "gc - Win32 Release"
 

diff --git a/os_dep.c b/os_dep.c
index 180ba1355f629baa03601ba7ffdc44a04ef19bcb..5abc228278bbcab605bbfff7d68fdd11fcbce9a9 100644 (file)
--- a/os_dep.c
+++ b/os_dep.c
@@ -77,7 +77,7 @@
 
 #ifdef AMIGA
 # define GC_AMIGA_DEF
-# include "AmigaOS.c"
+# include "extra/AmigaOS.c"
 # undef GC_AMIGA_DEF
 #endif
 
@@ -719,7 +719,7 @@ ptr_t GC_get_main_stack_base(void)
 
 # ifdef AMIGA
 #   define GC_AMIGA_SB
-#   include "AmigaOS.c"
+#   include "extra/AmigaOS.c"
 #   undef GC_AMIGA_SB
 # endif /* AMIGA */
 
@@ -1623,7 +1623,7 @@ ptr_t GC_FreeBSDGetDataStart(size_t max_page_size, ptr_t etext_addr)
 #ifdef AMIGA
 
 #  define GC_AMIGA_DS
-#  include "AmigaOS.c"
+#  include "extra/AmigaOS.c"
 #  undef GC_AMIGA_DS
 
 #else /* !OS2 && !Windows && !AMIGA */
@@ -1948,7 +1948,7 @@ GC_API void GC_CALL GC_win32_free_heap(void)
 
 #ifdef AMIGA
 # define GC_AMIGA_AM
-# include "AmigaOS.c"
+# include "extra/AmigaOS.c"
 # undef GC_AMIGA_AM
 #endif