Merge branch 'master' into Gtk
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Fri, 23 Mar 2012 14:31:33 +0000 (07:31 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Fri, 23 Mar 2012 14:31:33 +0000 (07:31 -0700)
28 files changed:
1  2 
doc/Makefile.in
doc/configure.ac
src/Makefile.in
src/Setup.sh
src/configure.ac
src/etc/create-makefiles.sh
src/etc/make-liarc.sh
src/etc/optiondb.scm
src/microcode/cmpauxmd/i386.m4
src/microcode/cmpauxmd/x86-64.m4
src/microcode/cmpintmd/x86-64.c
src/microcode/ntsig.c
src/microcode/os2ctty.c
src/microcode/osctty.h
src/microcode/osio.h
src/microcode/prosio.c
src/microcode/prostty.c
src/microcode/pruxffi.c
src/microcode/pruxffi.h
src/microcode/uxctty.c
src/microcode/uxio.c
src/microcode/uxsig.c
src/microcode/uxsig.h
src/runtime/ffi.scm
src/runtime/process.scm
src/runtime/string.scm
src/runtime/thread.scm
tests/check.scm

diff --cc doc/Makefile.in
Simple merge
Simple merge
diff --cc src/Makefile.in
index 68b9a5e7d0f061f098648bc00e056f917b4f7250,9fc533de1854fa16969caf87557f27e588995606..976ab85e720cc40e23e8096faa304b37308c2d73
@@@ -87,11 -87,12 +87,12 @@@ all-native: compile-microcod
  all-svm: microcode/svm1-defns.h
        $(MAKE) compile-microcode
        @$(top_srcdir)/etc/compile-svm.sh "$(MIT_SCHEME_EXE)"
 -      $(MAKE) build-bands #build-ffis
 +      $(MAKE) build-bands build-ffis
  
  microcode/svm1-defns.h: compiler/machines/svm/svm1-defns.h
-       if ! cmp compiler/machines/svm/svm1-defns.h microcode/svm1-defns.h; \
-       then cp compiler/machines/svm/svm1-defns.h microcode/svm1-defns.h; fi
+       @$(top_srcdir)/etc/maybe-update-file.sh \
+         compiler/machines/svm/svm1-defns.h \
+         microcode/svm1-defns.h
  
  compiler/machines/svm/svm1-defns.h: \
          compiler/machines/svm/assembler-rules.scm \
diff --cc src/Setup.sh
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc tests/check.scm
Simple merge