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