- pull from upstream

3 files changed, 40 insertions, 32 deletions

diff --git a/package/gnuconfig/patches/config.guess.uclibc.patch b/package/gnuconfig/patches/config.guess.uclibc.patch
index becdb66f2..69d88a35a 100644
--- a/package/gnuconfig/patches/config.guess.uclibc.patch
+++ b/package/gnuconfig/patches/config.guess.uclibc.patch
@@ -1,11 +1,11 @@
 Index: config.guess
 ===================================================================
 RCS file: /cvsroot/config/config/config.guess,v
-retrieving revision 1.349
-diff -u -p -r1.349 config.guess
---- config.guess	26 Feb 2006 23:11:20 -0000	1.349
-+++ config.guess	2 Mar 2006 06:15:33 -0000
-@@ -139,6 +139,23 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` |
+retrieving revision 1.366
+diff -u -r1.366 config.guess
+--- config.guess	17 May 2007 06:28:53 -0000	1.366
++++ config.guess	9 Jul 2007 17:32:18 -0000
+@@ -139,6 +139,23 @@
  UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
  UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
  
@@ -29,13 +29,17 @@ diff -u -p -r1.349 config.guess
  # Note: order is significant - the case branches are not exclusive.
  
  case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-@@ -830,25 +847,25 @@ EOF
+@@ -833,28 +850,28 @@
  	echo ${UNAME_MACHINE}-pc-minix
  	exit ;;
      arm*:Linux:*:*)
 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  	exit ;;
+     avr32*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
      cris:Linux:*:*)
 -	echo cris-axis-linux-gnu
 +	echo cris-axis-linux-${LIBC}
@@ -62,7 +66,7 @@ diff -u -p -r1.349 config.guess
  	exit ;;
      mips:Linux:*:*)
  	eval $set_cc_for_build
-@@ -871,7 +888,7 @@ EOF
+@@ -877,7 +894,7 @@
  		s: ::g
  		p
  	    }'`"
@@ -71,7 +75,7 @@ diff -u -p -r1.349 config.guess
  	;;
      mips64:Linux:*:*)
  	eval $set_cc_for_build
-@@ -894,16 +911,16 @@ EOF
+@@ -900,16 +917,16 @@
  		s: ::g
  		p
  	    }'`"
@@ -92,7 +96,7 @@ diff -u -p -r1.349 config.guess
  	exit ;;
      alpha:Linux:*:*)
  	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-@@ -916,37 +933,37 @@ EOF
+@@ -922,40 +939,40 @@
  	  EV68*) UNAME_MACHINE=alphaev68 ;;
          esac
  	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
@@ -139,9 +143,13 @@ diff -u -p -r1.349 config.guess
 -	echo x86_64-unknown-linux-gnu
 +	echo x86_64-unknown-linux-${LIBC}
  	exit ;;
+     xtensa:Linux:*:*)
+-    	echo xtensa-unknown-linux-gnu
++    	echo xtensa-unknown-linux-${LIBC}
+ 	exit ;;
      i*86:Linux:*:*)
  	# The BFD linker knows what the default object file format is, so
-@@ -961,20 +978,22 @@ EOF
+@@ -970,20 +987,22 @@
  				    p'`
          case "$ld_supported_targets" in
  	  elf32-i386)
diff --git a/package/gnuconfig/patches/config.sub.ps2.patch b/package/gnuconfig/patches/config.sub.ps2.patch
index 619a96e21..ac8dbc68a 100644
--- a/package/gnuconfig/patches/config.sub.ps2.patch
+++ b/package/gnuconfig/patches/config.sub.ps2.patch
@@ -1,20 +1,20 @@
 Index: config.sub
 ===================================================================
 RCS file: /cvsroot/config/config/config.sub,v
-retrieving revision 1.340
-diff -u -p -r1.340 config.sub
---- config.sub
-+++ config.sub
-@@ -244,7 +244,7 @@ case $basic_machine in
- 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+retrieving revision 1.356
+diff -u -r1.356 config.sub
+--- config.sub	28 Jun 2007 06:56:43 -0000	1.356
++++ config.sub	9 Jul 2007 17:43:32 -0000
+@@ -244,7 +244,7 @@
+ 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
  	| bfin \
  	| c4x | clipper \
 -	| d10v | d30v | dlx | dsp16xx \
 +	| d10v | d30v | dlx | dsp16xx | dvp \
- 	| fr30 | frv \
+ 	| fido | fr30 | frv \
  	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
  	| i370 | i860 | i960 | ia64 \
-@@ -693,6 +693,24 @@ case $basic_machine in
+@@ -694,6 +694,24 @@
  		basic_machine=m68k-atari
  		os=-mint
  		;;
@@ -39,12 +39,12 @@ diff -u -p -r1.340 config.sub
  	mips3*-*)
  		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
  		;;
-@@ -1218,7 +1236,7 @@ case $os in
+@@ -1226,7 +1244,7 @@
  	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
  	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
  	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
--	      | -skyos* | -haiku* | -rdos*)
-+	      | -skyos* | -haiku* | -rdos* | -irx*)
+-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
++	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -irx*)
  	# Remember, each alternative MUST END IN *, to match a version number.
  		;;
  	-qnx*)
diff --git a/package/gnuconfig/patches/config.sub.sh.patch b/package/gnuconfig/patches/config.sub.sh.patch
index edbc41910..c8727dff1 100644
--- a/package/gnuconfig/patches/config.sub.sh.patch
+++ b/package/gnuconfig/patches/config.sub.sh.patch
@@ -15,25 +15,25 @@ brilliantly managed config target list.
 Index: config.sub
 ===================================================================
 RCS file: /cvsroot/config/config/config.sub,v
-retrieving revision 1.340
-diff -u -p -r1.340 config.sub
---- config.sub	26 Feb 2006 23:33:46 -0000	1.340
-+++ config.sub	2 Mar 2006 06:22:01 -0000
-@@ -275,7 +275,7 @@ case $basic_machine in
- 	| pdp10 | pdp11 | pj | pjl \
+retrieving revision 1.356
+diff -u -r1.356 config.sub
+--- config.sub	28 Jun 2007 06:56:43 -0000	1.356
++++ config.sub	9 Jul 2007 17:38:48 -0000
+@@ -277,7 +277,7 @@
  	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
  	| pyramid \
--	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-+	| sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | shbe | sheb | shle | sh[1234]le | sh3ele \
+ 	| score \
+-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
++	| sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
  	| sh64 | sh64le \
  	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
  	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-@@ -359,7 +359,7 @@ case $basic_machine in
+@@ -358,7 +358,7 @@
  	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
  	| pyramid-* \
  	| romp-* | rs6000-* \
--	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]a*eb-* | sh[23]e-* | sh[34]eb-* | shbe-* | sheb-* \
+-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
++	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]a*eb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
  	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
  	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
  	| sparclite-* \