Merge lp:~logan/ubuntu/quantal/xinetd/debian-merge into lp:ubuntu/quantal/xinetd
- Quantal (12.10)
- debian-merge
- Merge into quantal
Proposed by
Logan Rosen
Status: | Merged |
---|---|
Merge reported by: | Dimitri John Ledkov |
Merged at revision: | not available |
Proposed branch: | lp:~logan/ubuntu/quantal/xinetd/debian-merge |
Merge into: | lp:ubuntu/quantal/xinetd |
Diff against target: |
3054 lines (+1241/-630) 6 files modified
config.guess (+703/-494) config.sub (+462/-132) debian/changelog (+19/-0) debian/patches/0006-Disable-services-from-inetd.conf-if-a-service-with-t.patch (+4/-4) debian/patches/0008-CVE-2012-0862.patch (+49/-0) xinetd/inet.c (+4/-0) |
To merge this branch: | bzr merge lp:~logan/ubuntu/quantal/xinetd/debian-merge |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu branches | Pending | ||
Review via email: mp+120052@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) wrote : | # |
Revision history for this message
Dimitri John Ledkov (xnox) wrote : | # |
Do you want to maintain xinetd in Debian?
Revision history for this message
Dimitri John Ledkov (xnox) wrote : | # |
I am sorry about first comment. You didn't copy the debian/changelog entries.... debcommit did it for you. Your debian/changelog is correct.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'config.guess' |
2 | --- config.guess 2007-11-29 09:29:55 +0000 |
3 | +++ config.guess 2012-08-17 04:57:18 +0000 |
4 | @@ -1,9 +1,10 @@ |
5 | #! /bin/sh |
6 | # Attempt to guess a canonical system name. |
7 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
8 | -# 2000, 2001, 2002 Free Software Foundation, Inc. |
9 | +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
10 | +# 2011, 2012 Free Software Foundation, Inc. |
11 | |
12 | -timestamp='2002-03-20' |
13 | +timestamp='2012-02-10' |
14 | |
15 | # This file is free software; you can redistribute it and/or modify it |
16 | # under the terms of the GNU General Public License as published by |
17 | @@ -16,24 +17,24 @@ |
18 | # General Public License for more details. |
19 | # |
20 | # You should have received a copy of the GNU General Public License |
21 | -# along with this program; if not, write to the Free Software |
22 | -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
23 | +# along with this program; if not, see <http://www.gnu.org/licenses/>. |
24 | # |
25 | # As a special exception to the GNU General Public License, if you |
26 | # distribute this file as part of a program that contains a |
27 | # configuration script generated by Autoconf, you may include it under |
28 | # the same distribution terms that you use for the rest of that program. |
29 | |
30 | -# Originally written by Per Bothner <per@bothner.com>. |
31 | -# Please send patches to <config-patches@gnu.org>. Submit a context |
32 | -# diff and a properly formatted ChangeLog entry. |
33 | + |
34 | +# Originally written by Per Bothner. Please send patches (context |
35 | +# diff format) to <config-patches@gnu.org> and include a ChangeLog |
36 | +# entry. |
37 | # |
38 | # This script attempts to guess a canonical system name similar to |
39 | # config.sub. If it succeeds, it prints the system name on stdout, and |
40 | # exits with 0. Otherwise, it exits with 1. |
41 | # |
42 | -# The plan is that this can be called by configure scripts if you |
43 | -# don't specify an explicit build system type. |
44 | +# You can get the latest version of this script from: |
45 | +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD |
46 | |
47 | me=`echo "$0" | sed -e 's,.*/,,'` |
48 | |
49 | @@ -53,7 +54,8 @@ |
50 | GNU config.guess ($timestamp) |
51 | |
52 | Originally written by Per Bothner. |
53 | -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 |
54 | +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
55 | +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 |
56 | Free Software Foundation, Inc. |
57 | |
58 | This is free software; see the source for copying conditions. There is NO |
59 | @@ -66,11 +68,11 @@ |
60 | while test $# -gt 0 ; do |
61 | case $1 in |
62 | --time-stamp | --time* | -t ) |
63 | - echo "$timestamp" ; exit 0 ;; |
64 | + echo "$timestamp" ; exit ;; |
65 | --version | -v ) |
66 | - echo "$version" ; exit 0 ;; |
67 | + echo "$version" ; exit ;; |
68 | --help | --h* | -h ) |
69 | - echo "$usage"; exit 0 ;; |
70 | + echo "$usage"; exit ;; |
71 | -- ) # Stop option processing |
72 | shift; break ;; |
73 | - ) # Use stdin as input. |
74 | @@ -88,30 +90,42 @@ |
75 | exit 1 |
76 | fi |
77 | |
78 | - |
79 | -dummy=dummy-$$ |
80 | -trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15 |
81 | - |
82 | -# CC_FOR_BUILD -- compiler used by this script. |
83 | +trap 'exit 1' 1 2 15 |
84 | + |
85 | +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a |
86 | +# compiler to aid in system detection is discouraged as it requires |
87 | +# temporary files to be created and, as you can see below, it is a |
88 | +# headache to deal with in a portable fashion. |
89 | + |
90 | # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still |
91 | # use `HOST_CC' if defined, but it is deprecated. |
92 | |
93 | -set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in |
94 | - ,,) echo "int dummy(){}" > $dummy.c ; |
95 | +# Portable tmp directory creation inspired by the Autoconf team. |
96 | + |
97 | +set_cc_for_build=' |
98 | +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; |
99 | +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; |
100 | +: ${TMPDIR=/tmp} ; |
101 | + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || |
102 | + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || |
103 | + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || |
104 | + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; |
105 | +dummy=$tmp/dummy ; |
106 | +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; |
107 | +case $CC_FOR_BUILD,$HOST_CC,$CC in |
108 | + ,,) echo "int x;" > $dummy.c ; |
109 | for c in cc gcc c89 c99 ; do |
110 | - ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; |
111 | - if test $? = 0 ; then |
112 | + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then |
113 | CC_FOR_BUILD="$c"; break ; |
114 | fi ; |
115 | done ; |
116 | - rm -f $dummy.c $dummy.o $dummy.rel ; |
117 | if test x"$CC_FOR_BUILD" = x ; then |
118 | CC_FOR_BUILD=no_compiler_found ; |
119 | fi |
120 | ;; |
121 | ,,*) CC_FOR_BUILD=$CC ;; |
122 | ,*,*) CC_FOR_BUILD=$HOST_CC ;; |
123 | -esac' |
124 | +esac ; set_cc_for_build= ;' |
125 | |
126 | # This is needed to find uname on a Pyramid OSx when run in the BSD universe. |
127 | # (ghazi@noc.rutgers.edu 1994-08-24) |
128 | @@ -129,7 +143,7 @@ |
129 | case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in |
130 | *:NetBSD:*:*) |
131 | # NetBSD (nbsd) targets should (where applicable) match one or |
132 | - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, |
133 | + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, |
134 | # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently |
135 | # switched to ELF, *-*-netbsd* would select the old |
136 | # object file format. This provides both forward |
137 | @@ -142,9 +156,11 @@ |
138 | UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ |
139 | /usr/sbin/$sysctl 2>/dev/null || echo unknown)` |
140 | case "${UNAME_MACHINE_ARCH}" in |
141 | + armeb) machine=armeb-unknown ;; |
142 | arm*) machine=arm-unknown ;; |
143 | sh3el) machine=shl-unknown ;; |
144 | sh3eb) machine=sh-unknown ;; |
145 | + sh5el) machine=sh5le-unknown ;; |
146 | *) machine=${UNAME_MACHINE_ARCH}-unknown ;; |
147 | esac |
148 | # The Operating System including object format, if it has switched |
149 | @@ -153,7 +169,7 @@ |
150 | arm*|i386|m68k|ns32k|sh3*|sparc|vax) |
151 | eval $set_cc_for_build |
152 | if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
153 | - | grep __ELF__ >/dev/null |
154 | + | grep -q __ELF__ |
155 | then |
156 | # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). |
157 | # Return netbsd for either. FIX? |
158 | @@ -163,145 +179,135 @@ |
159 | fi |
160 | ;; |
161 | *) |
162 | - os=netbsd |
163 | + os=netbsd |
164 | ;; |
165 | esac |
166 | # The OS release |
167 | - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` |
168 | + # Debian GNU/NetBSD machines have a different userland, and |
169 | + # thus, need a distinct triplet. However, they do not need |
170 | + # kernel version information, so it can be replaced with a |
171 | + # suitable tag, in the style of linux-gnu. |
172 | + case "${UNAME_VERSION}" in |
173 | + Debian*) |
174 | + release='-gnu' |
175 | + ;; |
176 | + *) |
177 | + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` |
178 | + ;; |
179 | + esac |
180 | # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: |
181 | # contains redundant information, the shorter form: |
182 | # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. |
183 | echo "${machine}-${os}${release}" |
184 | - exit 0 ;; |
185 | - amiga:OpenBSD:*:*) |
186 | - echo m68k-unknown-openbsd${UNAME_RELEASE} |
187 | - exit 0 ;; |
188 | - arc:OpenBSD:*:*) |
189 | - echo mipsel-unknown-openbsd${UNAME_RELEASE} |
190 | - exit 0 ;; |
191 | - hp300:OpenBSD:*:*) |
192 | - echo m68k-unknown-openbsd${UNAME_RELEASE} |
193 | - exit 0 ;; |
194 | - mac68k:OpenBSD:*:*) |
195 | - echo m68k-unknown-openbsd${UNAME_RELEASE} |
196 | - exit 0 ;; |
197 | - macppc:OpenBSD:*:*) |
198 | - echo powerpc-unknown-openbsd${UNAME_RELEASE} |
199 | - exit 0 ;; |
200 | - mvme68k:OpenBSD:*:*) |
201 | - echo m68k-unknown-openbsd${UNAME_RELEASE} |
202 | - exit 0 ;; |
203 | - mvme88k:OpenBSD:*:*) |
204 | - echo m88k-unknown-openbsd${UNAME_RELEASE} |
205 | - exit 0 ;; |
206 | - mvmeppc:OpenBSD:*:*) |
207 | - echo powerpc-unknown-openbsd${UNAME_RELEASE} |
208 | - exit 0 ;; |
209 | - pmax:OpenBSD:*:*) |
210 | - echo mipsel-unknown-openbsd${UNAME_RELEASE} |
211 | - exit 0 ;; |
212 | - sgi:OpenBSD:*:*) |
213 | - echo mipseb-unknown-openbsd${UNAME_RELEASE} |
214 | - exit 0 ;; |
215 | - sun3:OpenBSD:*:*) |
216 | - echo m68k-unknown-openbsd${UNAME_RELEASE} |
217 | - exit 0 ;; |
218 | - wgrisc:OpenBSD:*:*) |
219 | - echo mipsel-unknown-openbsd${UNAME_RELEASE} |
220 | - exit 0 ;; |
221 | + exit ;; |
222 | *:OpenBSD:*:*) |
223 | - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} |
224 | - exit 0 ;; |
225 | + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` |
226 | + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} |
227 | + exit ;; |
228 | + *:ekkoBSD:*:*) |
229 | + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} |
230 | + exit ;; |
231 | + *:SolidBSD:*:*) |
232 | + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} |
233 | + exit ;; |
234 | + macppc:MirBSD:*:*) |
235 | + echo powerpc-unknown-mirbsd${UNAME_RELEASE} |
236 | + exit ;; |
237 | + *:MirBSD:*:*) |
238 | + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} |
239 | + exit ;; |
240 | alpha:OSF1:*:*) |
241 | - if test $UNAME_RELEASE = "V4.0"; then |
242 | + case $UNAME_RELEASE in |
243 | + *4.0) |
244 | UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` |
245 | - fi |
246 | + ;; |
247 | + *5.*) |
248 | + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` |
249 | + ;; |
250 | + esac |
251 | + # According to Compaq, /usr/sbin/psrinfo has been available on |
252 | + # OSF/1 and Tru64 systems produced since 1995. I hope that |
253 | + # covers most systems running today. This code pipes the CPU |
254 | + # types through head -n 1, so we only detect the type of CPU 0. |
255 | + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` |
256 | + case "$ALPHA_CPU_TYPE" in |
257 | + "EV4 (21064)") |
258 | + UNAME_MACHINE="alpha" ;; |
259 | + "EV4.5 (21064)") |
260 | + UNAME_MACHINE="alpha" ;; |
261 | + "LCA4 (21066/21068)") |
262 | + UNAME_MACHINE="alpha" ;; |
263 | + "EV5 (21164)") |
264 | + UNAME_MACHINE="alphaev5" ;; |
265 | + "EV5.6 (21164A)") |
266 | + UNAME_MACHINE="alphaev56" ;; |
267 | + "EV5.6 (21164PC)") |
268 | + UNAME_MACHINE="alphapca56" ;; |
269 | + "EV5.7 (21164PC)") |
270 | + UNAME_MACHINE="alphapca57" ;; |
271 | + "EV6 (21264)") |
272 | + UNAME_MACHINE="alphaev6" ;; |
273 | + "EV6.7 (21264A)") |
274 | + UNAME_MACHINE="alphaev67" ;; |
275 | + "EV6.8CB (21264C)") |
276 | + UNAME_MACHINE="alphaev68" ;; |
277 | + "EV6.8AL (21264B)") |
278 | + UNAME_MACHINE="alphaev68" ;; |
279 | + "EV6.8CX (21264D)") |
280 | + UNAME_MACHINE="alphaev68" ;; |
281 | + "EV6.9A (21264/EV69A)") |
282 | + UNAME_MACHINE="alphaev69" ;; |
283 | + "EV7 (21364)") |
284 | + UNAME_MACHINE="alphaev7" ;; |
285 | + "EV7.9 (21364A)") |
286 | + UNAME_MACHINE="alphaev79" ;; |
287 | + esac |
288 | + # A Pn.n version is a patched version. |
289 | # A Vn.n version is a released version. |
290 | # A Tn.n version is a released field test version. |
291 | # A Xn.n version is an unreleased experimental baselevel. |
292 | # 1.2 uses "1.2" for uname -r. |
293 | - cat <<EOF >$dummy.s |
294 | - .data |
295 | -\$Lformat: |
296 | - .byte 37,100,45,37,120,10,0 # "%d-%x\n" |
297 | - |
298 | - .text |
299 | - .globl main |
300 | - .align 4 |
301 | - .ent main |
302 | -main: |
303 | - .frame \$30,16,\$26,0 |
304 | - ldgp \$29,0(\$27) |
305 | - .prologue 1 |
306 | - .long 0x47e03d80 # implver \$0 |
307 | - lda \$2,-1 |
308 | - .long 0x47e20c21 # amask \$2,\$1 |
309 | - lda \$16,\$Lformat |
310 | - mov \$0,\$17 |
311 | - not \$1,\$18 |
312 | - jsr \$26,printf |
313 | - ldgp \$29,0(\$26) |
314 | - mov 0,\$16 |
315 | - jsr \$26,exit |
316 | - .end main |
317 | -EOF |
318 | - eval $set_cc_for_build |
319 | - $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null |
320 | - if test "$?" = 0 ; then |
321 | - case `./$dummy` in |
322 | - 0-0) |
323 | - UNAME_MACHINE="alpha" |
324 | - ;; |
325 | - 1-0) |
326 | - UNAME_MACHINE="alphaev5" |
327 | - ;; |
328 | - 1-1) |
329 | - UNAME_MACHINE="alphaev56" |
330 | - ;; |
331 | - 1-101) |
332 | - UNAME_MACHINE="alphapca56" |
333 | - ;; |
334 | - 2-303) |
335 | - UNAME_MACHINE="alphaev6" |
336 | - ;; |
337 | - 2-307) |
338 | - UNAME_MACHINE="alphaev67" |
339 | - ;; |
340 | - 2-1307) |
341 | - UNAME_MACHINE="alphaev68" |
342 | - ;; |
343 | - esac |
344 | - fi |
345 | - rm -f $dummy.s $dummy |
346 | - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
347 | - exit 0 ;; |
348 | + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
349 | + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. |
350 | + exitcode=$? |
351 | + trap '' 0 |
352 | + exit $exitcode ;; |
353 | Alpha\ *:Windows_NT*:*) |
354 | # How do we know it's Interix rather than the generic POSIX subsystem? |
355 | # Should we change UNAME_MACHINE based on the output of uname instead |
356 | # of the specific Alpha model? |
357 | echo alpha-pc-interix |
358 | - exit 0 ;; |
359 | + exit ;; |
360 | 21064:Windows_NT:50:3) |
361 | echo alpha-dec-winnt3.5 |
362 | - exit 0 ;; |
363 | + exit ;; |
364 | Amiga*:UNIX_System_V:4.0:*) |
365 | echo m68k-unknown-sysv4 |
366 | - exit 0;; |
367 | + exit ;; |
368 | *:[Aa]miga[Oo][Ss]:*:*) |
369 | echo ${UNAME_MACHINE}-unknown-amigaos |
370 | - exit 0 ;; |
371 | + exit ;; |
372 | *:[Mm]orph[Oo][Ss]:*:*) |
373 | echo ${UNAME_MACHINE}-unknown-morphos |
374 | - exit 0 ;; |
375 | + exit ;; |
376 | *:OS/390:*:*) |
377 | echo i370-ibm-openedition |
378 | - exit 0 ;; |
379 | + exit ;; |
380 | + *:z/VM:*:*) |
381 | + echo s390-ibm-zvmoe |
382 | + exit ;; |
383 | + *:OS400:*:*) |
384 | + echo powerpc-ibm-os400 |
385 | + exit ;; |
386 | arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) |
387 | echo arm-acorn-riscix${UNAME_RELEASE} |
388 | - exit 0;; |
389 | + exit ;; |
390 | + arm:riscos:*:*|arm:RISCOS:*:*) |
391 | + echo arm-unknown-riscos |
392 | + exit ;; |
393 | SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) |
394 | echo hppa1.1-hitachi-hiuxmpp |
395 | - exit 0;; |
396 | + exit ;; |
397 | Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) |
398 | # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. |
399 | if test "`(/bin/universe) 2>/dev/null`" = att ; then |
400 | @@ -309,25 +315,51 @@ |
401 | else |
402 | echo pyramid-pyramid-bsd |
403 | fi |
404 | - exit 0 ;; |
405 | + exit ;; |
406 | NILE*:*:*:dcosx) |
407 | echo pyramid-pyramid-svr4 |
408 | - exit 0 ;; |
409 | + exit ;; |
410 | + DRS?6000:unix:4.0:6*) |
411 | + echo sparc-icl-nx6 |
412 | + exit ;; |
413 | + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) |
414 | + case `/usr/bin/uname -p` in |
415 | + sparc) echo sparc-icl-nx7; exit ;; |
416 | + esac ;; |
417 | + s390x:SunOS:*:*) |
418 | + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
419 | + exit ;; |
420 | sun4H:SunOS:5.*:*) |
421 | echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
422 | - exit 0 ;; |
423 | + exit ;; |
424 | sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) |
425 | echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
426 | - exit 0 ;; |
427 | - i86pc:SunOS:5.*:*) |
428 | - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
429 | - exit 0 ;; |
430 | + exit ;; |
431 | + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) |
432 | + echo i386-pc-auroraux${UNAME_RELEASE} |
433 | + exit ;; |
434 | + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) |
435 | + eval $set_cc_for_build |
436 | + SUN_ARCH="i386" |
437 | + # If there is a compiler, see if it is configured for 64-bit objects. |
438 | + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. |
439 | + # This test works for both compilers. |
440 | + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then |
441 | + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ |
442 | + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ |
443 | + grep IS_64BIT_ARCH >/dev/null |
444 | + then |
445 | + SUN_ARCH="x86_64" |
446 | + fi |
447 | + fi |
448 | + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
449 | + exit ;; |
450 | sun4*:SunOS:6*:*) |
451 | # According to config.sub, this is the proper way to canonicalize |
452 | # SunOS6. Hard to guess exactly what SunOS6 will be like, but |
453 | # it's likely to be more like Solaris than SunOS4. |
454 | echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
455 | - exit 0 ;; |
456 | + exit ;; |
457 | sun4*:SunOS:*:*) |
458 | case "`/usr/bin/arch -k`" in |
459 | Series*|S4*) |
460 | @@ -336,10 +368,10 @@ |
461 | esac |
462 | # Japanese Language versions have a version number like `4.1.3-JL'. |
463 | echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` |
464 | - exit 0 ;; |
465 | + exit ;; |
466 | sun3*:SunOS:*:*) |
467 | echo m68k-sun-sunos${UNAME_RELEASE} |
468 | - exit 0 ;; |
469 | + exit ;; |
470 | sun*:*:4.2BSD:*) |
471 | UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` |
472 | test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 |
473 | @@ -351,10 +383,10 @@ |
474 | echo sparc-sun-sunos${UNAME_RELEASE} |
475 | ;; |
476 | esac |
477 | - exit 0 ;; |
478 | + exit ;; |
479 | aushp:SunOS:*:*) |
480 | echo sparc-auspex-sunos${UNAME_RELEASE} |
481 | - exit 0 ;; |
482 | + exit ;; |
483 | # The situation for MiNT is a little confusing. The machine name |
484 | # can be virtually everything (everything which is not |
485 | # "atarist" or "atariste" at least should have a processor |
486 | @@ -364,38 +396,41 @@ |
487 | # MiNT. But MiNT is downward compatible to TOS, so this should |
488 | # be no problem. |
489 | atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) |
490 | - echo m68k-atari-mint${UNAME_RELEASE} |
491 | - exit 0 ;; |
492 | + echo m68k-atari-mint${UNAME_RELEASE} |
493 | + exit ;; |
494 | atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) |
495 | echo m68k-atari-mint${UNAME_RELEASE} |
496 | - exit 0 ;; |
497 | + exit ;; |
498 | *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) |
499 | - echo m68k-atari-mint${UNAME_RELEASE} |
500 | - exit 0 ;; |
501 | + echo m68k-atari-mint${UNAME_RELEASE} |
502 | + exit ;; |
503 | milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) |
504 | - echo m68k-milan-mint${UNAME_RELEASE} |
505 | - exit 0 ;; |
506 | + echo m68k-milan-mint${UNAME_RELEASE} |
507 | + exit ;; |
508 | hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) |
509 | - echo m68k-hades-mint${UNAME_RELEASE} |
510 | - exit 0 ;; |
511 | + echo m68k-hades-mint${UNAME_RELEASE} |
512 | + exit ;; |
513 | *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) |
514 | - echo m68k-unknown-mint${UNAME_RELEASE} |
515 | - exit 0 ;; |
516 | + echo m68k-unknown-mint${UNAME_RELEASE} |
517 | + exit ;; |
518 | + m68k:machten:*:*) |
519 | + echo m68k-apple-machten${UNAME_RELEASE} |
520 | + exit ;; |
521 | powerpc:machten:*:*) |
522 | echo powerpc-apple-machten${UNAME_RELEASE} |
523 | - exit 0 ;; |
524 | + exit ;; |
525 | RISC*:Mach:*:*) |
526 | echo mips-dec-mach_bsd4.3 |
527 | - exit 0 ;; |
528 | + exit ;; |
529 | RISC*:ULTRIX:*:*) |
530 | echo mips-dec-ultrix${UNAME_RELEASE} |
531 | - exit 0 ;; |
532 | + exit ;; |
533 | VAX*:ULTRIX*:*:*) |
534 | echo vax-dec-ultrix${UNAME_RELEASE} |
535 | - exit 0 ;; |
536 | + exit ;; |
537 | 2020:CLIX:*:* | 2430:CLIX:*:*) |
538 | echo clipper-intergraph-clix${UNAME_RELEASE} |
539 | - exit 0 ;; |
540 | + exit ;; |
541 | mips:*:*:UMIPS | mips:*:*:RISCos) |
542 | eval $set_cc_for_build |
543 | sed 's/^ //' << EOF >$dummy.c |
544 | @@ -419,30 +454,36 @@ |
545 | exit (-1); |
546 | } |
547 | EOF |
548 | - $CC_FOR_BUILD $dummy.c -o $dummy \ |
549 | - && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ |
550 | - && rm -f $dummy.c $dummy && exit 0 |
551 | - rm -f $dummy.c $dummy |
552 | + $CC_FOR_BUILD -o $dummy $dummy.c && |
553 | + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && |
554 | + SYSTEM_NAME=`$dummy $dummyarg` && |
555 | + { echo "$SYSTEM_NAME"; exit; } |
556 | echo mips-mips-riscos${UNAME_RELEASE} |
557 | - exit 0 ;; |
558 | + exit ;; |
559 | Motorola:PowerMAX_OS:*:*) |
560 | echo powerpc-motorola-powermax |
561 | - exit 0 ;; |
562 | + exit ;; |
563 | + Motorola:*:4.3:PL8-*) |
564 | + echo powerpc-harris-powermax |
565 | + exit ;; |
566 | + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) |
567 | + echo powerpc-harris-powermax |
568 | + exit ;; |
569 | Night_Hawk:Power_UNIX:*:*) |
570 | echo powerpc-harris-powerunix |
571 | - exit 0 ;; |
572 | + exit ;; |
573 | m88k:CX/UX:7*:*) |
574 | echo m88k-harris-cxux7 |
575 | - exit 0 ;; |
576 | + exit ;; |
577 | m88k:*:4*:R4*) |
578 | echo m88k-motorola-sysv4 |
579 | - exit 0 ;; |
580 | + exit ;; |
581 | m88k:*:3*:R3*) |
582 | echo m88k-motorola-sysv3 |
583 | - exit 0 ;; |
584 | + exit ;; |
585 | AViiON:dgux:*:*) |
586 | - # DG/UX returns AViiON for all architectures |
587 | - UNAME_PROCESSOR=`/usr/bin/uname -p` |
588 | + # DG/UX returns AViiON for all architectures |
589 | + UNAME_PROCESSOR=`/usr/bin/uname -p` |
590 | if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] |
591 | then |
592 | if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ |
593 | @@ -455,29 +496,29 @@ |
594 | else |
595 | echo i586-dg-dgux${UNAME_RELEASE} |
596 | fi |
597 | - exit 0 ;; |
598 | + exit ;; |
599 | M88*:DolphinOS:*:*) # DolphinOS (SVR3) |
600 | echo m88k-dolphin-sysv3 |
601 | - exit 0 ;; |
602 | + exit ;; |
603 | M88*:*:R3*:*) |
604 | # Delta 88k system running SVR3 |
605 | echo m88k-motorola-sysv3 |
606 | - exit 0 ;; |
607 | + exit ;; |
608 | XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) |
609 | echo m88k-tektronix-sysv3 |
610 | - exit 0 ;; |
611 | + exit ;; |
612 | Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) |
613 | echo m68k-tektronix-bsd |
614 | - exit 0 ;; |
615 | + exit ;; |
616 | *:IRIX*:*:*) |
617 | echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` |
618 | - exit 0 ;; |
619 | + exit ;; |
620 | ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. |
621 | - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id |
622 | - exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' |
623 | + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id |
624 | + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' |
625 | i*86:AIX:*:*) |
626 | echo i386-ibm-aix |
627 | - exit 0 ;; |
628 | + exit ;; |
629 | ia64:AIX:*:*) |
630 | if [ -x /usr/bin/oslevel ] ; then |
631 | IBM_REV=`/usr/bin/oslevel` |
632 | @@ -485,7 +526,7 @@ |
633 | IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} |
634 | fi |
635 | echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} |
636 | - exit 0 ;; |
637 | + exit ;; |
638 | *:AIX:2:3) |
639 | if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then |
640 | eval $set_cc_for_build |
641 | @@ -500,16 +541,19 @@ |
642 | exit(0); |
643 | } |
644 | EOF |
645 | - $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 |
646 | - rm -f $dummy.c $dummy |
647 | - echo rs6000-ibm-aix3.2.5 |
648 | + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` |
649 | + then |
650 | + echo "$SYSTEM_NAME" |
651 | + else |
652 | + echo rs6000-ibm-aix3.2.5 |
653 | + fi |
654 | elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then |
655 | echo rs6000-ibm-aix3.2.4 |
656 | else |
657 | echo rs6000-ibm-aix3.2 |
658 | fi |
659 | - exit 0 ;; |
660 | - *:AIX:*:[45]) |
661 | + exit ;; |
662 | + *:AIX:*:[4567]) |
663 | IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` |
664 | if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then |
665 | IBM_ARCH=rs6000 |
666 | @@ -522,28 +566,28 @@ |
667 | IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} |
668 | fi |
669 | echo ${IBM_ARCH}-ibm-aix${IBM_REV} |
670 | - exit 0 ;; |
671 | + exit ;; |
672 | *:AIX:*:*) |
673 | echo rs6000-ibm-aix |
674 | - exit 0 ;; |
675 | + exit ;; |
676 | ibmrt:4.4BSD:*|romp-ibm:BSD:*) |
677 | echo romp-ibm-bsd4.4 |
678 | - exit 0 ;; |
679 | + exit ;; |
680 | ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and |
681 | echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to |
682 | - exit 0 ;; # report: romp-ibm BSD 4.3 |
683 | + exit ;; # report: romp-ibm BSD 4.3 |
684 | *:BOSX:*:*) |
685 | echo rs6000-bull-bosx |
686 | - exit 0 ;; |
687 | + exit ;; |
688 | DPX/2?00:B.O.S.:*:*) |
689 | echo m68k-bull-sysv3 |
690 | - exit 0 ;; |
691 | + exit ;; |
692 | 9000/[34]??:4.3bsd:1.*:*) |
693 | echo m68k-hp-bsd |
694 | - exit 0 ;; |
695 | + exit ;; |
696 | hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) |
697 | echo m68k-hp-bsd4.4 |
698 | - exit 0 ;; |
699 | + exit ;; |
700 | 9000/[34678]??:HP-UX:*:*) |
701 | HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` |
702 | case "${UNAME_MACHINE}" in |
703 | @@ -552,64 +596,84 @@ |
704 | 9000/[678][0-9][0-9]) |
705 | if [ -x /usr/bin/getconf ]; then |
706 | sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` |
707 | - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` |
708 | - case "${sc_cpu_version}" in |
709 | - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 |
710 | - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 |
711 | - 532) # CPU_PA_RISC2_0 |
712 | - case "${sc_kernel_bits}" in |
713 | - 32) HP_ARCH="hppa2.0n" ;; |
714 | - 64) HP_ARCH="hppa2.0w" ;; |
715 | + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` |
716 | + case "${sc_cpu_version}" in |
717 | + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 |
718 | + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 |
719 | + 532) # CPU_PA_RISC2_0 |
720 | + case "${sc_kernel_bits}" in |
721 | + 32) HP_ARCH="hppa2.0n" ;; |
722 | + 64) HP_ARCH="hppa2.0w" ;; |
723 | '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 |
724 | - esac ;; |
725 | - esac |
726 | + esac ;; |
727 | + esac |
728 | fi |
729 | if [ "${HP_ARCH}" = "" ]; then |
730 | eval $set_cc_for_build |
731 | - sed 's/^ //' << EOF >$dummy.c |
732 | - |
733 | - #define _HPUX_SOURCE |
734 | - #include <stdlib.h> |
735 | - #include <unistd.h> |
736 | - |
737 | - int main () |
738 | - { |
739 | - #if defined(_SC_KERNEL_BITS) |
740 | - long bits = sysconf(_SC_KERNEL_BITS); |
741 | - #endif |
742 | - long cpu = sysconf (_SC_CPU_VERSION); |
743 | - |
744 | - switch (cpu) |
745 | - { |
746 | - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; |
747 | - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; |
748 | - case CPU_PA_RISC2_0: |
749 | - #if defined(_SC_KERNEL_BITS) |
750 | - switch (bits) |
751 | - { |
752 | - case 64: puts ("hppa2.0w"); break; |
753 | - case 32: puts ("hppa2.0n"); break; |
754 | - default: puts ("hppa2.0"); break; |
755 | - } break; |
756 | - #else /* !defined(_SC_KERNEL_BITS) */ |
757 | - puts ("hppa2.0"); break; |
758 | - #endif |
759 | - default: puts ("hppa1.0"); break; |
760 | - } |
761 | - exit (0); |
762 | - } |
763 | + sed 's/^ //' << EOF >$dummy.c |
764 | + |
765 | + #define _HPUX_SOURCE |
766 | + #include <stdlib.h> |
767 | + #include <unistd.h> |
768 | + |
769 | + int main () |
770 | + { |
771 | + #if defined(_SC_KERNEL_BITS) |
772 | + long bits = sysconf(_SC_KERNEL_BITS); |
773 | + #endif |
774 | + long cpu = sysconf (_SC_CPU_VERSION); |
775 | + |
776 | + switch (cpu) |
777 | + { |
778 | + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; |
779 | + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; |
780 | + case CPU_PA_RISC2_0: |
781 | + #if defined(_SC_KERNEL_BITS) |
782 | + switch (bits) |
783 | + { |
784 | + case 64: puts ("hppa2.0w"); break; |
785 | + case 32: puts ("hppa2.0n"); break; |
786 | + default: puts ("hppa2.0"); break; |
787 | + } break; |
788 | + #else /* !defined(_SC_KERNEL_BITS) */ |
789 | + puts ("hppa2.0"); break; |
790 | + #endif |
791 | + default: puts ("hppa1.0"); break; |
792 | + } |
793 | + exit (0); |
794 | + } |
795 | EOF |
796 | - (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy` |
797 | - if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi |
798 | - rm -f $dummy.c $dummy |
799 | + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` |
800 | + test -z "$HP_ARCH" && HP_ARCH=hppa |
801 | fi ;; |
802 | esac |
803 | + if [ ${HP_ARCH} = "hppa2.0w" ] |
804 | + then |
805 | + eval $set_cc_for_build |
806 | + |
807 | + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating |
808 | + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler |
809 | + # generating 64-bit code. GNU and HP use different nomenclature: |
810 | + # |
811 | + # $ CC_FOR_BUILD=cc ./config.guess |
812 | + # => hppa2.0w-hp-hpux11.23 |
813 | + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess |
814 | + # => hppa64-hp-hpux11.23 |
815 | + |
816 | + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | |
817 | + grep -q __LP64__ |
818 | + then |
819 | + HP_ARCH="hppa2.0w" |
820 | + else |
821 | + HP_ARCH="hppa64" |
822 | + fi |
823 | + fi |
824 | echo ${HP_ARCH}-hp-hpux${HPUX_REV} |
825 | - exit 0 ;; |
826 | + exit ;; |
827 | ia64:HP-UX:*:*) |
828 | HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` |
829 | echo ia64-hp-hpux${HPUX_REV} |
830 | - exit 0 ;; |
831 | + exit ;; |
832 | 3050*:HI-UX:*:*) |
833 | eval $set_cc_for_build |
834 | sed 's/^ //' << EOF >$dummy.c |
835 | @@ -637,160 +701,173 @@ |
836 | exit (0); |
837 | } |
838 | EOF |
839 | - $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 |
840 | - rm -f $dummy.c $dummy |
841 | + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && |
842 | + { echo "$SYSTEM_NAME"; exit; } |
843 | echo unknown-hitachi-hiuxwe2 |
844 | - exit 0 ;; |
845 | + exit ;; |
846 | 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) |
847 | echo hppa1.1-hp-bsd |
848 | - exit 0 ;; |
849 | + exit ;; |
850 | 9000/8??:4.3bsd:*:*) |
851 | echo hppa1.0-hp-bsd |
852 | - exit 0 ;; |
853 | + exit ;; |
854 | *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) |
855 | echo hppa1.0-hp-mpeix |
856 | - exit 0 ;; |
857 | + exit ;; |
858 | hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) |
859 | echo hppa1.1-hp-osf |
860 | - exit 0 ;; |
861 | + exit ;; |
862 | hp8??:OSF1:*:*) |
863 | echo hppa1.0-hp-osf |
864 | - exit 0 ;; |
865 | + exit ;; |
866 | i*86:OSF1:*:*) |
867 | if [ -x /usr/sbin/sysversion ] ; then |
868 | echo ${UNAME_MACHINE}-unknown-osf1mk |
869 | else |
870 | echo ${UNAME_MACHINE}-unknown-osf1 |
871 | fi |
872 | - exit 0 ;; |
873 | + exit ;; |
874 | parisc*:Lites*:*:*) |
875 | echo hppa1.1-hp-lites |
876 | - exit 0 ;; |
877 | + exit ;; |
878 | C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) |
879 | echo c1-convex-bsd |
880 | - exit 0 ;; |
881 | + exit ;; |
882 | C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) |
883 | if getsysinfo -f scalar_acc |
884 | then echo c32-convex-bsd |
885 | else echo c2-convex-bsd |
886 | fi |
887 | - exit 0 ;; |
888 | + exit ;; |
889 | C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) |
890 | echo c34-convex-bsd |
891 | - exit 0 ;; |
892 | + exit ;; |
893 | C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) |
894 | echo c38-convex-bsd |
895 | - exit 0 ;; |
896 | + exit ;; |
897 | C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) |
898 | echo c4-convex-bsd |
899 | - exit 0 ;; |
900 | + exit ;; |
901 | CRAY*Y-MP:*:*:*) |
902 | echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
903 | - exit 0 ;; |
904 | + exit ;; |
905 | CRAY*[A-Z]90:*:*:*) |
906 | echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ |
907 | | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ |
908 | -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ |
909 | -e 's/\.[^.]*$/.X/' |
910 | - exit 0 ;; |
911 | + exit ;; |
912 | CRAY*TS:*:*:*) |
913 | echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
914 | - exit 0 ;; |
915 | - CRAY*T3D:*:*:*) |
916 | - echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
917 | - exit 0 ;; |
918 | + exit ;; |
919 | CRAY*T3E:*:*:*) |
920 | echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
921 | - exit 0 ;; |
922 | + exit ;; |
923 | CRAY*SV1:*:*:*) |
924 | echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
925 | - exit 0 ;; |
926 | + exit ;; |
927 | + *:UNICOS/mp:*:*) |
928 | + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
929 | + exit ;; |
930 | F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) |
931 | FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
932 | - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
933 | - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` |
934 | - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
935 | - exit 0 ;; |
936 | + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
937 | + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` |
938 | + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
939 | + exit ;; |
940 | + 5000:UNIX_System_V:4.*:*) |
941 | + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
942 | + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` |
943 | + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
944 | + exit ;; |
945 | i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) |
946 | echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} |
947 | - exit 0 ;; |
948 | + exit ;; |
949 | sparc*:BSD/OS:*:*) |
950 | echo sparc-unknown-bsdi${UNAME_RELEASE} |
951 | - exit 0 ;; |
952 | + exit ;; |
953 | *:BSD/OS:*:*) |
954 | echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} |
955 | - exit 0 ;; |
956 | + exit ;; |
957 | *:FreeBSD:*:*) |
958 | - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` |
959 | - exit 0 ;; |
960 | + UNAME_PROCESSOR=`/usr/bin/uname -p` |
961 | + case ${UNAME_PROCESSOR} in |
962 | + amd64) |
963 | + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
964 | + *) |
965 | + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
966 | + esac |
967 | + exit ;; |
968 | i*:CYGWIN*:*) |
969 | echo ${UNAME_MACHINE}-pc-cygwin |
970 | - exit 0 ;; |
971 | - i*:MINGW*:*) |
972 | + exit ;; |
973 | + *:MINGW*:*) |
974 | echo ${UNAME_MACHINE}-pc-mingw32 |
975 | - exit 0 ;; |
976 | + exit ;; |
977 | + i*:MSYS*:*) |
978 | + echo ${UNAME_MACHINE}-pc-msys |
979 | + exit ;; |
980 | + i*:windows32*:*) |
981 | + # uname -m includes "-pc" on this system. |
982 | + echo ${UNAME_MACHINE}-mingw32 |
983 | + exit ;; |
984 | i*:PW*:*) |
985 | echo ${UNAME_MACHINE}-pc-pw32 |
986 | - exit 0 ;; |
987 | - x86:Interix*:3*) |
988 | - echo i386-pc-interix3 |
989 | - exit 0 ;; |
990 | + exit ;; |
991 | + *:Interix*:*) |
992 | + case ${UNAME_MACHINE} in |
993 | + x86) |
994 | + echo i586-pc-interix${UNAME_RELEASE} |
995 | + exit ;; |
996 | + authenticamd | genuineintel | EM64T) |
997 | + echo x86_64-unknown-interix${UNAME_RELEASE} |
998 | + exit ;; |
999 | + IA64) |
1000 | + echo ia64-unknown-interix${UNAME_RELEASE} |
1001 | + exit ;; |
1002 | + esac ;; |
1003 | + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) |
1004 | + echo i${UNAME_MACHINE}-pc-mks |
1005 | + exit ;; |
1006 | + 8664:Windows_NT:*) |
1007 | + echo x86_64-pc-mks |
1008 | + exit ;; |
1009 | i*:Windows_NT*:* | Pentium*:Windows_NT*:*) |
1010 | # How do we know it's Interix rather than the generic POSIX subsystem? |
1011 | # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we |
1012 | # UNAME_MACHINE based on the output of uname instead of i386? |
1013 | - echo i386-pc-interix |
1014 | - exit 0 ;; |
1015 | + echo i586-pc-interix |
1016 | + exit ;; |
1017 | i*:UWIN*:*) |
1018 | echo ${UNAME_MACHINE}-pc-uwin |
1019 | - exit 0 ;; |
1020 | + exit ;; |
1021 | + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) |
1022 | + echo x86_64-unknown-cygwin |
1023 | + exit ;; |
1024 | p*:CYGWIN*:*) |
1025 | echo powerpcle-unknown-cygwin |
1026 | - exit 0 ;; |
1027 | + exit ;; |
1028 | prep*:SunOS:5.*:*) |
1029 | echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
1030 | - exit 0 ;; |
1031 | + exit ;; |
1032 | *:GNU:*:*) |
1033 | + # the GNU system |
1034 | echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` |
1035 | - exit 0 ;; |
1036 | + exit ;; |
1037 | + *:GNU/*:*:*) |
1038 | + # other systems with GNU libc and userland |
1039 | + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu |
1040 | + exit ;; |
1041 | i*86:Minix:*:*) |
1042 | echo ${UNAME_MACHINE}-pc-minix |
1043 | - exit 0 ;; |
1044 | - arm*:Linux:*:*) |
1045 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
1046 | - exit 0 ;; |
1047 | - ia64:Linux:*:*) |
1048 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
1049 | - exit 0 ;; |
1050 | - m68*:Linux:*:*) |
1051 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
1052 | - exit 0 ;; |
1053 | - mips:Linux:*:*) |
1054 | - eval $set_cc_for_build |
1055 | - sed 's/^ //' << EOF >$dummy.c |
1056 | - #undef CPU |
1057 | - #undef mips |
1058 | - #undef mipsel |
1059 | - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) |
1060 | - CPU=mipsel |
1061 | - #else |
1062 | - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) |
1063 | - CPU=mips |
1064 | - #else |
1065 | - CPU= |
1066 | - #endif |
1067 | - #endif |
1068 | -EOF |
1069 | - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` |
1070 | - rm -f $dummy.c |
1071 | - test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0 |
1072 | - ;; |
1073 | - ppc:Linux:*:*) |
1074 | - echo powerpc-unknown-linux-gnu |
1075 | - exit 0 ;; |
1076 | - ppc64:Linux:*:*) |
1077 | - echo powerpc64-unknown-linux-gnu |
1078 | - exit 0 ;; |
1079 | + exit ;; |
1080 | + aarch64:Linux:*:*) |
1081 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1082 | + exit ;; |
1083 | + aarch64_be:Linux:*:*) |
1084 | + UNAME_MACHINE=aarch64_be |
1085 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1086 | + exit ;; |
1087 | alpha:Linux:*:*) |
1088 | case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in |
1089 | EV5) UNAME_MACHINE=alphaev5 ;; |
1090 | @@ -800,11 +877,90 @@ |
1091 | EV6) UNAME_MACHINE=alphaev6 ;; |
1092 | EV67) UNAME_MACHINE=alphaev67 ;; |
1093 | EV68*) UNAME_MACHINE=alphaev68 ;; |
1094 | - esac |
1095 | - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null |
1096 | + esac |
1097 | + objdump --private-headers /bin/sh | grep -q ld.so.1 |
1098 | if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi |
1099 | echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} |
1100 | - exit 0 ;; |
1101 | + exit ;; |
1102 | + arm*:Linux:*:*) |
1103 | + eval $set_cc_for_build |
1104 | + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
1105 | + | grep -q __ARM_EABI__ |
1106 | + then |
1107 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1108 | + else |
1109 | + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ |
1110 | + | grep -q __ARM_PCS_VFP |
1111 | + then |
1112 | + echo ${UNAME_MACHINE}-unknown-linux-gnueabi |
1113 | + else |
1114 | + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf |
1115 | + fi |
1116 | + fi |
1117 | + exit ;; |
1118 | + avr32*:Linux:*:*) |
1119 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1120 | + exit ;; |
1121 | + cris:Linux:*:*) |
1122 | + echo ${UNAME_MACHINE}-axis-linux-gnu |
1123 | + exit ;; |
1124 | + crisv32:Linux:*:*) |
1125 | + echo ${UNAME_MACHINE}-axis-linux-gnu |
1126 | + exit ;; |
1127 | + frv:Linux:*:*) |
1128 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1129 | + exit ;; |
1130 | + hexagon:Linux:*:*) |
1131 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1132 | + exit ;; |
1133 | + i*86:Linux:*:*) |
1134 | + LIBC=gnu |
1135 | + eval $set_cc_for_build |
1136 | + sed 's/^ //' << EOF >$dummy.c |
1137 | + #ifdef __dietlibc__ |
1138 | + LIBC=dietlibc |
1139 | + #endif |
1140 | +EOF |
1141 | + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` |
1142 | + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" |
1143 | + exit ;; |
1144 | + ia64:Linux:*:*) |
1145 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1146 | + exit ;; |
1147 | + m32r*:Linux:*:*) |
1148 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1149 | + exit ;; |
1150 | + m68*:Linux:*:*) |
1151 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1152 | + exit ;; |
1153 | + mips:Linux:*:* | mips64:Linux:*:*) |
1154 | + eval $set_cc_for_build |
1155 | + sed 's/^ //' << EOF >$dummy.c |
1156 | + #undef CPU |
1157 | + #undef ${UNAME_MACHINE} |
1158 | + #undef ${UNAME_MACHINE}el |
1159 | + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) |
1160 | + CPU=${UNAME_MACHINE}el |
1161 | + #else |
1162 | + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) |
1163 | + CPU=${UNAME_MACHINE} |
1164 | + #else |
1165 | + CPU= |
1166 | + #endif |
1167 | + #endif |
1168 | +EOF |
1169 | + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` |
1170 | + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } |
1171 | + ;; |
1172 | + or32:Linux:*:*) |
1173 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1174 | + exit ;; |
1175 | + padre:Linux:*:*) |
1176 | + echo sparc-unknown-linux-gnu |
1177 | + exit ;; |
1178 | + parisc64:Linux:*:* | hppa64:Linux:*:*) |
1179 | + echo hppa64-unknown-linux-gnu |
1180 | + exit ;; |
1181 | parisc:Linux:*:* | hppa:Linux:*:*) |
1182 | # Look for CPU level |
1183 | case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in |
1184 | @@ -812,90 +968,71 @@ |
1185 | PA8*) echo hppa2.0-unknown-linux-gnu ;; |
1186 | *) echo hppa-unknown-linux-gnu ;; |
1187 | esac |
1188 | - exit 0 ;; |
1189 | - parisc64:Linux:*:* | hppa64:Linux:*:*) |
1190 | - echo hppa64-unknown-linux-gnu |
1191 | - exit 0 ;; |
1192 | + exit ;; |
1193 | + ppc64:Linux:*:*) |
1194 | + echo powerpc64-unknown-linux-gnu |
1195 | + exit ;; |
1196 | + ppc:Linux:*:*) |
1197 | + echo powerpc-unknown-linux-gnu |
1198 | + exit ;; |
1199 | s390:Linux:*:* | s390x:Linux:*:*) |
1200 | echo ${UNAME_MACHINE}-ibm-linux |
1201 | - exit 0 ;; |
1202 | + exit ;; |
1203 | + sh64*:Linux:*:*) |
1204 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1205 | + exit ;; |
1206 | sh*:Linux:*:*) |
1207 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
1208 | - exit 0 ;; |
1209 | + exit ;; |
1210 | sparc:Linux:*:* | sparc64:Linux:*:*) |
1211 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
1212 | - exit 0 ;; |
1213 | + exit ;; |
1214 | + tile*:Linux:*:*) |
1215 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1216 | + exit ;; |
1217 | + vax:Linux:*:*) |
1218 | + echo ${UNAME_MACHINE}-dec-linux-gnu |
1219 | + exit ;; |
1220 | x86_64:Linux:*:*) |
1221 | - echo x86_64-unknown-linux-gnu |
1222 | - exit 0 ;; |
1223 | - i*86:Linux:*:*) |
1224 | - # The BFD linker knows what the default object file format is, so |
1225 | - # first see if it will tell us. cd to the root directory to prevent |
1226 | - # problems with other programs or directories called `ld' in the path. |
1227 | - # Set LC_ALL=C to ensure ld outputs messages in English. |
1228 | - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ |
1229 | - | sed -ne '/supported targets:/!d |
1230 | - s/[ ][ ]*/ /g |
1231 | - s/.*supported targets: *// |
1232 | - s/ .*// |
1233 | - p'` |
1234 | - case "$ld_supported_targets" in |
1235 | - elf32-i386) |
1236 | - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" |
1237 | - ;; |
1238 | - a.out-i386-linux) |
1239 | - echo "${UNAME_MACHINE}-pc-linux-gnuaout" |
1240 | - exit 0 ;; |
1241 | - coff-i386) |
1242 | - echo "${UNAME_MACHINE}-pc-linux-gnucoff" |
1243 | - exit 0 ;; |
1244 | - "") |
1245 | - # Either a pre-BFD a.out linker (linux-gnuoldld) or |
1246 | - # one that does not give us useful --help. |
1247 | - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" |
1248 | - exit 0 ;; |
1249 | - esac |
1250 | - # Determine whether the default compiler is a.out or elf |
1251 | - eval $set_cc_for_build |
1252 | - sed 's/^ //' << EOF >$dummy.c |
1253 | - #include <features.h> |
1254 | - #ifdef __ELF__ |
1255 | - # ifdef __GLIBC__ |
1256 | - # if __GLIBC__ >= 2 |
1257 | - LIBC=gnu |
1258 | - # else |
1259 | - LIBC=gnulibc1 |
1260 | - # endif |
1261 | - # else |
1262 | - LIBC=gnulibc1 |
1263 | - # endif |
1264 | - #else |
1265 | - #ifdef __INTEL_COMPILER |
1266 | - LIBC=gnu |
1267 | - #else |
1268 | - LIBC=gnuaout |
1269 | - #endif |
1270 | - #endif |
1271 | -EOF |
1272 | - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` |
1273 | - rm -f $dummy.c |
1274 | - test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 |
1275 | - test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 |
1276 | - ;; |
1277 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1278 | + exit ;; |
1279 | + xtensa*:Linux:*:*) |
1280 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1281 | + exit ;; |
1282 | i*86:DYNIX/ptx:4*:*) |
1283 | # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. |
1284 | # earlier versions are messed up and put the nodename in both |
1285 | # sysname and nodename. |
1286 | echo i386-sequent-sysv4 |
1287 | - exit 0 ;; |
1288 | + exit ;; |
1289 | i*86:UNIX_SV:4.2MP:2.*) |
1290 | - # Unixware is an offshoot of SVR4, but it has its own version |
1291 | - # number series starting with 2... |
1292 | - # I am not positive that other SVR4 systems won't match this, |
1293 | + # Unixware is an offshoot of SVR4, but it has its own version |
1294 | + # number series starting with 2... |
1295 | + # I am not positive that other SVR4 systems won't match this, |
1296 | # I just have to hope. -- rms. |
1297 | - # Use sysv4.2uw... so that sysv4* matches it. |
1298 | + # Use sysv4.2uw... so that sysv4* matches it. |
1299 | echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} |
1300 | - exit 0 ;; |
1301 | + exit ;; |
1302 | + i*86:OS/2:*:*) |
1303 | + # If we were able to find `uname', then EMX Unix compatibility |
1304 | + # is probably installed. |
1305 | + echo ${UNAME_MACHINE}-pc-os2-emx |
1306 | + exit ;; |
1307 | + i*86:XTS-300:*:STOP) |
1308 | + echo ${UNAME_MACHINE}-unknown-stop |
1309 | + exit ;; |
1310 | + i*86:atheos:*:*) |
1311 | + echo ${UNAME_MACHINE}-unknown-atheos |
1312 | + exit ;; |
1313 | + i*86:syllable:*:*) |
1314 | + echo ${UNAME_MACHINE}-pc-syllable |
1315 | + exit ;; |
1316 | + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) |
1317 | + echo i386-unknown-lynxos${UNAME_RELEASE} |
1318 | + exit ;; |
1319 | + i*86:*DOS:*:*) |
1320 | + echo ${UNAME_MACHINE}-pc-msdosdjgpp |
1321 | + exit ;; |
1322 | i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) |
1323 | UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` |
1324 | if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then |
1325 | @@ -903,99 +1040,113 @@ |
1326 | else |
1327 | echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} |
1328 | fi |
1329 | - exit 0 ;; |
1330 | - i*86:*:5:[78]*) |
1331 | + exit ;; |
1332 | + i*86:*:5:[678]*) |
1333 | + # UnixWare 7.x, OpenUNIX and OpenServer 6. |
1334 | case `/bin/uname -X | grep "^Machine"` in |
1335 | *486*) UNAME_MACHINE=i486 ;; |
1336 | *Pentium) UNAME_MACHINE=i586 ;; |
1337 | *Pent*|*Celeron) UNAME_MACHINE=i686 ;; |
1338 | esac |
1339 | echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} |
1340 | - exit 0 ;; |
1341 | + exit ;; |
1342 | i*86:*:3.2:*) |
1343 | if test -f /usr/options/cb.name; then |
1344 | UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` |
1345 | echo ${UNAME_MACHINE}-pc-isc$UNAME_REL |
1346 | elif /bin/uname -X 2>/dev/null >/dev/null ; then |
1347 | - UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` |
1348 | - (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 |
1349 | - (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ |
1350 | + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` |
1351 | + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 |
1352 | + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ |
1353 | && UNAME_MACHINE=i586 |
1354 | - (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ |
1355 | + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ |
1356 | && UNAME_MACHINE=i686 |
1357 | - (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ |
1358 | + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ |
1359 | && UNAME_MACHINE=i686 |
1360 | echo ${UNAME_MACHINE}-pc-sco$UNAME_REL |
1361 | else |
1362 | echo ${UNAME_MACHINE}-pc-sysv32 |
1363 | fi |
1364 | - exit 0 ;; |
1365 | - i*86:*DOS:*:*) |
1366 | - echo ${UNAME_MACHINE}-pc-msdosdjgpp |
1367 | - exit 0 ;; |
1368 | + exit ;; |
1369 | pc:*:*:*) |
1370 | # Left here for compatibility: |
1371 | - # uname -m prints for DJGPP always 'pc', but it prints nothing about |
1372 | - # the processor, so we play safe by assuming i386. |
1373 | - echo i386-pc-msdosdjgpp |
1374 | - exit 0 ;; |
1375 | + # uname -m prints for DJGPP always 'pc', but it prints nothing about |
1376 | + # the processor, so we play safe by assuming i586. |
1377 | + # Note: whatever this is, it MUST be the same as what config.sub |
1378 | + # prints for the "djgpp" host, or else GDB configury will decide that |
1379 | + # this is a cross-build. |
1380 | + echo i586-pc-msdosdjgpp |
1381 | + exit ;; |
1382 | Intel:Mach:3*:*) |
1383 | echo i386-pc-mach3 |
1384 | - exit 0 ;; |
1385 | + exit ;; |
1386 | paragon:*:*:*) |
1387 | echo i860-intel-osf1 |
1388 | - exit 0 ;; |
1389 | + exit ;; |
1390 | i860:*:4.*:*) # i860-SVR4 |
1391 | if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then |
1392 | echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 |
1393 | else # Add other i860-SVR4 vendors below as they are discovered. |
1394 | echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 |
1395 | fi |
1396 | - exit 0 ;; |
1397 | + exit ;; |
1398 | mini*:CTIX:SYS*5:*) |
1399 | # "miniframe" |
1400 | echo m68010-convergent-sysv |
1401 | - exit 0 ;; |
1402 | - M68*:*:R3V[567]*:*) |
1403 | - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; |
1404 | - 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0) |
1405 | + exit ;; |
1406 | + mc68k:UNIX:SYSTEM5:3.51m) |
1407 | + echo m68k-convergent-sysv |
1408 | + exit ;; |
1409 | + M680?0:D-NIX:5.3:*) |
1410 | + echo m68k-diab-dnix |
1411 | + exit ;; |
1412 | + M68*:*:R3V[5678]*:*) |
1413 | + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; |
1414 | + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) |
1415 | OS_REL='' |
1416 | test -r /etc/.relid \ |
1417 | && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` |
1418 | /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
1419 | - && echo i486-ncr-sysv4.3${OS_REL} && exit 0 |
1420 | + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } |
1421 | /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ |
1422 | - && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; |
1423 | + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; |
1424 | 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) |
1425 | - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
1426 | - && echo i486-ncr-sysv4 && exit 0 ;; |
1427 | + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
1428 | + && { echo i486-ncr-sysv4; exit; } ;; |
1429 | + NCR*:*:4.2:* | MPRAS*:*:4.2:*) |
1430 | + OS_REL='.3' |
1431 | + test -r /etc/.relid \ |
1432 | + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` |
1433 | + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
1434 | + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } |
1435 | + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ |
1436 | + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } |
1437 | + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ |
1438 | + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; |
1439 | m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) |
1440 | echo m68k-unknown-lynxos${UNAME_RELEASE} |
1441 | - exit 0 ;; |
1442 | + exit ;; |
1443 | mc68030:UNIX_System_V:4.*:*) |
1444 | echo m68k-atari-sysv4 |
1445 | - exit 0 ;; |
1446 | - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) |
1447 | - echo i386-unknown-lynxos${UNAME_RELEASE} |
1448 | - exit 0 ;; |
1449 | + exit ;; |
1450 | TSUNAMI:LynxOS:2.*:*) |
1451 | echo sparc-unknown-lynxos${UNAME_RELEASE} |
1452 | - exit 0 ;; |
1453 | + exit ;; |
1454 | rs6000:LynxOS:2.*:*) |
1455 | echo rs6000-unknown-lynxos${UNAME_RELEASE} |
1456 | - exit 0 ;; |
1457 | - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) |
1458 | + exit ;; |
1459 | + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) |
1460 | echo powerpc-unknown-lynxos${UNAME_RELEASE} |
1461 | - exit 0 ;; |
1462 | + exit ;; |
1463 | SM[BE]S:UNIX_SV:*:*) |
1464 | echo mips-dde-sysv${UNAME_RELEASE} |
1465 | - exit 0 ;; |
1466 | + exit ;; |
1467 | RM*:ReliantUNIX-*:*:*) |
1468 | echo mips-sni-sysv4 |
1469 | - exit 0 ;; |
1470 | + exit ;; |
1471 | RM*:SINIX-*:*:*) |
1472 | echo mips-sni-sysv4 |
1473 | - exit 0 ;; |
1474 | + exit ;; |
1475 | *:SINIX-*:*:*) |
1476 | if uname -p 2>/dev/null >/dev/null ; then |
1477 | UNAME_MACHINE=`(uname -p) 2>/dev/null` |
1478 | @@ -1003,61 +1154,94 @@ |
1479 | else |
1480 | echo ns32k-sni-sysv |
1481 | fi |
1482 | - exit 0 ;; |
1483 | - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort |
1484 | - # says <Richard.M.Bartel@ccMail.Census.GOV> |
1485 | - echo i586-unisys-sysv4 |
1486 | - exit 0 ;; |
1487 | + exit ;; |
1488 | + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort |
1489 | + # says <Richard.M.Bartel@ccMail.Census.GOV> |
1490 | + echo i586-unisys-sysv4 |
1491 | + exit ;; |
1492 | *:UNIX_System_V:4*:FTX*) |
1493 | # From Gerald Hewes <hewes@openmarket.com>. |
1494 | # How about differentiating between stratus architectures? -djm |
1495 | echo hppa1.1-stratus-sysv4 |
1496 | - exit 0 ;; |
1497 | + exit ;; |
1498 | *:*:*:FTX*) |
1499 | # From seanf@swdc.stratus.com. |
1500 | echo i860-stratus-sysv4 |
1501 | - exit 0 ;; |
1502 | + exit ;; |
1503 | + i*86:VOS:*:*) |
1504 | + # From Paul.Green@stratus.com. |
1505 | + echo ${UNAME_MACHINE}-stratus-vos |
1506 | + exit ;; |
1507 | *:VOS:*:*) |
1508 | # From Paul.Green@stratus.com. |
1509 | echo hppa1.1-stratus-vos |
1510 | - exit 0 ;; |
1511 | + exit ;; |
1512 | mc68*:A/UX:*:*) |
1513 | echo m68k-apple-aux${UNAME_RELEASE} |
1514 | - exit 0 ;; |
1515 | + exit ;; |
1516 | news*:NEWS-OS:6*:*) |
1517 | echo mips-sony-newsos6 |
1518 | - exit 0 ;; |
1519 | + exit ;; |
1520 | R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) |
1521 | if [ -d /usr/nec ]; then |
1522 | - echo mips-nec-sysv${UNAME_RELEASE} |
1523 | + echo mips-nec-sysv${UNAME_RELEASE} |
1524 | else |
1525 | - echo mips-unknown-sysv${UNAME_RELEASE} |
1526 | + echo mips-unknown-sysv${UNAME_RELEASE} |
1527 | fi |
1528 | - exit 0 ;; |
1529 | + exit ;; |
1530 | BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. |
1531 | echo powerpc-be-beos |
1532 | - exit 0 ;; |
1533 | + exit ;; |
1534 | BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. |
1535 | echo powerpc-apple-beos |
1536 | - exit 0 ;; |
1537 | + exit ;; |
1538 | BePC:BeOS:*:*) # BeOS running on Intel PC compatible. |
1539 | echo i586-pc-beos |
1540 | - exit 0 ;; |
1541 | + exit ;; |
1542 | + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. |
1543 | + echo i586-pc-haiku |
1544 | + exit ;; |
1545 | SX-4:SUPER-UX:*:*) |
1546 | echo sx4-nec-superux${UNAME_RELEASE} |
1547 | - exit 0 ;; |
1548 | + exit ;; |
1549 | SX-5:SUPER-UX:*:*) |
1550 | echo sx5-nec-superux${UNAME_RELEASE} |
1551 | - exit 0 ;; |
1552 | + exit ;; |
1553 | + SX-6:SUPER-UX:*:*) |
1554 | + echo sx6-nec-superux${UNAME_RELEASE} |
1555 | + exit ;; |
1556 | + SX-7:SUPER-UX:*:*) |
1557 | + echo sx7-nec-superux${UNAME_RELEASE} |
1558 | + exit ;; |
1559 | + SX-8:SUPER-UX:*:*) |
1560 | + echo sx8-nec-superux${UNAME_RELEASE} |
1561 | + exit ;; |
1562 | + SX-8R:SUPER-UX:*:*) |
1563 | + echo sx8r-nec-superux${UNAME_RELEASE} |
1564 | + exit ;; |
1565 | Power*:Rhapsody:*:*) |
1566 | echo powerpc-apple-rhapsody${UNAME_RELEASE} |
1567 | - exit 0 ;; |
1568 | + exit ;; |
1569 | *:Rhapsody:*:*) |
1570 | echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} |
1571 | - exit 0 ;; |
1572 | + exit ;; |
1573 | *:Darwin:*:*) |
1574 | - echo `uname -p`-apple-darwin${UNAME_RELEASE} |
1575 | - exit 0 ;; |
1576 | + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown |
1577 | + case $UNAME_PROCESSOR in |
1578 | + i386) |
1579 | + eval $set_cc_for_build |
1580 | + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then |
1581 | + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ |
1582 | + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ |
1583 | + grep IS_64BIT_ARCH >/dev/null |
1584 | + then |
1585 | + UNAME_PROCESSOR="x86_64" |
1586 | + fi |
1587 | + fi ;; |
1588 | + unknown) UNAME_PROCESSOR=powerpc ;; |
1589 | + esac |
1590 | + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} |
1591 | + exit ;; |
1592 | *:procnto*:*:* | *:QNX:[0123456789]*:*) |
1593 | UNAME_PROCESSOR=`uname -p` |
1594 | if test "$UNAME_PROCESSOR" = "x86"; then |
1595 | @@ -1065,22 +1249,28 @@ |
1596 | UNAME_MACHINE=pc |
1597 | fi |
1598 | echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} |
1599 | - exit 0 ;; |
1600 | + exit ;; |
1601 | *:QNX:*:4*) |
1602 | echo i386-pc-qnx |
1603 | - exit 0 ;; |
1604 | - NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*) |
1605 | + exit ;; |
1606 | + NEO-?:NONSTOP_KERNEL:*:*) |
1607 | + echo neo-tandem-nsk${UNAME_RELEASE} |
1608 | + exit ;; |
1609 | + NSE-?:NONSTOP_KERNEL:*:*) |
1610 | + echo nse-tandem-nsk${UNAME_RELEASE} |
1611 | + exit ;; |
1612 | + NSR-?:NONSTOP_KERNEL:*:*) |
1613 | echo nsr-tandem-nsk${UNAME_RELEASE} |
1614 | - exit 0 ;; |
1615 | + exit ;; |
1616 | *:NonStop-UX:*:*) |
1617 | echo mips-compaq-nonstopux |
1618 | - exit 0 ;; |
1619 | + exit ;; |
1620 | BS2000:POSIX*:*:*) |
1621 | echo bs2000-siemens-sysv |
1622 | - exit 0 ;; |
1623 | + exit ;; |
1624 | DS/*:UNIX_System_V:*:*) |
1625 | echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} |
1626 | - exit 0 ;; |
1627 | + exit ;; |
1628 | *:Plan9:*:*) |
1629 | # "uname -m" is not consistent, so use $cputype instead. 386 |
1630 | # is converted to i386 for consistency with other x86 |
1631 | @@ -1091,36 +1281,53 @@ |
1632 | UNAME_MACHINE="$cputype" |
1633 | fi |
1634 | echo ${UNAME_MACHINE}-unknown-plan9 |
1635 | - exit 0 ;; |
1636 | - i*86:OS/2:*:*) |
1637 | - # If we were able to find `uname', then EMX Unix compatibility |
1638 | - # is probably installed. |
1639 | - echo ${UNAME_MACHINE}-pc-os2-emx |
1640 | - exit 0 ;; |
1641 | + exit ;; |
1642 | *:TOPS-10:*:*) |
1643 | echo pdp10-unknown-tops10 |
1644 | - exit 0 ;; |
1645 | + exit ;; |
1646 | *:TENEX:*:*) |
1647 | echo pdp10-unknown-tenex |
1648 | - exit 0 ;; |
1649 | + exit ;; |
1650 | KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) |
1651 | echo pdp10-dec-tops20 |
1652 | - exit 0 ;; |
1653 | + exit ;; |
1654 | XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) |
1655 | echo pdp10-xkl-tops20 |
1656 | - exit 0 ;; |
1657 | + exit ;; |
1658 | *:TOPS-20:*:*) |
1659 | echo pdp10-unknown-tops20 |
1660 | - exit 0 ;; |
1661 | + exit ;; |
1662 | *:ITS:*:*) |
1663 | echo pdp10-unknown-its |
1664 | - exit 0 ;; |
1665 | - i*86:XTS-300:*:STOP) |
1666 | - echo ${UNAME_MACHINE}-unknown-stop |
1667 | - exit 0 ;; |
1668 | - i*86:atheos:*:*) |
1669 | - echo ${UNAME_MACHINE}-unknown-atheos |
1670 | - exit 0 ;; |
1671 | + exit ;; |
1672 | + SEI:*:*:SEIUX) |
1673 | + echo mips-sei-seiux${UNAME_RELEASE} |
1674 | + exit ;; |
1675 | + *:DragonFly:*:*) |
1676 | + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` |
1677 | + exit ;; |
1678 | + *:*VMS:*:*) |
1679 | + UNAME_MACHINE=`(uname -p) 2>/dev/null` |
1680 | + case "${UNAME_MACHINE}" in |
1681 | + A*) echo alpha-dec-vms ; exit ;; |
1682 | + I*) echo ia64-dec-vms ; exit ;; |
1683 | + V*) echo vax-dec-vms ; exit ;; |
1684 | + esac ;; |
1685 | + *:XENIX:*:SysV) |
1686 | + echo i386-pc-xenix |
1687 | + exit ;; |
1688 | + i*86:skyos:*:*) |
1689 | + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' |
1690 | + exit ;; |
1691 | + i*86:rdos:*:*) |
1692 | + echo ${UNAME_MACHINE}-pc-rdos |
1693 | + exit ;; |
1694 | + i*86:AROS:*:*) |
1695 | + echo ${UNAME_MACHINE}-pc-aros |
1696 | + exit ;; |
1697 | + x86_64:VMkernel:*:*) |
1698 | + echo ${UNAME_MACHINE}-unknown-esx |
1699 | + exit ;; |
1700 | esac |
1701 | |
1702 | #echo '(No uname command or uname output not recognized.)' 1>&2 |
1703 | @@ -1143,16 +1350,16 @@ |
1704 | #include <sys/param.h> |
1705 | printf ("m68k-sony-newsos%s\n", |
1706 | #ifdef NEWSOS4 |
1707 | - "4" |
1708 | + "4" |
1709 | #else |
1710 | - "" |
1711 | + "" |
1712 | #endif |
1713 | - ); exit (0); |
1714 | + ); exit (0); |
1715 | #endif |
1716 | #endif |
1717 | |
1718 | #if defined (__arm) && defined (__acorn) && defined (__unix) |
1719 | - printf ("arm-acorn-riscix"); exit (0); |
1720 | + printf ("arm-acorn-riscix\n"); exit (0); |
1721 | #endif |
1722 | |
1723 | #if defined (hp300) && !defined (hpux) |
1724 | @@ -1241,12 +1448,12 @@ |
1725 | } |
1726 | EOF |
1727 | |
1728 | -$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0 |
1729 | -rm -f $dummy.c $dummy |
1730 | +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && |
1731 | + { echo "$SYSTEM_NAME"; exit; } |
1732 | |
1733 | # Apollos put the system type in the environment. |
1734 | |
1735 | -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } |
1736 | +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } |
1737 | |
1738 | # Convex versions that predate uname can use getsysinfo(1) |
1739 | |
1740 | @@ -1255,22 +1462,22 @@ |
1741 | case `getsysinfo -f cpu_type` in |
1742 | c1*) |
1743 | echo c1-convex-bsd |
1744 | - exit 0 ;; |
1745 | + exit ;; |
1746 | c2*) |
1747 | if getsysinfo -f scalar_acc |
1748 | then echo c32-convex-bsd |
1749 | else echo c2-convex-bsd |
1750 | fi |
1751 | - exit 0 ;; |
1752 | + exit ;; |
1753 | c34*) |
1754 | echo c34-convex-bsd |
1755 | - exit 0 ;; |
1756 | + exit ;; |
1757 | c38*) |
1758 | echo c38-convex-bsd |
1759 | - exit 0 ;; |
1760 | + exit ;; |
1761 | c4*) |
1762 | echo c4-convex-bsd |
1763 | - exit 0 ;; |
1764 | + exit ;; |
1765 | esac |
1766 | fi |
1767 | |
1768 | @@ -1281,7 +1488,9 @@ |
1769 | the operating system you are using. It is advised that you |
1770 | download the most up to date version of the config scripts from |
1771 | |
1772 | - ftp://ftp.gnu.org/pub/gnu/config/ |
1773 | + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD |
1774 | +and |
1775 | + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD |
1776 | |
1777 | If the version you run ($0) is already up to date, please |
1778 | send the following data and any information you think might be |
1779 | |
1780 | === modified file 'config.sub' |
1781 | --- config.sub 2007-11-29 09:29:55 +0000 |
1782 | +++ config.sub 2012-08-17 04:57:18 +0000 |
1783 | @@ -1,9 +1,10 @@ |
1784 | #! /bin/sh |
1785 | # Configuration validation subroutine script. |
1786 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
1787 | -# 2000, 2001, 2002 Free Software Foundation, Inc. |
1788 | +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
1789 | +# 2011, 2012 Free Software Foundation, Inc. |
1790 | |
1791 | -timestamp='2002-03-07' |
1792 | +timestamp='2012-02-10' |
1793 | |
1794 | # This file is (in principle) common to ALL GNU software. |
1795 | # The presence of a machine in this file suggests that SOME GNU software |
1796 | @@ -20,23 +21,25 @@ |
1797 | # GNU General Public License for more details. |
1798 | # |
1799 | # You should have received a copy of the GNU General Public License |
1800 | -# along with this program; if not, write to the Free Software |
1801 | -# Foundation, Inc., 59 Temple Place - Suite 330, |
1802 | -# Boston, MA 02111-1307, USA. |
1803 | - |
1804 | +# along with this program; if not, see <http://www.gnu.org/licenses/>. |
1805 | +# |
1806 | # As a special exception to the GNU General Public License, if you |
1807 | # distribute this file as part of a program that contains a |
1808 | # configuration script generated by Autoconf, you may include it under |
1809 | # the same distribution terms that you use for the rest of that program. |
1810 | |
1811 | + |
1812 | # Please send patches to <config-patches@gnu.org>. Submit a context |
1813 | -# diff and a properly formatted ChangeLog entry. |
1814 | +# diff and a properly formatted GNU ChangeLog entry. |
1815 | # |
1816 | # Configuration subroutine to validate and canonicalize a configuration type. |
1817 | # Supply the specified configuration type as an argument. |
1818 | # If it is invalid, we print an error message on stderr and exit with code 1. |
1819 | # Otherwise, we print the canonical config type on stdout and succeed. |
1820 | |
1821 | +# You can get the latest version of this script from: |
1822 | +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD |
1823 | + |
1824 | # This file is supposed to be the same for all GNU packages |
1825 | # and recognize all the CPU types, system types and aliases |
1826 | # that are meaningful with *any* GNU software. |
1827 | @@ -70,7 +73,8 @@ |
1828 | version="\ |
1829 | GNU config.sub ($timestamp) |
1830 | |
1831 | -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 |
1832 | +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
1833 | +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 |
1834 | Free Software Foundation, Inc. |
1835 | |
1836 | This is free software; see the source for copying conditions. There is NO |
1837 | @@ -83,11 +87,11 @@ |
1838 | while test $# -gt 0 ; do |
1839 | case $1 in |
1840 | --time-stamp | --time* | -t ) |
1841 | - echo "$timestamp" ; exit 0 ;; |
1842 | + echo "$timestamp" ; exit ;; |
1843 | --version | -v ) |
1844 | - echo "$version" ; exit 0 ;; |
1845 | + echo "$version" ; exit ;; |
1846 | --help | --h* | -h ) |
1847 | - echo "$usage"; exit 0 ;; |
1848 | + echo "$usage"; exit ;; |
1849 | -- ) # Stop option processing |
1850 | shift; break ;; |
1851 | - ) # Use stdin as input. |
1852 | @@ -99,7 +103,7 @@ |
1853 | *local*) |
1854 | # First pass through any local machine types. |
1855 | echo $1 |
1856 | - exit 0;; |
1857 | + exit ;; |
1858 | |
1859 | * ) |
1860 | break ;; |
1861 | @@ -118,10 +122,18 @@ |
1862 | # Here we must recognize all the valid KERNEL-OS combinations. |
1863 | maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` |
1864 | case $maybe_os in |
1865 | - nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*) |
1866 | + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ |
1867 | + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ |
1868 | + knetbsd*-gnu* | netbsd*-gnu* | \ |
1869 | + kopensolaris*-gnu* | \ |
1870 | + storm-chaos* | os2-emx* | rtmk-nova*) |
1871 | os=-$maybe_os |
1872 | basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` |
1873 | ;; |
1874 | + android-linux) |
1875 | + os=-linux-android |
1876 | + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown |
1877 | + ;; |
1878 | *) |
1879 | basic_machine=`echo $1 | sed 's/-[^-]*$//'` |
1880 | if [ $basic_machine != $1 ] |
1881 | @@ -144,10 +156,13 @@ |
1882 | -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ |
1883 | -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ |
1884 | -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ |
1885 | - -apple | -axis) |
1886 | + -apple | -axis | -knuth | -cray | -microblaze) |
1887 | os= |
1888 | basic_machine=$1 |
1889 | ;; |
1890 | + -bluegene*) |
1891 | + os=-cnk |
1892 | + ;; |
1893 | -sim | -cisco | -oki | -wec | -winbond) |
1894 | os= |
1895 | basic_machine=$1 |
1896 | @@ -162,13 +177,17 @@ |
1897 | os=-chorusos |
1898 | basic_machine=$1 |
1899 | ;; |
1900 | - -chorusrdb) |
1901 | - os=-chorusrdb |
1902 | + -chorusrdb) |
1903 | + os=-chorusrdb |
1904 | basic_machine=$1 |
1905 | - ;; |
1906 | + ;; |
1907 | -hiux*) |
1908 | os=-hiuxwe2 |
1909 | ;; |
1910 | + -sco6) |
1911 | + os=-sco5v6 |
1912 | + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
1913 | + ;; |
1914 | -sco5) |
1915 | os=-sco3.2v5 |
1916 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
1917 | @@ -185,6 +204,10 @@ |
1918 | # Don't forget version if it is 3.2v4 or newer. |
1919 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
1920 | ;; |
1921 | + -sco5v6*) |
1922 | + # Don't forget version if it is 3.2v4 or newer. |
1923 | + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
1924 | + ;; |
1925 | -sco*) |
1926 | os=-sco3.2v2 |
1927 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
1928 | @@ -226,43 +249,103 @@ |
1929 | # Some are omitted here because they have special meanings below. |
1930 | 1750a | 580 \ |
1931 | | a29k \ |
1932 | + | aarch64 | aarch64_be \ |
1933 | | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ |
1934 | | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ |
1935 | - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ |
1936 | + | am33_2.0 \ |
1937 | + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ |
1938 | + | be32 | be64 \ |
1939 | + | bfin \ |
1940 | | c4x | clipper \ |
1941 | - | d10v | d30v | dsp16xx \ |
1942 | - | fr30 \ |
1943 | + | d10v | d30v | dlx | dsp16xx \ |
1944 | + | epiphany \ |
1945 | + | fido | fr30 | frv \ |
1946 | | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ |
1947 | + | hexagon \ |
1948 | | i370 | i860 | i960 | ia64 \ |
1949 | - | m32r | m68000 | m68k | m88k | mcore \ |
1950 | - | mips | mips16 | mips64 | mips64el | mips64orion | mips64orionel \ |
1951 | - | mips64vr4100 | mips64vr4100el | mips64vr4300 \ |
1952 | - | mips64vr4300el | mips64vr5000 | mips64vr5000el \ |
1953 | - | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \ |
1954 | - | mipsisa32 | mipsisa64 \ |
1955 | + | ip2k | iq2000 \ |
1956 | + | le32 | le64 \ |
1957 | + | lm32 \ |
1958 | + | m32c | m32r | m32rle | m68000 | m68k | m88k \ |
1959 | + | maxq | mb | microblaze | mcore | mep | metag \ |
1960 | + | mips | mipsbe | mipseb | mipsel | mipsle \ |
1961 | + | mips16 \ |
1962 | + | mips64 | mips64el \ |
1963 | + | mips64octeon | mips64octeonel \ |
1964 | + | mips64orion | mips64orionel \ |
1965 | + | mips64r5900 | mips64r5900el \ |
1966 | + | mips64vr | mips64vrel \ |
1967 | + | mips64vr4100 | mips64vr4100el \ |
1968 | + | mips64vr4300 | mips64vr4300el \ |
1969 | + | mips64vr5000 | mips64vr5000el \ |
1970 | + | mips64vr5900 | mips64vr5900el \ |
1971 | + | mipsisa32 | mipsisa32el \ |
1972 | + | mipsisa32r2 | mipsisa32r2el \ |
1973 | + | mipsisa64 | mipsisa64el \ |
1974 | + | mipsisa64r2 | mipsisa64r2el \ |
1975 | + | mipsisa64sb1 | mipsisa64sb1el \ |
1976 | + | mipsisa64sr71k | mipsisa64sr71kel \ |
1977 | + | mipstx39 | mipstx39el \ |
1978 | | mn10200 | mn10300 \ |
1979 | + | moxie \ |
1980 | + | mt \ |
1981 | + | msp430 \ |
1982 | + | nds32 | nds32le | nds32be \ |
1983 | + | nios | nios2 \ |
1984 | | ns16k | ns32k \ |
1985 | - | openrisc | or32 \ |
1986 | + | open8 \ |
1987 | + | or32 \ |
1988 | | pdp10 | pdp11 | pj | pjl \ |
1989 | - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ |
1990 | + | powerpc | powerpc64 | powerpc64le | powerpcle \ |
1991 | | pyramid \ |
1992 | - | sh | sh[34] | sh[34]eb | shbe | shle | sh64 \ |
1993 | - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ |
1994 | - | strongarm \ |
1995 | - | tahoe | thumb | tic80 | tron \ |
1996 | - | v850 | v850e \ |
1997 | + | rl78 | rx \ |
1998 | + | score \ |
1999 | + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ |
2000 | + | sh64 | sh64le \ |
2001 | + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ |
2002 | + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ |
2003 | + | spu \ |
2004 | + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ |
2005 | + | ubicom32 \ |
2006 | + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ |
2007 | | we32k \ |
2008 | - | x86 | xscale | xstormy16 | xtensa \ |
2009 | - | z8k) |
2010 | + | x86 | xc16x | xstormy16 | xtensa \ |
2011 | + | z8k | z80) |
2012 | basic_machine=$basic_machine-unknown |
2013 | ;; |
2014 | - m6811 | m68hc11 | m6812 | m68hc12) |
2015 | - # Motorola 68HC11/12. |
2016 | + c54x) |
2017 | + basic_machine=tic54x-unknown |
2018 | + ;; |
2019 | + c55x) |
2020 | + basic_machine=tic55x-unknown |
2021 | + ;; |
2022 | + c6x) |
2023 | + basic_machine=tic6x-unknown |
2024 | + ;; |
2025 | + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) |
2026 | basic_machine=$basic_machine-unknown |
2027 | os=-none |
2028 | ;; |
2029 | m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) |
2030 | ;; |
2031 | + ms1) |
2032 | + basic_machine=mt-unknown |
2033 | + ;; |
2034 | + |
2035 | + strongarm | thumb | xscale) |
2036 | + basic_machine=arm-unknown |
2037 | + ;; |
2038 | + xgate) |
2039 | + basic_machine=$basic_machine-unknown |
2040 | + os=-none |
2041 | + ;; |
2042 | + xscaleeb) |
2043 | + basic_machine=armeb-unknown |
2044 | + ;; |
2045 | + |
2046 | + xscaleel) |
2047 | + basic_machine=armel-unknown |
2048 | + ;; |
2049 | |
2050 | # We use `pc' rather than `unknown' |
2051 | # because (1) that's what they normally are, and |
2052 | @@ -278,43 +361,80 @@ |
2053 | # Recognize the basic CPU types with company name. |
2054 | 580-* \ |
2055 | | a29k-* \ |
2056 | + | aarch64-* | aarch64_be-* \ |
2057 | | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ |
2058 | | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ |
2059 | | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ |
2060 | - | arm-* | armbe-* | armle-* | armv*-* \ |
2061 | - | avr-* \ |
2062 | - | bs2000-* \ |
2063 | - | c[123]* | c30-* | [cjt]90-* | c54x-* \ |
2064 | - | clipper-* | cydra-* \ |
2065 | - | d10v-* | d30v-* \ |
2066 | + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ |
2067 | + | avr-* | avr32-* \ |
2068 | + | be32-* | be64-* \ |
2069 | + | bfin-* | bs2000-* \ |
2070 | + | c[123]* | c30-* | [cjt]90-* | c4x-* \ |
2071 | + | clipper-* | craynv-* | cydra-* \ |
2072 | + | d10v-* | d30v-* | dlx-* \ |
2073 | | elxsi-* \ |
2074 | - | f30[01]-* | f700-* | fr30-* | fx80-* \ |
2075 | + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ |
2076 | | h8300-* | h8500-* \ |
2077 | | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ |
2078 | + | hexagon-* \ |
2079 | | i*86-* | i860-* | i960-* | ia64-* \ |
2080 | - | m32r-* \ |
2081 | + | ip2k-* | iq2000-* \ |
2082 | + | le32-* | le64-* \ |
2083 | + | lm32-* \ |
2084 | + | m32c-* | m32r-* | m32rle-* \ |
2085 | | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ |
2086 | - | m88110-* | m88k-* | mcore-* \ |
2087 | - | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \ |
2088 | - | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \ |
2089 | - | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \ |
2090 | - | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \ |
2091 | + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ |
2092 | + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ |
2093 | + | mips16-* \ |
2094 | + | mips64-* | mips64el-* \ |
2095 | + | mips64octeon-* | mips64octeonel-* \ |
2096 | + | mips64orion-* | mips64orionel-* \ |
2097 | + | mips64r5900-* | mips64r5900el-* \ |
2098 | + | mips64vr-* | mips64vrel-* \ |
2099 | + | mips64vr4100-* | mips64vr4100el-* \ |
2100 | + | mips64vr4300-* | mips64vr4300el-* \ |
2101 | + | mips64vr5000-* | mips64vr5000el-* \ |
2102 | + | mips64vr5900-* | mips64vr5900el-* \ |
2103 | + | mipsisa32-* | mipsisa32el-* \ |
2104 | + | mipsisa32r2-* | mipsisa32r2el-* \ |
2105 | + | mipsisa64-* | mipsisa64el-* \ |
2106 | + | mipsisa64r2-* | mipsisa64r2el-* \ |
2107 | + | mipsisa64sb1-* | mipsisa64sb1el-* \ |
2108 | + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ |
2109 | + | mipstx39-* | mipstx39el-* \ |
2110 | + | mmix-* \ |
2111 | + | mt-* \ |
2112 | + | msp430-* \ |
2113 | + | nds32-* | nds32le-* | nds32be-* \ |
2114 | + | nios-* | nios2-* \ |
2115 | | none-* | np1-* | ns16k-* | ns32k-* \ |
2116 | + | open8-* \ |
2117 | | orion-* \ |
2118 | | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ |
2119 | - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ |
2120 | + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ |
2121 | | pyramid-* \ |
2122 | - | romp-* | rs6000-* \ |
2123 | - | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* | sh64-* \ |
2124 | - | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ |
2125 | - | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ |
2126 | - | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \ |
2127 | - | v850-* | v850e-* | vax-* \ |
2128 | + | rl78-* | romp-* | rs6000-* | rx-* \ |
2129 | + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ |
2130 | + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ |
2131 | + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ |
2132 | + | sparclite-* \ |
2133 | + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ |
2134 | + | tahoe-* \ |
2135 | + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ |
2136 | + | tile*-* \ |
2137 | + | tron-* \ |
2138 | + | ubicom32-* \ |
2139 | + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ |
2140 | + | vax-* \ |
2141 | | we32k-* \ |
2142 | - | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ |
2143 | - | xtensa-* \ |
2144 | + | x86-* | x86_64-* | xc16x-* | xps100-* \ |
2145 | + | xstormy16-* | xtensa*-* \ |
2146 | | ymp-* \ |
2147 | - | z8k-*) |
2148 | + | z8k-* | z80-*) |
2149 | + ;; |
2150 | + # Recognize the basic CPU types without company name, with glob match. |
2151 | + xtensa*) |
2152 | + basic_machine=$basic_machine-unknown |
2153 | ;; |
2154 | # Recognize the various machine names and aliases which stand |
2155 | # for a CPU type and a company and sometimes even an OS. |
2156 | @@ -332,6 +452,9 @@ |
2157 | basic_machine=a29k-amd |
2158 | os=-udi |
2159 | ;; |
2160 | + abacus) |
2161 | + basic_machine=abacus-unknown |
2162 | + ;; |
2163 | adobe68k) |
2164 | basic_machine=m68010-adobe |
2165 | os=-scout |
2166 | @@ -346,6 +469,12 @@ |
2167 | basic_machine=a29k-none |
2168 | os=-bsd |
2169 | ;; |
2170 | + amd64) |
2171 | + basic_machine=x86_64-pc |
2172 | + ;; |
2173 | + amd64-*) |
2174 | + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` |
2175 | + ;; |
2176 | amdahl) |
2177 | basic_machine=580-amdahl |
2178 | os=-sysv |
2179 | @@ -369,6 +498,10 @@ |
2180 | basic_machine=m68k-apollo |
2181 | os=-bsd |
2182 | ;; |
2183 | + aros) |
2184 | + basic_machine=i386-pc |
2185 | + os=-aros |
2186 | + ;; |
2187 | aux) |
2188 | basic_machine=m68k-apple |
2189 | os=-aux |
2190 | @@ -377,10 +510,35 @@ |
2191 | basic_machine=ns32k-sequent |
2192 | os=-dynix |
2193 | ;; |
2194 | + blackfin) |
2195 | + basic_machine=bfin-unknown |
2196 | + os=-linux |
2197 | + ;; |
2198 | + blackfin-*) |
2199 | + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` |
2200 | + os=-linux |
2201 | + ;; |
2202 | + bluegene*) |
2203 | + basic_machine=powerpc-ibm |
2204 | + os=-cnk |
2205 | + ;; |
2206 | + c54x-*) |
2207 | + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` |
2208 | + ;; |
2209 | + c55x-*) |
2210 | + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` |
2211 | + ;; |
2212 | + c6x-*) |
2213 | + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` |
2214 | + ;; |
2215 | c90) |
2216 | basic_machine=c90-cray |
2217 | os=-unicos |
2218 | ;; |
2219 | + cegcc) |
2220 | + basic_machine=arm-unknown |
2221 | + os=-cegcc |
2222 | + ;; |
2223 | convex-c1) |
2224 | basic_machine=c1-convex |
2225 | os=-bsd |
2226 | @@ -405,12 +563,27 @@ |
2227 | basic_machine=j90-cray |
2228 | os=-unicos |
2229 | ;; |
2230 | + craynv) |
2231 | + basic_machine=craynv-cray |
2232 | + os=-unicosmp |
2233 | + ;; |
2234 | + cr16 | cr16-*) |
2235 | + basic_machine=cr16-unknown |
2236 | + os=-elf |
2237 | + ;; |
2238 | crds | unos) |
2239 | basic_machine=m68k-crds |
2240 | ;; |
2241 | + crisv32 | crisv32-* | etraxfs*) |
2242 | + basic_machine=crisv32-axis |
2243 | + ;; |
2244 | cris | cris-* | etrax*) |
2245 | basic_machine=cris-axis |
2246 | ;; |
2247 | + crx) |
2248 | + basic_machine=crx-unknown |
2249 | + os=-elf |
2250 | + ;; |
2251 | da30 | da30-*) |
2252 | basic_machine=m68k-da30 |
2253 | ;; |
2254 | @@ -433,6 +606,14 @@ |
2255 | basic_machine=m88k-motorola |
2256 | os=-sysv3 |
2257 | ;; |
2258 | + dicos) |
2259 | + basic_machine=i686-pc |
2260 | + os=-dicos |
2261 | + ;; |
2262 | + djgpp) |
2263 | + basic_machine=i586-pc |
2264 | + os=-msdosdjgpp |
2265 | + ;; |
2266 | dpx20 | dpx20-*) |
2267 | basic_machine=rs6000-bull |
2268 | os=-bosx |
2269 | @@ -544,7 +725,6 @@ |
2270 | i370-ibm* | ibm*) |
2271 | basic_machine=i370-ibm |
2272 | ;; |
2273 | -# I'm not sure what "Sysv32" means. Should this be sysv3.2? |
2274 | i*86v32) |
2275 | basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` |
2276 | os=-sysv32 |
2277 | @@ -583,6 +763,14 @@ |
2278 | basic_machine=m68k-isi |
2279 | os=-sysv |
2280 | ;; |
2281 | + m68knommu) |
2282 | + basic_machine=m68k-unknown |
2283 | + os=-linux |
2284 | + ;; |
2285 | + m68knommu-*) |
2286 | + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` |
2287 | + os=-linux |
2288 | + ;; |
2289 | m88k-omron*) |
2290 | basic_machine=m88k-omron |
2291 | ;; |
2292 | @@ -594,10 +782,17 @@ |
2293 | basic_machine=ns32k-utek |
2294 | os=-sysv |
2295 | ;; |
2296 | + microblaze) |
2297 | + basic_machine=microblaze-xilinx |
2298 | + ;; |
2299 | mingw32) |
2300 | basic_machine=i386-pc |
2301 | os=-mingw32 |
2302 | ;; |
2303 | + mingw32ce) |
2304 | + basic_machine=arm-unknown |
2305 | + os=-mingw32ce |
2306 | + ;; |
2307 | miniframe) |
2308 | basic_machine=m68000-convergent |
2309 | ;; |
2310 | @@ -611,10 +806,6 @@ |
2311 | mips3*) |
2312 | basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown |
2313 | ;; |
2314 | - mmix*) |
2315 | - basic_machine=mmix-knuth |
2316 | - os=-mmixware |
2317 | - ;; |
2318 | monitor) |
2319 | basic_machine=m68k-rom68k |
2320 | os=-coff |
2321 | @@ -627,10 +818,21 @@ |
2322 | basic_machine=i386-pc |
2323 | os=-msdos |
2324 | ;; |
2325 | + ms1-*) |
2326 | + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` |
2327 | + ;; |
2328 | + msys) |
2329 | + basic_machine=i386-pc |
2330 | + os=-msys |
2331 | + ;; |
2332 | mvs) |
2333 | basic_machine=i370-ibm |
2334 | os=-mvs |
2335 | ;; |
2336 | + nacl) |
2337 | + basic_machine=le32-unknown |
2338 | + os=-nacl |
2339 | + ;; |
2340 | ncr3000) |
2341 | basic_machine=i486-ncr |
2342 | os=-sysv4 |
2343 | @@ -695,6 +897,12 @@ |
2344 | np1) |
2345 | basic_machine=np1-gould |
2346 | ;; |
2347 | + neo-tandem) |
2348 | + basic_machine=neo-tandem |
2349 | + ;; |
2350 | + nse-tandem) |
2351 | + basic_machine=nse-tandem |
2352 | + ;; |
2353 | nsr-tandem) |
2354 | basic_machine=nsr-tandem |
2355 | ;; |
2356 | @@ -702,9 +910,12 @@ |
2357 | basic_machine=hppa1.1-oki |
2358 | os=-proelf |
2359 | ;; |
2360 | - or32 | or32-*) |
2361 | + openrisc | openrisc-*) |
2362 | basic_machine=or32-unknown |
2363 | - os=-coff |
2364 | + ;; |
2365 | + os400) |
2366 | + basic_machine=powerpc-ibm |
2367 | + os=-os400 |
2368 | ;; |
2369 | OSE68000 | ose68000) |
2370 | basic_machine=m68000-ericsson |
2371 | @@ -722,23 +933,40 @@ |
2372 | basic_machine=i860-intel |
2373 | os=-osf |
2374 | ;; |
2375 | + parisc) |
2376 | + basic_machine=hppa-unknown |
2377 | + os=-linux |
2378 | + ;; |
2379 | + parisc-*) |
2380 | + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` |
2381 | + os=-linux |
2382 | + ;; |
2383 | pbd) |
2384 | basic_machine=sparc-tti |
2385 | ;; |
2386 | pbb) |
2387 | basic_machine=m68k-tti |
2388 | ;; |
2389 | - pc532 | pc532-*) |
2390 | + pc532 | pc532-*) |
2391 | basic_machine=ns32k-pc532 |
2392 | ;; |
2393 | + pc98) |
2394 | + basic_machine=i386-pc |
2395 | + ;; |
2396 | + pc98-*) |
2397 | + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` |
2398 | + ;; |
2399 | pentium | p5 | k5 | k6 | nexgen | viac3) |
2400 | basic_machine=i586-pc |
2401 | ;; |
2402 | - pentiumpro | p6 | 6x86 | athlon) |
2403 | - basic_machine=i686-pc |
2404 | - ;; |
2405 | - pentiumii | pentium2) |
2406 | - basic_machine=i686-pc |
2407 | + pentiumpro | p6 | 6x86 | athlon | athlon_*) |
2408 | + basic_machine=i686-pc |
2409 | + ;; |
2410 | + pentiumii | pentium2 | pentiumiii | pentium3) |
2411 | + basic_machine=i686-pc |
2412 | + ;; |
2413 | + pentium4) |
2414 | + basic_machine=i786-pc |
2415 | ;; |
2416 | pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) |
2417 | basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` |
2418 | @@ -746,31 +974,35 @@ |
2419 | pentiumpro-* | p6-* | 6x86-* | athlon-*) |
2420 | basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` |
2421 | ;; |
2422 | - pentiumii-* | pentium2-*) |
2423 | + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) |
2424 | basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` |
2425 | ;; |
2426 | + pentium4-*) |
2427 | + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` |
2428 | + ;; |
2429 | pn) |
2430 | basic_machine=pn-gould |
2431 | ;; |
2432 | power) basic_machine=power-ibm |
2433 | ;; |
2434 | - ppc) basic_machine=powerpc-unknown |
2435 | - ;; |
2436 | - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` |
2437 | + ppc | ppcbe) basic_machine=powerpc-unknown |
2438 | + ;; |
2439 | + ppc-* | ppcbe-*) |
2440 | + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` |
2441 | ;; |
2442 | ppcle | powerpclittle | ppc-le | powerpc-little) |
2443 | basic_machine=powerpcle-unknown |
2444 | - ;; |
2445 | + ;; |
2446 | ppcle-* | powerpclittle-*) |
2447 | basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` |
2448 | ;; |
2449 | ppc64) basic_machine=powerpc64-unknown |
2450 | - ;; |
2451 | + ;; |
2452 | ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` |
2453 | ;; |
2454 | ppc64le | powerpc64little | ppc64-le | powerpc64-little) |
2455 | basic_machine=powerpc64le-unknown |
2456 | - ;; |
2457 | + ;; |
2458 | ppc64le-* | powerpc64little-*) |
2459 | basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` |
2460 | ;; |
2461 | @@ -781,6 +1013,10 @@ |
2462 | basic_machine=i586-unknown |
2463 | os=-pw32 |
2464 | ;; |
2465 | + rdos) |
2466 | + basic_machine=i386-pc |
2467 | + os=-rdos |
2468 | + ;; |
2469 | rom68k) |
2470 | basic_machine=m68k-rom68k |
2471 | os=-coff |
2472 | @@ -801,6 +1037,20 @@ |
2473 | basic_machine=a29k-amd |
2474 | os=-udi |
2475 | ;; |
2476 | + sb1) |
2477 | + basic_machine=mipsisa64sb1-unknown |
2478 | + ;; |
2479 | + sb1el) |
2480 | + basic_machine=mipsisa64sb1el-unknown |
2481 | + ;; |
2482 | + sde) |
2483 | + basic_machine=mipsisa32-sde |
2484 | + os=-elf |
2485 | + ;; |
2486 | + sei) |
2487 | + basic_machine=mips-sei |
2488 | + os=-seiux |
2489 | + ;; |
2490 | sequent) |
2491 | basic_machine=i386-sequent |
2492 | ;; |
2493 | @@ -808,6 +1058,12 @@ |
2494 | basic_machine=sh-hitachi |
2495 | os=-hms |
2496 | ;; |
2497 | + sh5el) |
2498 | + basic_machine=sh5le-unknown |
2499 | + ;; |
2500 | + sh64) |
2501 | + basic_machine=sh64-unknown |
2502 | + ;; |
2503 | sparclite-wrs | simso-wrs) |
2504 | basic_machine=sparclite-wrs |
2505 | os=-vxworks |
2506 | @@ -826,6 +1082,9 @@ |
2507 | basic_machine=i860-stratus |
2508 | os=-sysv4 |
2509 | ;; |
2510 | + strongarm-* | thumb-*) |
2511 | + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` |
2512 | + ;; |
2513 | sun2) |
2514 | basic_machine=m68000-sun |
2515 | ;; |
2516 | @@ -866,7 +1125,7 @@ |
2517 | sun386 | sun386i | roadrunner) |
2518 | basic_machine=i386-sun |
2519 | ;; |
2520 | - sv1) |
2521 | + sv1) |
2522 | basic_machine=sv1-cray |
2523 | os=-unicos |
2524 | ;; |
2525 | @@ -874,10 +1133,6 @@ |
2526 | basic_machine=i386-sequent |
2527 | os=-dynix |
2528 | ;; |
2529 | - t3d) |
2530 | - basic_machine=alpha-cray |
2531 | - os=-unicos |
2532 | - ;; |
2533 | t3e) |
2534 | basic_machine=alphaev5-cray |
2535 | os=-unicos |
2536 | @@ -886,9 +1141,9 @@ |
2537 | basic_machine=t90-cray |
2538 | os=-unicos |
2539 | ;; |
2540 | - tic54x | c54x*) |
2541 | - basic_machine=tic54x-unknown |
2542 | - os=-coff |
2543 | + tile*) |
2544 | + basic_machine=$basic_machine-unknown |
2545 | + os=-linux-gnu |
2546 | ;; |
2547 | tx39) |
2548 | basic_machine=mipstx39-unknown |
2549 | @@ -903,6 +1158,10 @@ |
2550 | tower | tower-32) |
2551 | basic_machine=m68k-ncr |
2552 | ;; |
2553 | + tpf) |
2554 | + basic_machine=s390x-ibm |
2555 | + os=-tpf |
2556 | + ;; |
2557 | udi29k) |
2558 | basic_machine=a29k-amd |
2559 | os=-udi |
2560 | @@ -924,8 +1183,8 @@ |
2561 | os=-vms |
2562 | ;; |
2563 | vpp*|vx|vx-*) |
2564 | - basic_machine=f301-fujitsu |
2565 | - ;; |
2566 | + basic_machine=f301-fujitsu |
2567 | + ;; |
2568 | vxworks960) |
2569 | basic_machine=i960-wrs |
2570 | os=-vxworks |
2571 | @@ -946,13 +1205,16 @@ |
2572 | basic_machine=hppa1.1-winbond |
2573 | os=-proelf |
2574 | ;; |
2575 | - windows32) |
2576 | - basic_machine=i386-pc |
2577 | - os=-windows32-msvcrt |
2578 | + xbox) |
2579 | + basic_machine=i686-pc |
2580 | + os=-mingw32 |
2581 | ;; |
2582 | - xps | xps100) |
2583 | + xps | xps100) |
2584 | basic_machine=xps100-honeywell |
2585 | ;; |
2586 | + xscale-* | xscalee[bl]-*) |
2587 | + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` |
2588 | + ;; |
2589 | ymp) |
2590 | basic_machine=ymp-cray |
2591 | os=-unicos |
2592 | @@ -961,6 +1223,10 @@ |
2593 | basic_machine=z8k-unknown |
2594 | os=-sim |
2595 | ;; |
2596 | + z80-*-coff) |
2597 | + basic_machine=z80-unknown |
2598 | + os=-sim |
2599 | + ;; |
2600 | none) |
2601 | basic_machine=none-none |
2602 | os=-none |
2603 | @@ -980,6 +1246,9 @@ |
2604 | romp) |
2605 | basic_machine=romp-ibm |
2606 | ;; |
2607 | + mmix) |
2608 | + basic_machine=mmix-knuth |
2609 | + ;; |
2610 | rs6000) |
2611 | basic_machine=rs6000-ibm |
2612 | ;; |
2613 | @@ -996,16 +1265,13 @@ |
2614 | we32k) |
2615 | basic_machine=we32k-att |
2616 | ;; |
2617 | - sh3 | sh4 | sh3eb | sh4eb) |
2618 | + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) |
2619 | basic_machine=sh-unknown |
2620 | ;; |
2621 | - sh64) |
2622 | - basic_machine=sh64-unknown |
2623 | - ;; |
2624 | - sparc | sparcv9 | sparcv9b) |
2625 | + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) |
2626 | basic_machine=sparc-sun |
2627 | ;; |
2628 | - cydra) |
2629 | + cydra) |
2630 | basic_machine=cydra-cydrome |
2631 | ;; |
2632 | orion) |
2633 | @@ -1020,10 +1286,6 @@ |
2634 | pmac | pmac-mpw) |
2635 | basic_machine=powerpc-apple |
2636 | ;; |
2637 | - c4x*) |
2638 | - basic_machine=c4x-none |
2639 | - os=-coff |
2640 | - ;; |
2641 | *-unknown) |
2642 | # Make sure to match an already-canonicalized machine name. |
2643 | ;; |
2644 | @@ -1050,9 +1312,12 @@ |
2645 | if [ x"$os" != x"" ] |
2646 | then |
2647 | case $os in |
2648 | - # First match some system type aliases |
2649 | - # that might get confused with valid system types. |
2650 | + # First match some system type aliases |
2651 | + # that might get confused with valid system types. |
2652 | # -solaris* is a basic system type, with this one exception. |
2653 | + -auroraux) |
2654 | + os=-auroraux |
2655 | + ;; |
2656 | -solaris1 | -solaris1.*) |
2657 | os=`echo $os | sed -e 's|solaris1|sunos4|'` |
2658 | ;; |
2659 | @@ -1073,24 +1338,31 @@ |
2660 | # Each alternative MUST END IN A *, to match a version number. |
2661 | # -sysv* is not here because it comes later, after sysvr4. |
2662 | -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ |
2663 | - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ |
2664 | - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ |
2665 | + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ |
2666 | + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ |
2667 | + | -sym* | -kopensolaris* \ |
2668 | | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ |
2669 | - | -aos* \ |
2670 | + | -aos* | -aros* \ |
2671 | | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ |
2672 | | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ |
2673 | - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ |
2674 | - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ |
2675 | + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ |
2676 | + | -openbsd* | -solidbsd* \ |
2677 | + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ |
2678 | + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ |
2679 | | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ |
2680 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ |
2681 | - | -chorusos* | -chorusrdb* \ |
2682 | - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
2683 | - | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ |
2684 | - | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ |
2685 | + | -chorusos* | -chorusrdb* | -cegcc* \ |
2686 | + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
2687 | + | -mingw32* | -linux-gnu* | -linux-android* \ |
2688 | + | -linux-newlib* | -linux-uclibc* \ |
2689 | + | -uxpv* | -beos* | -mpeix* | -udk* \ |
2690 | + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ |
2691 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ |
2692 | | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ |
2693 | | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ |
2694 | - | -morphos* | -superux* | -rtmk* | -rtmk-nova*) |
2695 | + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ |
2696 | + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ |
2697 | + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) |
2698 | # Remember, each alternative MUST END IN *, to match a version number. |
2699 | ;; |
2700 | -qnx*) |
2701 | @@ -1102,16 +1374,21 @@ |
2702 | ;; |
2703 | esac |
2704 | ;; |
2705 | + -nto-qnx*) |
2706 | + ;; |
2707 | -nto*) |
2708 | - os=-nto-qnx |
2709 | + os=`echo $os | sed -e 's|nto|nto-qnx|'` |
2710 | ;; |
2711 | -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ |
2712 | - | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ |
2713 | + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ |
2714 | | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) |
2715 | ;; |
2716 | -mac*) |
2717 | os=`echo $os | sed -e 's|mac|macos|'` |
2718 | ;; |
2719 | + -linux-dietlibc) |
2720 | + os=-linux-dietlibc |
2721 | + ;; |
2722 | -linux*) |
2723 | os=`echo $os | sed -e 's|linux|linux-gnu|'` |
2724 | ;; |
2725 | @@ -1124,6 +1401,9 @@ |
2726 | -opened*) |
2727 | os=-openedition |
2728 | ;; |
2729 | + -os400*) |
2730 | + os=-os400 |
2731 | + ;; |
2732 | -wince*) |
2733 | os=-wince |
2734 | ;; |
2735 | @@ -1145,6 +1425,9 @@ |
2736 | -atheos*) |
2737 | os=-atheos |
2738 | ;; |
2739 | + -syllable*) |
2740 | + os=-syllable |
2741 | + ;; |
2742 | -386bsd) |
2743 | os=-bsd |
2744 | ;; |
2745 | @@ -1155,7 +1438,7 @@ |
2746 | os=-rtmk-nova |
2747 | ;; |
2748 | -ns2 ) |
2749 | - os=-nextstep2 |
2750 | + os=-nextstep2 |
2751 | ;; |
2752 | -nsk*) |
2753 | os=-nsk |
2754 | @@ -1167,6 +1450,9 @@ |
2755 | -sinix*) |
2756 | os=-sysv4 |
2757 | ;; |
2758 | + -tpf*) |
2759 | + os=-tpf |
2760 | + ;; |
2761 | -triton*) |
2762 | os=-sysv3 |
2763 | ;; |
2764 | @@ -1194,8 +1480,22 @@ |
2765 | -xenix) |
2766 | os=-xenix |
2767 | ;; |
2768 | - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) |
2769 | - os=-mint |
2770 | + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) |
2771 | + os=-mint |
2772 | + ;; |
2773 | + -aros*) |
2774 | + os=-aros |
2775 | + ;; |
2776 | + -kaos*) |
2777 | + os=-kaos |
2778 | + ;; |
2779 | + -zvmoe) |
2780 | + os=-zvmoe |
2781 | + ;; |
2782 | + -dicos*) |
2783 | + os=-dicos |
2784 | + ;; |
2785 | + -nacl*) |
2786 | ;; |
2787 | -none) |
2788 | ;; |
2789 | @@ -1219,6 +1519,12 @@ |
2790 | # system, and we'll never get to this point. |
2791 | |
2792 | case $basic_machine in |
2793 | + score-*) |
2794 | + os=-elf |
2795 | + ;; |
2796 | + spu-*) |
2797 | + os=-elf |
2798 | + ;; |
2799 | *-acorn) |
2800 | os=-riscix1.2 |
2801 | ;; |
2802 | @@ -1228,11 +1534,23 @@ |
2803 | arm*-semi) |
2804 | os=-aout |
2805 | ;; |
2806 | + c4x-* | tic4x-*) |
2807 | + os=-coff |
2808 | + ;; |
2809 | + tic54x-*) |
2810 | + os=-coff |
2811 | + ;; |
2812 | + tic55x-*) |
2813 | + os=-coff |
2814 | + ;; |
2815 | + tic6x-*) |
2816 | + os=-coff |
2817 | + ;; |
2818 | # This must come before the *-dec entry. |
2819 | pdp10-*) |
2820 | os=-tops20 |
2821 | ;; |
2822 | - pdp11-*) |
2823 | + pdp11-*) |
2824 | os=-none |
2825 | ;; |
2826 | *-dec | vax-*) |
2827 | @@ -1246,13 +1564,13 @@ |
2828 | ;; |
2829 | m68000-sun) |
2830 | os=-sunos3 |
2831 | - # This also exists in the configure program, but was not the |
2832 | - # default. |
2833 | - # os=-sunos4 |
2834 | ;; |
2835 | m68*-cisco) |
2836 | os=-aout |
2837 | ;; |
2838 | + mep-*) |
2839 | + os=-elf |
2840 | + ;; |
2841 | mips*-cisco) |
2842 | os=-elf |
2843 | ;; |
2844 | @@ -1271,9 +1589,15 @@ |
2845 | *-be) |
2846 | os=-beos |
2847 | ;; |
2848 | + *-haiku) |
2849 | + os=-haiku |
2850 | + ;; |
2851 | *-ibm) |
2852 | os=-aix |
2853 | ;; |
2854 | + *-knuth) |
2855 | + os=-mmixware |
2856 | + ;; |
2857 | *-wec) |
2858 | os=-proelf |
2859 | ;; |
2860 | @@ -1325,19 +1649,19 @@ |
2861 | *-next) |
2862 | os=-nextstep3 |
2863 | ;; |
2864 | - *-gould) |
2865 | + *-gould) |
2866 | os=-sysv |
2867 | ;; |
2868 | - *-highlevel) |
2869 | + *-highlevel) |
2870 | os=-bsd |
2871 | ;; |
2872 | *-encore) |
2873 | os=-bsd |
2874 | ;; |
2875 | - *-sgi) |
2876 | + *-sgi) |
2877 | os=-irix |
2878 | ;; |
2879 | - *-siemens) |
2880 | + *-siemens) |
2881 | os=-sysv4 |
2882 | ;; |
2883 | *-masscomp) |
2884 | @@ -1376,7 +1700,7 @@ |
2885 | -sunos*) |
2886 | vendor=sun |
2887 | ;; |
2888 | - -aix*) |
2889 | + -cnk*|-aix*) |
2890 | vendor=ibm |
2891 | ;; |
2892 | -beos*) |
2893 | @@ -1406,10 +1730,16 @@ |
2894 | -mvs* | -opened*) |
2895 | vendor=ibm |
2896 | ;; |
2897 | + -os400*) |
2898 | + vendor=ibm |
2899 | + ;; |
2900 | -ptx*) |
2901 | vendor=sequent |
2902 | ;; |
2903 | - -vxsim* | -vxworks*) |
2904 | + -tpf*) |
2905 | + vendor=ibm |
2906 | + ;; |
2907 | + -vxsim* | -vxworks* | -windiss*) |
2908 | vendor=wrs |
2909 | ;; |
2910 | -aux*) |
2911 | @@ -1433,7 +1763,7 @@ |
2912 | esac |
2913 | |
2914 | echo $basic_machine$os |
2915 | -exit 0 |
2916 | +exit |
2917 | |
2918 | # Local variables: |
2919 | # eval: (add-hook 'write-file-hooks 'time-stamp) |
2920 | |
2921 | === modified file 'debian/changelog' |
2922 | --- debian/changelog 2010-12-06 21:07:03 +0000 |
2923 | +++ debian/changelog 2012-08-17 04:57:18 +0000 |
2924 | @@ -1,3 +1,22 @@ |
2925 | +xinetd (1:2.3.14-7.1ubuntu1) quantal; urgency=low |
2926 | + |
2927 | + * Merge from Debian unstable. (LP: #1016505) Remaining changes: |
2928 | + - Add xinetd upstart job. |
2929 | + - debian/{control,rules}: Add and enable hardened build for PIE. |
2930 | + - debian/control: Add Depend on lsb >= 3.2-14, which has the |
2931 | + status_of_proc() function. |
2932 | + - debian/xinetd.init: Add the 'status' action. |
2933 | + |
2934 | + -- Logan Rosen <logatronico@gmail.com> Fri, 17 Aug 2012 00:41:51 -0400 |
2935 | + |
2936 | +xinetd (1:2.3.14-7.1) unstable; urgency=high |
2937 | + |
2938 | + * Non-maintainer upload by the Security Team. |
2939 | + * Fix CVE-2012-0862 avoiding enabling unintentional services |
2940 | + (Closes: #672381). |
2941 | + |
2942 | + -- Luk Claes <luk@debian.org> Sun, 27 May 2012 19:26:42 +0200 |
2943 | + |
2944 | xinetd (1:2.3.14-7ubuntu4) natty; urgency=low |
2945 | |
2946 | * add xinetd upstart job (LP: #43574) |
2947 | |
2948 | === modified file 'debian/patches/0006-Disable-services-from-inetd.conf-if-a-service-with-t.patch' |
2949 | --- debian/patches/0006-Disable-services-from-inetd.conf-if-a-service-with-t.patch 2007-11-29 09:29:55 +0000 |
2950 | +++ debian/patches/0006-Disable-services-from-inetd.conf-if-a-service-with-t.patch 2012-08-17 04:57:18 +0000 |
2951 | @@ -25,7 +25,7 @@ |
2952 | static int get_next_inet_entry( int fd, pset_h sconfs, |
2953 | struct service_config *defaults); |
2954 | |
2955 | -@@ -32,12 +34,15 @@ void parse_inet_conf_file( int fd, struct configuration *confp ) |
2956 | +@@ -38,12 +38,15 @@ void parse_inet_conf_file( int fd, struct configuration *confp ) |
2957 | struct service_config *default_config = CNF_DEFAULTS( confp ); |
2958 | |
2959 | line_count = 0; |
2960 | @@ -41,7 +41,7 @@ |
2961 | } |
2962 | |
2963 | static int get_next_inet_entry( int fd, pset_h sconfs, |
2964 | -@@ -46,7 +51,7 @@ static int get_next_inet_entry( int fd, pset_h sconfs, |
2965 | +@@ -52,7 +55,7 @@ static int get_next_inet_entry( int fd, pset_h sconfs, |
2966 | char *p; |
2967 | str_h strp; |
2968 | char *line = next_line(fd); |
2969 | @@ -50,7 +50,7 @@ |
2970 | unsigned u, i; |
2971 | const char *func = "get_next_inet_entry"; |
2972 | char *name = NULL, *rpcvers = NULL, *rpcproto = NULL; |
2973 | -@@ -405,7 +410,16 @@ static int get_next_inet_entry( int fd, pset_h sconfs, |
2974 | +@@ -426,7 +429,16 @@ static int get_next_inet_entry( int fd, pset_h sconfs, |
2975 | SC_SPECIFY( scp, A_SOCKET_TYPE ); |
2976 | SC_SPECIFY( scp, A_WAIT ); |
2977 | |
2978 | @@ -68,7 +68,7 @@ |
2979 | { |
2980 | out_of_memory( func ); |
2981 | pset_destroy(args); |
2982 | -@@ -414,7 +428,9 @@ static int get_next_inet_entry( int fd, pset_h sconfs, |
2983 | +@@ -437,7 +449,9 @@ static int get_next_inet_entry( int fd, pset_h sconfs, |
2984 | } |
2985 | |
2986 | pset_destroy(args); |
2987 | |
2988 | === added file 'debian/patches/0008-CVE-2012-0862.patch' |
2989 | --- debian/patches/0008-CVE-2012-0862.patch 1970-01-01 00:00:00 +0000 |
2990 | +++ debian/patches/0008-CVE-2012-0862.patch 2012-08-17 04:57:18 +0000 |
2991 | @@ -0,0 +1,49 @@ |
2992 | +--- xinetd-2.3.14/xinetd/builtins.c 2012-02-15 16:29:48.263844700 -0600 |
2993 | ++++ xinetd-2.3.14/xinetd/builtins.c 2012-02-15 16:37:52.209594438 -0600 |
2994 | +@@ -554,17 +554,16 @@ |
2995 | + /* Found the pointer. Validate its type. |
2996 | + */ |
2997 | + scp = SVC_CONF( sp ); |
2998 | +-/* |
2999 | +- if ( ! SVC_IS_MUXCLIENT( sp ) ) |
3000 | ++ |
3001 | ++ if ( ! SVC_IS_MUXCLIENT( sp ) && ! SVC_IS_MUXPLUSCLIENT( sp ) ) |
3002 | + { |
3003 | + if ( debug.on ) |
3004 | + { |
3005 | + msg(LOG_DEBUG, "tcpmux_handler", "Non-tcpmux service name: %s.", |
3006 | + svc_name); |
3007 | + } |
3008 | +- exit(0); |
3009 | ++ continue; |
3010 | + } |
3011 | +-*/ |
3012 | + |
3013 | + /* Send the accept string if we're a PLUS (+) client. |
3014 | + */ |
3015 | +@@ -591,6 +590,19 @@ |
3016 | + msg(LOG_DEBUG, "tcpmux_handler", "Service name %s not found.", |
3017 | + svc_name); |
3018 | + } |
3019 | ++ |
3020 | ++ /* If a service was not found, we should say so. */ |
3021 | ++ if ( Swrite( descriptor, TCPMUX_NOT_FOUND, sizeof( TCPMUX_NOT_FOUND ) ) != |
3022 | ++ sizeof ( TCPMUX_NOT_FOUND ) ) |
3023 | ++ { |
3024 | ++ msg(LOG_ERR, "tcpmux_handler", "Not found write failed for %s.", |
3025 | ++ svc_name); |
3026 | ++ exit(0); |
3027 | ++ } |
3028 | ++ |
3029 | ++ /* Flush and exit, nothing to do */ |
3030 | ++ Sflush( descriptor ); |
3031 | ++ Sclose( descriptor ); |
3032 | + exit(0); |
3033 | + } |
3034 | + |
3035 | +--- xinetd-2.3.14/xinetd/service.h 2012-02-15 16:29:48.263844700 -0600 |
3036 | ++++ xinetd-2.3.14/xinetd/service.h 2012-02-15 16:37:52.209594438 -0600 |
3037 | +@@ -94,2 +94,3 @@ |
3038 | + #define TCPMUX_ACK "+Go\r\n" |
3039 | ++#define TCPMUX_NOT_FOUND "-Service name not found\r\n" |
3040 | + /* |
3041 | |
3042 | === modified file 'xinetd/inet.c' |
3043 | --- xinetd/inet.c 2004-04-18 13:33:57 +0000 |
3044 | +++ xinetd/inet.c 2012-08-17 04:57:18 +0000 |
3045 | @@ -23,6 +23,10 @@ |
3046 | #include "parsesup.h" |
3047 | #include "nvlists.h" |
3048 | |
3049 | +static psi_h iter ; |
3050 | + |
3051 | +extern int inetd_ipv6; |
3052 | + |
3053 | static int get_next_inet_entry( int fd, pset_h sconfs, |
3054 | struct service_config *defaults); |
3055 |
As you do a lot of work for ubuntu, here is a slightly more *picky* review =)
"- debian/xinetd.init: Add the 'status' action." is no longer needed, as we ship an upstart job (which takes precedence) and has status.
In Ubuntu, we do not have "non-maintainer uploads", and sponsors include both changelog entries on the upload (such that we get LP:# closes lines from ). So I would not include "*Non-maintaine r..."
Including/ copy-pasting "CVE" entry is good, cause well it's a CVE =)