summaryrefslogtreecommitdiff
path: root/debian/patches/config-guess-sub.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/config-guess-sub.patch')
-rw-r--r--debian/patches/config-guess-sub.patch387
1 files changed, 0 insertions, 387 deletions
diff --git a/debian/patches/config-guess-sub.patch b/debian/patches/config-guess-sub.patch
deleted file mode 100644
index aabe99b9e..000000000
--- a/debian/patches/config-guess-sub.patch
+++ /dev/null
@@ -1,387 +0,0 @@
1Description: Update config.guess and config.sub from autotools-dev 20090611.1
2From: Bradley Smith <bradsmith@debian.org>
3Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1722
4Bug-Debian: http://bugs.debian.org/538301
5Last-Update: 2010-03-01
6
7Index: b/config.guess
8===================================================================
9--- a/config.guess
10+++ b/config.guess
11@@ -1,10 +1,10 @@
12 #! /bin/sh
13 # Attempt to guess a canonical system name.
14 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
15-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
16+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
17 # Free Software Foundation, Inc.
18
19-timestamp='2008-04-14'
20+timestamp='2009-06-10'
21
22 # This file is free software; you can redistribute it and/or modify it
23 # under the terms of the GNU General Public License as published by
24@@ -170,7 +170,7 @@
25 arm*|i386|m68k|ns32k|sh3*|sparc|vax)
26 eval $set_cc_for_build
27 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
28- | grep __ELF__ >/dev/null
29+ | grep -q __ELF__
30 then
31 # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
32 # Return netbsd for either. FIX?
33@@ -324,6 +324,9 @@
34 case `/usr/bin/uname -p` in
35 sparc) echo sparc-icl-nx7; exit ;;
36 esac ;;
37+ s390x:SunOS:*:*)
38+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
39+ exit ;;
40 sun4H:SunOS:5.*:*)
41 echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
42 exit ;;
43@@ -331,7 +334,20 @@
44 echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
45 exit ;;
46 i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
47- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
48+ eval $set_cc_for_build
49+ SUN_ARCH="i386"
50+ # If there is a compiler, see if it is configured for 64-bit objects.
51+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
52+ # This test works for both compilers.
53+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
54+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
55+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
56+ grep IS_64BIT_ARCH >/dev/null
57+ then
58+ SUN_ARCH="x86_64"
59+ fi
60+ fi
61+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
62 exit ;;
63 sun4*:SunOS:6*:*)
64 # According to config.sub, this is the proper way to canonicalize
65@@ -640,7 +656,7 @@
66 # => hppa64-hp-hpux11.23
67
68 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
69- grep __LP64__ >/dev/null
70+ grep -q __LP64__
71 then
72 HP_ARCH="hppa2.0w"
73 else
74@@ -796,7 +812,7 @@
75 x86)
76 echo i586-pc-interix${UNAME_RELEASE}
77 exit ;;
78- EM64T | authenticamd)
79+ EM64T | authenticamd | genuineintel)
80 echo x86_64-unknown-interix${UNAME_RELEASE}
81 exit ;;
82 IA64)
83@@ -806,6 +822,9 @@
84 [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
85 echo i${UNAME_MACHINE}-pc-mks
86 exit ;;
87+ 8664:Windows_NT:*)
88+ echo x86_64-pc-mks
89+ exit ;;
90 i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
91 # How do we know it's Interix rather than the generic POSIX subsystem?
92 # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
93@@ -866,40 +885,17 @@
94 m68*:Linux:*:*)
95 echo ${UNAME_MACHINE}-unknown-linux-gnu
96 exit ;;
97- mips:Linux:*:*)
98+ mips:Linux:*:* | mips64:Linux:*:*)
99 eval $set_cc_for_build
100 sed 's/^ //' << EOF >$dummy.c
101 #undef CPU
102- #undef mips
103- #undef mipsel
104+ #undef ${UNAME_MACHINE}
105+ #undef ${UNAME_MACHINE}el
106 #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
107- CPU=mipsel
108+ CPU=${UNAME_MACHINE}el
109 #else
110 #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
111- CPU=mips
112- #else
113- CPU=
114- #endif
115- #endif
116-EOF
117- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
118- /^CPU/{
119- s: ::g
120- p
121- }'`"
122- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
123- ;;
124- mips64:Linux:*:*)
125- eval $set_cc_for_build
126- sed 's/^ //' << EOF >$dummy.c
127- #undef CPU
128- #undef mips64
129- #undef mips64el
130- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
131- CPU=mips64el
132- #else
133- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
134- CPU=mips64
135+ CPU=${UNAME_MACHINE}
136 #else
137 CPU=
138 #endif
139@@ -931,10 +927,13 @@
140 EV67) UNAME_MACHINE=alphaev67 ;;
141 EV68*) UNAME_MACHINE=alphaev68 ;;
142 esac
143- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
144+ objdump --private-headers /bin/sh | grep -q ld.so.1
145 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
146 echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
147 exit ;;
148+ padre:Linux:*:*)
149+ echo sparc-unknown-linux-gnu
150+ exit ;;
151 parisc:Linux:*:* | hppa:Linux:*:*)
152 # Look for CPU level
153 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
154@@ -982,14 +981,6 @@
155 elf32-i386)
156 TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
157 ;;
158- a.out-i386-linux)
159- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
160- exit ;;
161- "")
162- # Either a pre-BFD a.out linker (linux-gnuoldld) or
163- # one that does not give us useful --help.
164- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
165- exit ;;
166 esac
167 # Determine whether the default compiler is a.out or elf
168 eval $set_cc_for_build
169@@ -1055,7 +1046,7 @@
170 i*86:syllable:*:*)
171 echo ${UNAME_MACHINE}-pc-syllable
172 exit ;;
173- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
174+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
175 echo i386-unknown-lynxos${UNAME_RELEASE}
176 exit ;;
177 i*86:*DOS:*:*)
178@@ -1099,8 +1090,11 @@
179 pc:*:*:*)
180 # Left here for compatibility:
181 # uname -m prints for DJGPP always 'pc', but it prints nothing about
182- # the processor, so we play safe by assuming i386.
183- echo i386-pc-msdosdjgpp
184+ # the processor, so we play safe by assuming i586.
185+ # Note: whatever this is, it MUST be the same as what config.sub
186+ # prints for the "djgpp" host, or else GDB configury will decide that
187+ # this is a cross-build.
188+ echo i586-pc-msdosdjgpp
189 exit ;;
190 Intel:Mach:3*:*)
191 echo i386-pc-mach3
192@@ -1138,6 +1132,16 @@
193 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
194 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
195 && { echo i486-ncr-sysv4; exit; } ;;
196+ NCR*:*:4.2:* | MPRAS*:*:4.2:*)
197+ OS_REL='.3'
198+ test -r /etc/.relid \
199+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
200+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
201+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
202+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
203+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
204+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
205+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
206 m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
207 echo m68k-unknown-lynxos${UNAME_RELEASE}
208 exit ;;
209@@ -1150,7 +1154,7 @@
210 rs6000:LynxOS:2.*:*)
211 echo rs6000-unknown-lynxos${UNAME_RELEASE}
212 exit ;;
213- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
214+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
215 echo powerpc-unknown-lynxos${UNAME_RELEASE}
216 exit ;;
217 SM[BE]S:UNIX_SV:*:*)
218@@ -1324,6 +1328,9 @@
219 i*86:rdos:*:*)
220 echo ${UNAME_MACHINE}-pc-rdos
221 exit ;;
222+ i*86:AROS:*:*)
223+ echo ${UNAME_MACHINE}-pc-aros
224+ exit ;;
225 esac
226
227 #echo '(No uname command or uname output not recognized.)' 1>&2
228Index: b/config.sub
229===================================================================
230--- a/config.sub
231+++ b/config.sub
232@@ -1,10 +1,10 @@
233 #! /bin/sh
234 # Configuration validation subroutine script.
235 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
236-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
237+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
238 # Free Software Foundation, Inc.
239
240-timestamp='2008-06-16'
241+timestamp='2009-06-11'
242
243 # This file is (in principle) common to ALL GNU software.
244 # The presence of a machine in this file suggests that SOME GNU software
245@@ -122,6 +122,7 @@
246 case $maybe_os in
247 nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
248 uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
249+ kopensolaris*-gnu* | \
250 storm-chaos* | os2-emx* | rtmk-nova*)
251 os=-$maybe_os
252 basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
253@@ -152,6 +153,9 @@
254 os=
255 basic_machine=$1
256 ;;
257+ -bluegene*)
258+ os=-cnk
259+ ;;
260 -sim | -cisco | -oki | -wec | -winbond)
261 os=
262 basic_machine=$1
263@@ -249,6 +253,7 @@
264 | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
265 | i370 | i860 | i960 | ia64 \
266 | ip2k | iq2000 \
267+ | lm32 \
268 | m32c | m32r | m32rle | m68000 | m68k | m88k \
269 | maxq | mb | microblaze | mcore | mep | metag \
270 | mips | mipsbe | mipseb | mipsel | mipsle \
271@@ -270,6 +275,7 @@
272 | mipsisa64sr71k | mipsisa64sr71kel \
273 | mipstx39 | mipstx39el \
274 | mn10200 | mn10300 \
275+ | moxie \
276 | mt \
277 | msp430 \
278 | nios | nios2 \
279@@ -279,7 +285,7 @@
280 | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
281 | pyramid \
282 | score \
283- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
284+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
285 | sh64 | sh64le \
286 | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
287 | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
288@@ -288,7 +294,7 @@
289 | v850 | v850e \
290 | we32k \
291 | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
292- | z8k)
293+ | z8k | z80)
294 basic_machine=$basic_machine-unknown
295 ;;
296 m6811 | m68hc11 | m6812 | m68hc12)
297@@ -331,6 +337,7 @@
298 | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
299 | i*86-* | i860-* | i960-* | ia64-* \
300 | ip2k-* | iq2000-* \
301+ | lm32-* \
302 | m32c-* | m32r-* | m32rle-* \
303 | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
304 | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
305@@ -362,7 +369,7 @@
306 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
307 | pyramid-* \
308 | romp-* | rs6000-* \
309- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
310+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
311 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
312 | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
313 | sparclite-* \
314@@ -375,7 +382,7 @@
315 | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
316 | xstormy16-* | xtensa*-* \
317 | ymp-* \
318- | z8k-*)
319+ | z8k-* | z80-*)
320 ;;
321 # Recognize the basic CPU types without company name, with glob match.
322 xtensa*)
323@@ -443,6 +450,10 @@
324 basic_machine=m68k-apollo
325 os=-bsd
326 ;;
327+ aros)
328+ basic_machine=i386-pc
329+ os=-aros
330+ ;;
331 aux)
332 basic_machine=m68k-apple
333 os=-aux
334@@ -459,6 +470,10 @@
335 basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
336 os=-linux
337 ;;
338+ bluegene*)
339+ basic_machine=powerpc-ibm
340+ os=-cnk
341+ ;;
342 c90)
343 basic_machine=c90-cray
344 os=-unicos
345@@ -1140,6 +1155,10 @@
346 basic_machine=z8k-unknown
347 os=-sim
348 ;;
349+ z80-*-coff)
350+ basic_machine=z80-unknown
351+ os=-sim
352+ ;;
353 none)
354 basic_machine=none-none
355 os=-none
356@@ -1178,7 +1197,7 @@
357 we32k)
358 basic_machine=we32k-att
359 ;;
360- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
361+ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
362 basic_machine=sh-unknown
363 ;;
364 sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
365@@ -1248,10 +1267,11 @@
366 # Each alternative MUST END IN A *, to match a version number.
367 # -sysv* is not here because it comes later, after sysvr4.
368 -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
369- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
370+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
371 | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
372+ | -kopensolaris* \
373 | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
374- | -aos* \
375+ | -aos* | -aros* \
376 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
377 | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
378 | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
379@@ -1600,7 +1620,7 @@
380 -sunos*)
381 vendor=sun
382 ;;
383- -aix*)
384+ -cnk*|-aix*)
385 vendor=ibm
386 ;;
387 -beos*)
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-11 07:42:55 +0000