resolve merge

diff --cc lily/midi-stream.cc
Simple merge

diff --cc lily/piano-pedal-engraver.cc
Simple merge

diff --cc lily/prob.cc
Simple merge

diff --cc lily/relocate.cc
Simple merge

diff --cc lily/source-file.cc
index d5e4bcf6764a015a6adc6b6725939407e821bde1,b01676355840a1877bacc3b9439809cb195ce496..82c13fc45b6911338d6996760de97e5ddf2b6f9f
--- 1/lily/source-file.cc
--- 2/lily/source-file.cc
+++ b/lily/source-file.cc
@@@ -13,15 -24,9 +24,9 @@@
  #endif /* GCC_MAJOR < 4 */
  
  #include "source-file.hh"
 -
 +#include <cstring>
  #include "config.hh"
  
- #if HAVE_UTF8_WCHAR_H
- #include <utf8/wchar.h>  /* mbrtowc */
- #else /* !HAVE_UTF8_WCHAR_H */
- #include <cwchar> /* mbrtowc */
- #endif /* HAVE_UTF8_WCHAR_H */
- 
  #include <cstdio>
  
  #if HAVE_SSTREAM

diff --cc lily/translator.cc
Simple merge

diff --cc scm/ps-to-png.scm
Simple merge

diff --cc stepmake/bin/config.sub
index 6759825a5b7fcf64476b4398dc0e30b3090b925c,204218c07382772bc2e9ad083f9dd766af90fb36..c5138c45abb8b2019a74c6eccaf5a439cf8d1a8c
--- 1/stepmake/bin/config.sub
--- 2/stepmake/bin/config.sub
+++ b/stepmake/bin/config.sub
@@@ -371,9 -400,9 +400,13 @@@ case $basic_machine i
        | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
        | xstormy16-* | xtensa*-* \
        | ymp-* \
-       | z8k-*)
+       | z8k-* | z80-*)
+               ;;
+       # Recognize the basic CPU types without company name, with glob match.
++      xtensa*)
++              basic_machine=$basic_machine-unknown
 +              ;;
 +      # Recognize the basic CPU types without company name, with glob match.
        xtensa*)
                basic_machine=$basic_machine-unknown
                ;;
@@@ -1037,22 -1094,15 +1098,27 @@@
                basic_machine=t90-cray
                os=-unicos
                ;;
-       tic54x | c54x*)
-               basic_machine=tic54x-unknown
-               os=-coff
+         # This must be matched before tile*.
+         tilegx*)
+               basic_machine=tilegx-unknown
+               os=-linux-gnu
+               ;;
+       tile*)
+               basic_machine=tile-unknown
+               os=-linux-gnu
                ;;
 +      tic55x | c55x*)
 +              basic_machine=tic55x-unknown
 +              os=-coff
 +              ;;
 +      tic6x | c6x*)
 +              basic_machine=tic6x-unknown
 +              os=-coff
 +              ;;
 +      tile*)
 +              basic_machine=tile-unknown
 +              os=-linux-gnu
 +              ;;
        tx39)
                basic_machine=mipstx39-unknown
                ;;