vm: strip out call-counting profiler

[factor.git] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index 6582f743fc57487fb37f6daad1b752a99b5afe35..955a310e126b2b8d770abddebad7fb4cc3011323 100755 (executable)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -34,7 +34,6 @@ ifdef CONFIG
                vm/code_heap.o \
                vm/compaction.o \
                vm/contexts.o \
-               vm/counting_profiler.o \
                vm/data_heap.o \
                vm/data_heap_checker.o \
                vm/debug.o \
@@ -59,6 +58,7 @@ ifdef CONFIG
                vm/primitives.o \
                vm/quotations.o \
                vm/run.o \
+               vm/safepoints.o \
                vm/sampling_profiler.o \
                vm/strings.o \
                vm/to_tenured_collector.o \
@@ -67,6 +67,74 @@ ifdef CONFIG
                vm/vm.o \
                vm/words.o
 
+       MASTER_HEADERS = $(PLAF_MASTER_HEADERS) \
+               vm/layouts.hpp \
+               vm/platform.hpp \
+               vm/primitives.hpp \
+               vm/segments.hpp \
+               vm/gc_info.hpp \
+               vm/contexts.hpp \
+               vm/run.hpp \
+               vm/objects.hpp \
+               vm/sampling_profiler.hpp \
+               vm/errors.hpp \
+               vm/bignumint.hpp \
+               vm/bignum.hpp \
+               vm/booleans.hpp \
+               vm/instruction_operands.hpp \
+               vm/code_blocks.hpp \
+               vm/bump_allocator.hpp \
+               vm/bitwise_hacks.hpp \
+               vm/mark_bits.hpp \
+               vm/free_list.hpp \
+               vm/fixup.hpp \
+               vm/tuples.hpp \
+               vm/free_list_allocator.hpp \
+               vm/write_barrier.hpp \
+               vm/object_start_map.hpp \
+               vm/nursery_space.hpp \
+               vm/aging_space.hpp \
+               vm/tenured_space.hpp \
+               vm/data_heap.hpp \
+               vm/code_heap.hpp \
+               vm/gc.hpp \
+               vm/debug.hpp \
+               vm/strings.hpp \
+               vm/words.hpp \
+               vm/float_bits.hpp \
+               vm/io.hpp \
+               vm/image.hpp \
+               vm/alien.hpp \
+               vm/callbacks.hpp \
+               vm/dispatch.hpp \
+               vm/entry_points.hpp \
+               vm/safepoints.hpp \
+               vm/vm.hpp \
+               vm/allot.hpp \
+               vm/tagged.hpp \
+               vm/data_roots.hpp \
+               vm/code_roots.hpp \
+               vm/generic_arrays.hpp \
+               vm/callstack.hpp \
+               vm/slot_visitor.hpp \
+               vm/collector.hpp \
+               vm/copying_collector.hpp \
+               vm/nursery_collector.hpp \
+               vm/aging_collector.hpp \
+               vm/to_tenured_collector.hpp \
+               vm/code_block_visitor.hpp \
+               vm/compaction.hpp \
+               vm/full_collector.hpp \
+               vm/arrays.hpp \
+               vm/math.hpp \
+               vm/byte_arrays.hpp \
+               vm/jit.hpp \
+               vm/quotations.hpp \
+               vm/inline_cache.hpp \
+               vm/mvm.hpp \
+               vm/factor.hpp \
+               vm/utilities.hpp
+
        EXE_OBJS = $(PLAF_EXE_OBJS)
 
        FFI_TEST_LIBRARY = libfactor-ffi-test$(SHARED_DLL_EXTENSION)
@@ -87,6 +155,7 @@ help:
        @echo "linux-arm"
        @echo "macosx-x86-32"
        @echo "macosx-x86-64"
+       @echo "macosx-x86-fat"
        @echo "windows-x86-32"
        @echo "windows-x86-64"
        @echo ""
@@ -105,6 +174,9 @@ macosx-x86-32:
 macosx-x86-64:
        $(MAKE) $(ALL) macosx.app CONFIG=vm/Config.macosx.x86.64
 
+macosx-x86-fat:
+       $(MAKE) $(ALL) macosx.app CONFIG=vm/Config.macosx.x86.fat
+
 linux-x86-32:
        $(MAKE) $(ALL) CONFIG=vm/Config.linux.x86.32
 
@@ -160,13 +232,16 @@ vm/resources.o:
 vm/ffi_test.o: vm/ffi_test.c
        $(TOOLCHAIN_PREFIX)$(CC) -c $(CFLAGS) $(FFI_TEST_CFLAGS) -o $@ $<
 
-.cpp.o:
+vm/master.hpp.gch: vm/master.hpp $(MASTER_HEADERS)
+       $(TOOLCHAIN_PREFIX)$(CPP) -c -x c++-header $(CFLAGS) -o $@ $<
+
+%.o: %.cpp vm/master.hpp.gch
        $(TOOLCHAIN_PREFIX)$(CPP) -c $(CFLAGS) -o $@ $<
 
-.S.o:
+%.o: %.S
        $(TOOLCHAIN_PREFIX)$(CC) -c $(CFLAGS) -o $@ $<
 
-.mm.o:
+%.o: %.mm vm/master.hpp.gch
        $(TOOLCHAIN_PREFIX)$(CPP) -c $(CFLAGS) -o $@ $<
 
 .SUFFIXES: .mm
@@ -174,6 +249,7 @@ vm/ffi_test.o: vm/ffi_test.c
 endif
 
 clean:
+       rm -f vm/*.gch
        rm -f vm/*.o
        rm -f factor.dll
        rm -f factor.lib