update patches to latest git

3 files changed, 70 insertions, 78 deletions

diff --git a/sys-devel/gnuconfig/files/99999999/0001-add-uClibc-guess-support.patch b/sys-devel/gnuconfig/files/99999999/0001-add-uClibc-guess-support.patch
index c3126d081a69..2317f882e962 100644
--- a/sys-devel/gnuconfig/files/99999999/0001-add-uClibc-guess-support.patch
+++ b/sys-devel/gnuconfig/files/99999999/0001-add-uClibc-guess-support.patch
@@ -1,24 +1,24 @@
-From d5a10be0ad318f44d81c147033359e487e918ffd Mon Sep 17 00:00:00 2001
+From 8498f76fe6131577ce3e90af58a6be958b3795be Mon Sep 17 00:00:00 2001
 From: Mike Frysinger <vapier@gentoo.org>
 Date: Thu, 9 Oct 2008 15:51:09 -0400
 Subject: [PATCH 1/2] add uClibc guess support
 
 ---
- config.guess |   77 +++++++++++++++++++++++++++++++++++++---------------------
- 1 files changed, 49 insertions(+), 28 deletions(-)
+ config.guess |   89 ++++++++++++++++++++++++++++++++++------------------------
+ 1 files changed, 52 insertions(+), 37 deletions(-)
 
 diff --git a/config.guess b/config.guess
-index bb0b03e..12734a7 100755
+index c2246a4..bf48496 100755
 --- a/config.guess
 +++ b/config.guess
-@@ -139,6 +139,25 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+@@ -140,6 +140,29 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
  UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
  UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
  
 +case "${UNAME_SYSTEM}" in
 +Linux|GNU/*)
 +	eval $set_cc_for_build
-+	cat << EOF > $dummy.c
++	cat <<-EOF > $dummy.c
 +	#include <features.h>
 +	#ifdef __UCLIBC__
 +	# ifdef __UCLIBC_CONFIG_VERSION__
@@ -27,17 +27,26 @@ index bb0b03e..12734a7 100755
 +	LIBC=uclibc
 +	# endif
 +	#else
++	# ifdef __dietlibc__
++	LIBC=dietlibc
++	# else
 +	LIBC=gnu
++	# endif
 +	#endif
-+EOF
-+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'`
++	EOF
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
 +	;;
 +esac
 +
  # Note: order is significant - the case branches are not exclusive.
  
  case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-@@ -849,7 +868,7 @@ EOF
+@@ -849,11 +872,11 @@ EOF
+ 	exit ;;
+     *:GNU:*:*)
+ 	# the GNU system
+-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
++	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
  	exit ;;
      *:GNU/*:*:*)
  	# other systems with GNU libc and userland
@@ -46,7 +55,17 @@ index bb0b03e..12734a7 100755
  	exit ;;
      i*86:Minix:*:*)
  	echo ${UNAME_MACHINE}-pc-minix
-@@ -859,31 +878,31 @@ EOF
+@@ -869,50 +892,42 @@ EOF
+ 	  EV68*) UNAME_MACHINE=alphaev68 ;;
+         esac
+ 	objdump --private-headers /bin/sh | grep -q ld.so.1
+-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     arm*:Linux:*:*)
+ 	eval $set_cc_for_build
  	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
  	    | grep -q __ARM_EABI__
  	then
@@ -73,6 +92,18 @@ index bb0b03e..12734a7 100755
 -    	echo frv-unknown-linux-gnu
 +    	echo frv-unknown-linux-${LIBC}
  	exit ;;
+     i*86:Linux:*:*)
+-	LIBC=gnu
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
+-	#ifdef __dietlibc__
+-	LIBC=dietlibc
+-	#endif
+-EOF
+-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
++	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+ 	exit ;;
      ia64:Linux:*:*)
 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
@@ -87,10 +118,10 @@ index bb0b03e..12734a7 100755
  	exit ;;
      mips:Linux:*:* | mips64:Linux:*:*)
  	eval $set_cc_for_build
-@@ -906,16 +925,16 @@ EOF
- 		s: ::g
- 		p
- 	    }'`"
+@@ -931,51 +946,51 @@ EOF
+ 	#endif
+ EOF
+ 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 -	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 +	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
  	;;
@@ -98,29 +129,14 @@ index bb0b03e..12734a7 100755
 -	echo or32-unknown-linux-gnu
 +	echo or32-unknown-linux-${LIBC}
  	exit ;;
-     ppc:Linux:*:*)
--	echo powerpc-unknown-linux-gnu
-+	echo powerpc-unknown-linux-${LIBC}
- 	exit ;;
-     ppc64:Linux:*:*)
--	echo powerpc64-unknown-linux-gnu
-+	echo powerpc64-unknown-linux-${LIBC}
- 	exit ;;
-     alpha:Linux:*:*)
- 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-@@ -928,43 +947,43 @@ EOF
- 	  EV68*) UNAME_MACHINE=alphaev68 ;;
-         esac
- 	objdump --private-headers /bin/sh | grep -q ld.so.1
--	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
--	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- 	exit ;;
      padre:Linux:*:*)
 -	echo sparc-unknown-linux-gnu
 +	echo sparc-unknown-linux-${LIBC}
  	exit ;;
+     parisc64:Linux:*:* | hppa64:Linux:*:*)
+-	echo hppa64-unknown-linux-gnu
++	echo hppa64-unknown-linux-${LIBC}
+ 	exit ;;
      parisc:Linux:*:* | hppa:Linux:*:*)
  	# Look for CPU level
  	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -132,9 +148,13 @@ index bb0b03e..12734a7 100755
 +	  *)    echo hppa-unknown-linux-${LIBC} ;;
  	esac
  	exit ;;
-     parisc64:Linux:*:* | hppa64:Linux:*:*)
--	echo hppa64-unknown-linux-gnu
-+	echo hppa64-unknown-linux-${LIBC}
+     ppc64:Linux:*:*)
+-	echo powerpc64-unknown-linux-gnu
++	echo powerpc64-unknown-linux-${LIBC}
+ 	exit ;;
+     ppc:Linux:*:*)
+-	echo powerpc-unknown-linux-gnu
++	echo powerpc-unknown-linux-${LIBC}
  	exit ;;
      s390:Linux:*:* | s390x:Linux:*:*)
  	echo ${UNAME_MACHINE}-ibm-linux
@@ -163,21 +183,8 @@ index bb0b03e..12734a7 100755
 -    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +    	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  	exit ;;
-     i*86:Linux:*:*)
- 	# The BFD linker knows what the default object file format is, so
-@@ -979,9 +998,11 @@ EOF
- 				    p'`
-         case "$ld_supported_targets" in
- 	  elf32-i386)
--		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-+		TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}"
- 		;;
- 	esac
-+	# This should get integrated into the C code below, but now we hack
-+	if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi
- 	# Determine whether the default compiler is a.out or elf
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
+     i*86:DYNIX/ptx:4*:*)
+ 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 -- 
-1.6.4
+1.6.6.1
 
diff --git a/sys-devel/gnuconfig/files/99999999/0002-add-ps2-targets-to-config.sub.patch b/sys-devel/gnuconfig/files/99999999/0002-add-ps2-targets-to-config.sub.patch
index ad2d89e9b123..067bb1f7235f 100644
--- a/sys-devel/gnuconfig/files/99999999/0002-add-ps2-targets-to-config.sub.patch
+++ b/sys-devel/gnuconfig/files/99999999/0002-add-ps2-targets-to-config.sub.patch
@@ -1,4 +1,4 @@
-From 96cb2b8095c7ac9d211f0abc6704b769344a8afa Mon Sep 17 00:00:00 2001
+From 8550922eda8dc401a3059c1e9eb2d70a359cb8a9 Mon Sep 17 00:00:00 2001
 From: Mike Frysinger <vapier@gentoo.org>
 Date: Thu, 9 Oct 2008 15:51:35 -0400
 Subject: [PATCH 2/2] add ps2 targets to config.sub
@@ -8,10 +8,10 @@ Subject: [PATCH 2/2] add ps2 targets to config.sub
  1 files changed, 20 insertions(+), 2 deletions(-)
 
 diff --git a/config.sub b/config.sub
-index 8ca084b..3243784 100755
+index c2d1257..4c0d959 100755
 --- a/config.sub
 +++ b/config.sub
-@@ -251,7 +251,7 @@ case $basic_machine in
+@@ -252,7 +252,7 @@ case $basic_machine in
  	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
  	| bfin \
  	| c4x | clipper \
@@ -20,7 +20,7 @@ index 8ca084b..3243784 100755
  	| fido | fr30 | frv \
  	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
  	| i370 | i860 | i960 | ia64 \
-@@ -747,6 +747,24 @@ case $basic_machine in
+@@ -752,6 +752,24 @@ case $basic_machine in
  		basic_machine=m68k-atari
  		os=-mint
  		;;
@@ -45,15 +45,15 @@ index 8ca084b..3243784 100755
  	mips3*-*)
  		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
  		;;
-@@ -1296,7 +1314,7 @@ case $os in
+@@ -1305,7 +1323,7 @@ case $os in
+ 	      | -uxpv* | -beos* | -mpeix* | -udk* \
+ 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
++	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \
  	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
  	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
  	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
--	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
-+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -irx*)
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
- 	-qnx*)
 -- 
-1.6.4
+1.6.6.1
 
diff --git a/sys-devel/gnuconfig/files/99999999/disable-broken-tests.patch b/sys-devel/gnuconfig/files/99999999/disable-broken-tests.patch
deleted file mode 100644
index 4b707318c77d..000000000000
--- a/sys-devel/gnuconfig/files/99999999/disable-broken-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-the test relies on `uname -m`, so it'll fail on non-i386 systems
-
-diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
-index 7f6f214..189b067 100644
---- a/testsuite/config-guess.data
-+++ b/testsuite/config-guess.data
-@@ -32,8 +32,6 @@ xtensa	2.6.15			Linux		ignored	xtensa-unknown-linux-gnu
- x86_64	1.0			MINGW		ignored	x86_64-pc-mingw32
- i386	1.0			MINGW		ignored	i386-pc-mingw32
- SX-8R	1.0			SUPER-UX	ignored	sx8r-nec-superux1.0
--i86xen	5.6			SunOS		ignored	i386-pc-solaris2.6
--i86pc	5.6			SunOS		ignored	i386-pc-solaris2.6
- IA64	6.0			Interix		ignored	ia64-unknown-interix6.0
- BePC	1.0			Haiku		ignored	i586-pc-haiku
- padre	2.6.15			Linux		ignored	sparc-unknown-linux-gnu