diff options
Diffstat (limited to 'package/gnuconfig/patches')
| -rw-r--r-- | package/gnuconfig/patches/config.guess.uclibc.patch | 137 | ||||
| -rw-r--r-- | package/gnuconfig/patches/config.sub.gnuhurd-uclibc.patch | 20 | ||||
| -rw-r--r-- | package/gnuconfig/patches/config.sub.ps2.patch | 19 | ||||
| -rw-r--r-- | package/gnuconfig/patches/config.sub.sh.patch | 39 | ||||
| -rw-r--r-- | package/gnuconfig/patches/config.xtensa.glob.patch | 44 |
5 files changed, 61 insertions, 198 deletions
diff --git a/package/gnuconfig/patches/config.guess.uclibc.patch b/package/gnuconfig/patches/config.guess.uclibc.patch index 69d88a35a..85f9b8966 100644 --- a/package/gnuconfig/patches/config.guess.uclibc.patch +++ b/package/gnuconfig/patches/config.guess.uclibc.patch @@ -1,11 +1,6 @@ -Index: config.guess -=================================================================== -RCS file: /cvsroot/config/config/config.guess,v -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 @@ +--- config.guess ++++ config.guess +@@ -140,6 +141,23 @@ 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 @@ -29,12 +24,25 @@ diff -u -r1.366 config.guess # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in -@@ -833,28 +850,28 @@ - echo ${UNAME_MACHINE}-pc-minix +@@ -872,33 +890,32 @@ 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:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -49,8 +57,16 @@ diff -u -r1.366 config.guess + echo crisv32-axis-linux-${LIBC} exit ;; frv:Linux:*:*) -- echo frv-unknown-linux-gnu -+ echo frv-unknown-linux-${LIBC} +- 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__ +@@ -909,13 +926,13 @@ EOF + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -64,21 +80,12 @@ diff -u -r1.366 config.guess - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; - mips:Linux:*:*) - eval $set_cc_for_build -@@ -877,7 +894,7 @@ - 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:*:*) + mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build -@@ -900,16 +917,16 @@ - s: ::g - p - }'`" +@@ -934,10 +951,10 @@ 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; } ;; @@ -86,25 +93,9 @@ diff -u -r1.366 config.guess - 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 -@@ -922,40 +939,40 @@ - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null -- 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 +@@ -948,40 +965,40 @@ EOF parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -116,15 +107,19 @@ diff -u -r1.366 config.guess + *) 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 exit ;; sh64*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu +- echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) @@ -135,6 +130,9 @@ diff -u -r1.366 config.guess - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-tilera-linux-gnu + exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} @@ -143,36 +141,9 @@ diff -u -r1.366 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} + xtensa*:Linux:*:*) +- 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 -@@ -970,20 +987,22 @@ - p'` - case "$ld_supported_targets" in - elf32-i386) -- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" -+ TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}" - ;; - a.out-i386-linux) -- echo "${UNAME_MACHINE}-pc-linux-gnuaout" -+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout" - exit ;; - coff-i386) -- echo "${UNAME_MACHINE}-pc-linux-gnucoff" -+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff" - exit ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. -- echo "${UNAME_MACHINE}-pc-linux-gnuoldld" -+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld" - exit ;; - 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. diff --git a/package/gnuconfig/patches/config.sub.gnuhurd-uclibc.patch b/package/gnuconfig/patches/config.sub.gnuhurd-uclibc.patch deleted file mode 100644 index 6fcdf811f..000000000 --- a/package/gnuconfig/patches/config.sub.gnuhurd-uclibc.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: config.sub -=================================================================== ---- config.sub (revision 20153) -+++ config.sub (working copy) -@@ -121,6 +121,7 @@ - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ -+ gnu*-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os -@@ -1237,6 +1238,7 @@ - | -chorusos* | -chorusrdb* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ -+ | -gnu*-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ diff --git a/package/gnuconfig/patches/config.sub.ps2.patch b/package/gnuconfig/patches/config.sub.ps2.patch index ac8dbc68a..57d09dcf2 100644 --- a/package/gnuconfig/patches/config.sub.ps2.patch +++ b/package/gnuconfig/patches/config.sub.ps2.patch @@ -1,11 +1,6 @@ -Index: config.sub -=================================================================== -RCS file: /cvsroot/config/config/config.sub,v -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 @@ +--- config.sub ++++ config.sub +@@ -253,7 +253,7 @@ case $basic_machine in | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ | bfin \ | c4x | clipper \ @@ -14,7 +9,7 @@ diff -u -r1.356 config.sub | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ -@@ -694,6 +694,24 @@ +@@ -773,6 +773,24 @@ case $basic_machine in basic_machine=m68k-atari os=-mint ;; @@ -39,12 +34,12 @@ diff -u -r1.356 config.sub mips3*-*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ;; -@@ -1226,7 +1244,7 @@ +@@ -1325,7 +1343,7 @@ case $os in | -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*) +- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) ++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -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 deleted file mode 100644 index c8727dff1..000000000 --- a/package/gnuconfig/patches/config.sub.sh.patch +++ /dev/null @@ -1,39 +0,0 @@ -gnuconfig seems intent on only supporting superfluous targets that don't -represent any real hardware (such as sh2a LE). GCC in its infinite wisdom is -also incapable of supporting tuning for other variants in a sensible fashion. - -As such, we still need to be able to support such useful targets as -sh2a_nofpueb in order to not only get the byte order right, but also to -support -m2a-nofpu tuning from the kernel (though we tend to do this through --Wa,-isa= instead, as the binutils people do a much better job of not screwing -up their config code every other day. Way to go config.gcc..). - -The fact that the sh variant matching is the ugliest out of any of the other -architectures doesn't seem to deter GCC folk from their well thought out and -brilliantly managed config target list. - -Index: config.sub -=================================================================== -RCS file: /cvsroot/config/config/config.sub,v -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 \ - | 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 \ -@@ -358,7 +358,7 @@ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ - | pyramid-* \ - | romp-* | rs6000-* \ -- | 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-* \ diff --git a/package/gnuconfig/patches/config.xtensa.glob.patch b/package/gnuconfig/patches/config.xtensa.glob.patch deleted file mode 100644 index 4b37aa77f..000000000 --- a/package/gnuconfig/patches/config.xtensa.glob.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -rNdup config-orig/config.guess config/config.guess ---- config-orig/config.guess 2007-11-13 16:31:20.000000000 -0800 -+++ config/config.guess 2007-11-14 00:26:39.000000000 -0800 -@@ -954,8 +954,8 @@ EOF - x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu - exit ;; -- xtensa:Linux:*:*) -- echo xtensa-unknown-linux-gnu -+ xtensa*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so -diff -rNdup config-orig/config.sub config/config.sub ---- config-orig/config.sub 2007-11-13 16:31:20.000000000 -0800 -+++ config/config.sub 2007-11-14 00:48:37.000000000 -0800 -@@ -369,10 +369,14 @@ case $basic_machine in - | v850-* | v850e-* | vax-* \ - | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ -- | xstormy16-* | xtensa-* \ -+ | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-*) - ;; -+ # Recognize the basic CPU types without company name, with glob match. -+ xtensa*) -+ basic_machine=$basic_machine-unknown -+ ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. - 386bsd) -diff -rNdup config-orig/testsuite/config-sub.data config/testsuite/config-sub.data ---- config-orig/testsuite/config-sub.data 2007-11-13 15:56:17.000000000 -0800 -+++ config/testsuite/config-sub.data 2007-11-14 00:31:22.000000000 -0800 -@@ -109,6 +109,7 @@ fido-elf fido-unknown-elf - fido fido-unknown-none - xtensa-elf xtensa-unknown-elf - xtensa-linux xtensa-unknown-linux-gnu -+xtensa_dc232b-linux xtensa_dc232b-unknown-linux-gnu - i386-drops1.0 i386-pc-drops1.0 - mep mep-unknown-elf - mep-elf mep-unknown-elf |