summaryrefslogtreecommitdiff
path: root/package/gnuconfig/patches
diff options
context:
space:
mode:
Diffstat (limited to 'package/gnuconfig/patches')
-rw-r--r--package/gnuconfig/patches/config.guess.uclibc.patch29
-rw-r--r--package/gnuconfig/patches/config.sub.nios.patch18
-rw-r--r--package/gnuconfig/patches/config.sub.ps2.patch18
-rw-r--r--package/gnuconfig/patches/config.sub.sh.patch11
4 files changed, 52 insertions, 24 deletions
diff --git a/package/gnuconfig/patches/config.guess.uclibc.patch b/package/gnuconfig/patches/config.guess.uclibc.patch
index 498b0c967..9acca1a08 100644
--- a/package/gnuconfig/patches/config.guess.uclibc.patch
+++ b/package/gnuconfig/patches/config.guess.uclibc.patch
@@ -1,10 +1,10 @@
Index: config.guess
===================================================================
RCS file: /cvsroot/config/config/config.guess,v
-retrieving revision 1.334
-diff -u -p -r1.334 config.guess
---- config.guess
-+++ config.guess
+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` |
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.334 config.guess
# Note: order is significant - the case branches are not exclusive.
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-@@ -815,25 +832,25 @@ EOF
+@@ -820,25 +837,25 @@ EOF
echo ${UNAME_MACHINE}-pc-minix
exit ;;
arm*:Linux:*:*)
@@ -62,19 +62,19 @@ diff -u -p -r1.334 config.guess
exit ;;
mips:Linux:*:*)
eval $set_cc_for_build
-@@ -852,7 +869,7 @@ EOF
+@@ -857,7 +874,7 @@ EOF
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{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
-@@ -871,16 +888,16 @@ EOF
+@@ -876,16 +893,16 @@ EOF
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{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.334 config.guess
exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-@@ -893,34 +910,34 @@ EOF
+@@ -898,37 +915,37 @@ EOF
EV68*) UNAME_MACHINE=alphaev68 ;;
esac
objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
@@ -121,7 +121,7 @@ diff -u -p -r1.334 config.guess
exit ;;
sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -131,13 +131,17 @@ diff -u -p -r1.334 config.guess
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
+ vax:Linux:*:*)
+- echo ${UNAME_MACHINE}-dec-linux-gnu
++ echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+ exit ;;
x86_64:Linux:*:*)
- echo x86_64-unknown-linux-gnu
+ echo x86_64-unknown-linux-${LIBC}
exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
-@@ -935,20 +952,21 @@ EOF
+@@ -943,20 +960,22 @@ EOF
p'`
case "$ld_supported_targets" in
elf32-i386)
@@ -159,6 +163,7 @@ diff -u -p -r1.334 config.guess
+ 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
diff --git a/package/gnuconfig/patches/config.sub.nios.patch b/package/gnuconfig/patches/config.sub.nios.patch
new file mode 100644
index 000000000..d95491f91
--- /dev/null
+++ b/package/gnuconfig/patches/config.sub.nios.patch
@@ -0,0 +1,18 @@
+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,10 @@ case $basic_machine in
+ ms1)
+ basic_machine=mt-unknown
+ ;;
++ nios2 | nios2-* | nios2 | nios2-*)
++ basic_machine=nios2-altera
++ os=-none
++ ;;
+
+ # 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 3c16b4000..67b3e9d70 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.330
-diff -u -p -r1.330 config.sub
---- config.sub
-+++ config.sub
-@@ -234,7 +234,7 @@ case $basic_machine in
+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
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
| bfin \
| c4x | clipper \
@@ -14,7 +14,7 @@ diff -u -p -r1.330 config.sub
| fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
-@@ -678,6 +678,24 @@ case $basic_machine in
+@@ -690,6 +690,24 @@ case $basic_machine in
basic_machine=m68k-atari
os=-mint
;;
@@ -39,12 +39,12 @@ diff -u -p -r1.330 config.sub
mips3*-*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
;;
-@@ -1188,7 +1206,7 @@ case $os in
+@@ -1214,7 +1232,7 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-- | -skyos* | -haiku*)
-+ | -skyos* | -haiku* | -irx*)
+- | -skyos* | -haiku* | -rdos*)
++ | -skyos* | -haiku* | -rdos* | -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 c1ccf1440..9a9c39f14 100644
--- a/package/gnuconfig/patches/config.sub.sh.patch
+++ b/package/gnuconfig/patches/config.sub.sh.patch
@@ -12,9 +12,14 @@ 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.
---- config.sub 2005-11-21 21:18:16.000000000 +0200
-+++ config.sub 2005-11-21 21:39:48.000000000 +0200
-@@ -264,7 +264,7 @@
+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:36:24 -0000
+@@ -273,7 +273,7 @@ case $basic_machine in
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 17:05:09 +0000