From: Don Armstrong <don@donarmstrong.com>
Date: Sat, 30 Jul 2011 01:21:36 +0000 (-0700)
Subject: resolve merge
X-Git-Tag: debian/2.16.0-1_exp+1~56
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=941dff9d2a67080e0dd8474f1e70f0c72ace6424;p=lilypond.git

resolve merge
---

941dff9d2a67080e0dd8474f1e70f0c72ace6424
diff --cc lily/source-file.cc
index d5e4bcf676,b016763558..82c13fc45b
--- a/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 stepmake/bin/config.sub
index 6759825a5b,204218c073..c5138c45ab
--- a/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
  		;;