diff --git a/src/mzscheme/Makefile.in b/src/mzscheme/Makefile.in index b1c4e1e2a2..8d473403ba 100644 --- a/src/mzscheme/Makefile.in +++ b/src/mzscheme/Makefile.in @@ -68,6 +68,10 @@ cgc: cd dynsrc; $(MAKE) dynlib3m cd gc2; $(MAKE) ../mzscheme@MMM@ +compact: + $(MAKE) 3m + cd gc2; $(MAKE) ../mzscheme_compact_gc + both: $(MAKE) cgc $(MAKE) 3m diff --git a/src/mzscheme/gc2/Makefile.in b/src/mzscheme/gc2/Makefile.in index 11ebe9a73b..0fc6851f72 100644 --- a/src/mzscheme/gc2/Makefile.in +++ b/src/mzscheme/gc2/Makefile.in @@ -93,7 +93,6 @@ XSRCS = $(XSRCDIR)/salloc.c \ $(XSRCDIR)/fun.c \ $(XSRCDIR)/hash.c \ $(XSRCDIR)/jit.c \ - $(XSRCDIR)/jit_compact_gc.c \ $(XSRCDIR)/list.c \ $(XSRCDIR)/module.c \ $(XSRCDIR)/network.c \ @@ -125,7 +124,6 @@ all: xsrc $(MAKE) $(XSRCDIR)/precomp.h $(MAKE) xobjects $(MAKE) ../mzscheme3m - $(MAKE) ../mzscheme_compact_gc xsrcs: $(XSRCS) @@ -170,10 +168,6 @@ $(XSRCDIR)/hash.c: ../src/hash.@LTO@ $(XFORMDEP) $(XFORM) $(XSRCDIR)/hash.c $(SRCDIR)/hash.c $(XSRCDIR)/jit.c: ../src/jit.@LTO@ $(XFORMDEP) $(XFORM) $(XSRCDIR)/jit.c $(SRCDIR)/jit.c - -$(XSRCDIR)/jit_compact_gc.c: ../src/jit.@LTO@ $(XFORMDEP) - $(XFORM_COMPACT_GC) $(XSRCDIR)/jit_compact_gc.c $(SRCDIR)/jit.c - $(XSRCDIR)/module.c: ../src/module.@LTO@ $(XFORMDEP) $(XFORM) $(XSRCDIR)/module.c $(SRCDIR)/module.c $(XSRCDIR)/list.c: ../src/list.@LTO@ $(XFORMDEP) @@ -227,6 +221,8 @@ $(XSRCDIR)/foreign.c: ../../foreign/foreign.@LTO@ $(XFORMDEP) $(XSRCDIR)/main.c: ../main.@LTO@ $(XFORMDEP) $(XFORM_NOPRECOMP) $(XSRCDIR)/main.c $(DEF_COLLECTS_DIR) $(srcdir)/../main.c +$(XSRCDIR)/jit_compact_gc.c: ../src/jit.@LTO@ $(XFORMDEP) + $(XFORM_COMPACT_GC) $(XSRCDIR)/jit_compact_gc.c $(SRCDIR)/jit.c salloc.@LTO@: $(XSRCDIR)/salloc.c $(CC) $(CFLAGS) -c $(XSRCDIR)/salloc.c -o salloc.@LTO@ @@ -391,7 +387,7 @@ $(MZFWMMM): ../libmzscheme3m.@LIBSFX@ /usr/bin/install_name_tool -change "PLT_MzScheme.framework/Versions/$(FWVERSION)_3m/PLT_MzScheme" "@executable_path/PLT_MzScheme.framework/Versions/$(FWVERSION)_3m/PLT_MzScheme" "../mzscheme@MMM@" ../mzscheme_compact_gc@OSX@: - echo "../mzscheme_compact_gc not currently build on OSX" + echo "../mzscheme_compact_gc does not currently build on Mac OS X; use --enable-compact with configure, instead" clean: /bin/rm -f ../mzscheme@MMM@ *.@LTO@ $(XSRCDIR)/* diff --git a/src/mzscheme/src/list.c b/src/mzscheme/src/list.c index df6225c720..fddc9162e7 100644 --- a/src/mzscheme/src/list.c +++ b/src/mzscheme/src/list.c @@ -1002,7 +1002,7 @@ list_p_prim (int argc, Scheme_Object *argv[]) #define LIST_BODY(INIT) \ int i; \ - Scheme_Object *l; \ + GC_CAN_IGNORE Scheme_Object *l; \ INIT; \ for (i = argc ; i--; ) { \ l = cons(argv[i], l); \