From 69f053fdb46bfbb2c325c03aa1760061883a0c47 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 2 Mar 2006 06:18:02 +0000 Subject: sync with latest upstream cvs --- .../gnuconfig/patches/config.guess.uclibc.patch | 32 +++++++++++----------- package/gnuconfig/patches/config.sub.nios.patch | 17 ------------ package/gnuconfig/patches/config.sub.ps2.patch | 14 +++++----- package/gnuconfig/patches/config.sub.sh.patch | 8 +++--- 4 files changed, 27 insertions(+), 44 deletions(-) delete mode 100644 package/gnuconfig/patches/config.sub.nios.patch (limited to 'package/gnuconfig/patches') diff --git a/package/gnuconfig/patches/config.guess.uclibc.patch b/package/gnuconfig/patches/config.guess.uclibc.patch index 9acca1a08..becdb66f2 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.341 -diff -u -p -r1.341 config.guess ---- config.guess 22 Dec 2005 23:50:21 -0000 1.341 -+++ config.guess 30 Dec 2005 23:47:21 -0000 -@@ -138,6 +138,23 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` | +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` | UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown @@ -29,7 +29,7 @@ diff -u -p -r1.341 config.guess # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in -@@ -820,25 +837,25 @@ EOF +@@ -830,25 +847,25 @@ EOF echo ${UNAME_MACHINE}-pc-minix exit ;; arm*:Linux:*:*) @@ -62,19 +62,19 @@ diff -u -p -r1.341 config.guess exit ;; mips:Linux:*:*) eval $set_cc_for_build -@@ -857,7 +874,7 @@ EOF - #endif - EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" +@@ -871,7 +888,7 @@ EOF + s: ::g + p + }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; mips64:Linux:*:*) eval $set_cc_for_build -@@ -876,16 +893,16 @@ EOF - #endif - EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" +@@ -894,16 +911,16 @@ EOF + s: ::g + p + }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; @@ -92,7 +92,7 @@ diff -u -p -r1.341 config.guess exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -@@ -898,37 +915,37 @@ EOF +@@ -916,37 +933,37 @@ EOF EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null @@ -141,7 +141,7 @@ diff -u -p -r1.341 config.guess exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so -@@ -943,20 +960,22 @@ EOF +@@ -961,20 +978,22 @@ EOF p'` case "$ld_supported_targets" in elf32-i386) diff --git a/package/gnuconfig/patches/config.sub.nios.patch b/package/gnuconfig/patches/config.sub.nios.patch deleted file mode 100644 index b4e71c18e..000000000 --- a/package/gnuconfig/patches/config.sub.nios.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: config.sub -=================================================================== -RCS file: /cvsroot/config/config/config.sub,v -retrieving revision 1.336 -diff -u -p -r1.336 config.sub ---- config.sub 22 Dec 2005 23:50:21 -0000 1.336 -+++ config.sub 30 Dec 2005 23:37:29 -0000 -@@ -298,6 +298,9 @@ case $basic_machine in - ms1) - basic_machine=mt-unknown - ;; -+ nios2 | nios2-* | nios2 | nios2-*) -+ basic_machine=nios2-altera -+ ;; - - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and diff --git a/package/gnuconfig/patches/config.sub.ps2.patch b/package/gnuconfig/patches/config.sub.ps2.patch index 67b3e9d70..619a96e21 100644 --- a/package/gnuconfig/patches/config.sub.ps2.patch +++ b/package/gnuconfig/patches/config.sub.ps2.patch @@ -1,11 +1,11 @@ Index: config.sub =================================================================== RCS file: /cvsroot/config/config/config.sub,v -retrieving revision 1.336 -diff -u -p -r1.336 config.sub ---- config.sub 22 Dec 2005 23:50:21 -0000 1.336 -+++ config.sub 30 Dec 2005 23:38:29 -0000 -@@ -243,7 +243,7 @@ case $basic_machine in +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 \ | bfin \ | c4x | clipper \ @@ -14,7 +14,7 @@ diff -u -p -r1.336 config.sub | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ -@@ -690,6 +690,24 @@ case $basic_machine in +@@ -693,6 +693,24 @@ case $basic_machine in basic_machine=m68k-atari os=-mint ;; @@ -39,7 +39,7 @@ diff -u -p -r1.336 config.sub mips3*-*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ;; -@@ -1214,7 +1232,7 @@ case $os in +@@ -1218,7 +1236,7 @@ case $os in | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ diff --git a/package/gnuconfig/patches/config.sub.sh.patch b/package/gnuconfig/patches/config.sub.sh.patch index 9a9c39f14..0ca2db8e0 100644 --- a/package/gnuconfig/patches/config.sub.sh.patch +++ b/package/gnuconfig/patches/config.sub.sh.patch @@ -19,12 +19,12 @@ retrieving revision 1.336 diff -u -p -r1.336 config.sub --- config.sub 22 Dec 2005 23:50:21 -0000 1.336 +++ config.sub 30 Dec 2005 23:36:24 -0000 -@@ -273,7 +273,7 @@ case $basic_machine in +@@ -275,7 +275,7 @@ case $basic_machine in | pdp10 | pdp11 | pj | pjl \ | 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 | 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 \ | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ -- cgit v1.2.3