Merge lp:~mfisch/nano/update_to_2.3.1 into lp:ubuntu/raring/nano
- update_to_2.3.1
- Merge into raring
Proposed by
Matt Fischer
Status: | Work in progress | ||||
---|---|---|---|---|---|
Proposed branch: | lp:~mfisch/nano/update_to_2.3.1 | ||||
Merge into: | lp:ubuntu/raring/nano | ||||
Diff against target: |
80164 lines (+19517/-17687) 86 files modified
.pc/applied-patches (+0/-2) .pc/auto.patch/doc/syntax/c.nanorc (+0/-30) .pc/autoconfupdate.patch/config.guess (+0/-1501) .pc/autoconfupdate.patch/config.sub (+0/-1705) ChangeLog (+68/-2) NEWS (+20/-10) TODO (+1/-1) config.guess (+118/-147) config.h.in (+6/-0) config.sub (+68/-145) configure (+56/-11) configure.ac (+4/-3) debian/changelog (+7/-0) doc/faq.html (+8/-2) doc/man/fr/nano.1.html (+955/-507) doc/man/fr/nanorc.5.html (+1071/-516) doc/man/fr/rnano.1.html (+258/-224) doc/man/nano.1.html (+1/-1) doc/man/nanorc.5 (+12/-2) doc/man/nanorc.5.html (+18/-2) doc/man/rnano.1.html (+216/-175) doc/syntax/Makefile.am (+15/-13) doc/syntax/Makefile.in (+15/-13) doc/syntax/asm.nanorc (+1/-0) doc/syntax/awk.nanorc (+1/-0) doc/syntax/c.nanorc (+2/-1) doc/syntax/html.nanorc (+1/-0) doc/syntax/java.nanorc (+1/-0) doc/syntax/lua.nanorc (+76/-0) doc/syntax/man.nanorc (+1/-0) doc/syntax/nanorc.nanorc (+2/-2) doc/syntax/patch.nanorc (+1/-0) doc/syntax/perl.nanorc (+1/-0) doc/syntax/php.nanorc (+1/-0) doc/syntax/sh.nanorc (+1/-0) doc/syntax/spec.nanorc (+38/-0) doc/syntax/xml.nanorc (+1/-0) doc/texinfo/nano.info (+1/-1) nano.spec (+1/-1) po/LINGUAS (+1/-1) po/bg.po (+419/-361) po/ca.po (+419/-361) po/cs.po (+419/-361) po/da.po (+420/-361) po/de.po (+439/-372) po/eo.po (+2144/-0) po/es.po (+419/-361) po/eu.po (+424/-372) po/fi.po (+440/-851) po/fr.po (+459/-374) po/ga.po (+420/-361) po/gl.po (+468/-404) po/hu.po (+419/-361) po/id.po (+419/-366) po/it.po (+421/-361) po/ms.po (+419/-361) po/nano.pot (+415/-362) po/nb.po (+419/-361) po/nl.po (+439/-370) po/nn.po (+419/-362) po/pl.po (+419/-361) po/pt_BR.po (+420/-361) po/ro.po (+418/-360) po/ru.po (+419/-361) po/rw.po (+423/-367) po/sr.po (+418/-360) po/sv.po (+419/-361) po/tr.po (+418/-360) po/uk.po (+419/-366) po/vi.po (+421/-361) po/zh_CN.po (+434/-370) po/zh_TW.po (+418/-360) src/browser.c (+28/-28) src/chars.c (+4/-4) src/color.c (+88/-17) src/files.c (+297/-38) src/global.c (+419/-489) src/help.c (+15/-15) src/nano.c (+65/-14) src/nano.h (+20/-162) src/prompt.c (+29/-29) src/proto.h (+32/-4) src/rcfile.c (+77/-2) src/search.c (+19/-10) src/text.c (+15/-10) src/winio.c (+55/-56) |
||||
To merge this branch: | bzr merge lp:~mfisch/nano/update_to_2.3.1 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Dimitri John Ledkov | Needs Fixing | ||
Ubuntu branches | Pending | ||
Review via email: mp+140133@code.launchpad.net |
Commit message
Description of the change
Upgrade to 2.3.1, this essentially just required a refresh to auto.patch and that's it. It looks like the checked in .pc directory removal helped to turn this into an 80k line diff. I can do a debdiff instead if that's easier.
To post a comment you must log in.
Revision history for this message
Matt Fischer (mfisch) wrote : | # |
Okay, I'm nuking this and trying again.
Unmerged revisions
- 26. By Matt Fischer
-
* New upstream release (LP: #1091076)
- Refreshed auto.patch and sent it upstream.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === removed file '.pc/applied-patches' |
2 | --- .pc/applied-patches 2012-10-01 12:57:07 +0000 |
3 | +++ .pc/applied-patches 1970-01-01 00:00:00 +0000 |
4 | @@ -1,2 +0,0 @@ |
5 | -auto.patch |
6 | -autoconfupdate.patch |
7 | |
8 | === removed directory '.pc/auto.patch' |
9 | === removed directory '.pc/auto.patch/doc' |
10 | === removed directory '.pc/auto.patch/doc/syntax' |
11 | === removed file '.pc/auto.patch/doc/syntax/c.nanorc' |
12 | --- .pc/auto.patch/doc/syntax/c.nanorc 2010-08-30 19:35:50 +0000 |
13 | +++ .pc/auto.patch/doc/syntax/c.nanorc 1970-01-01 00:00:00 +0000 |
14 | @@ -1,30 +0,0 @@ |
15 | -## Here is an example for C/C++. |
16 | -## |
17 | -syntax "c" "\.(c(c|pp|xx)?|C)$" "\.(h(h|pp|xx)?|H)$" "\.ii?$" |
18 | -color brightred "\<[A-Z_][0-9A-Z_]+\>" |
19 | -color green "\<(float|double|bool|char|int|short|long|sizeof|enum|void|static|const|struct|union|typedef|extern|(un)?signed|inline)\>" |
20 | -color green "\<((s?size)|((u_?)?int(8|16|32|64|ptr)))_t\>" |
21 | -color green "\<(class|namespace|template|public|protected|private|typename|this|friend|virtual|using|mutable|volatile|register|explicit)\>" |
22 | -color brightyellow "\<(for|if|while|do|else|case|default|switch)\>" |
23 | -color brightyellow "\<(try|throw|catch|operator|new|delete)\>" |
24 | -color magenta "\<(goto|continue|break|return)\>" |
25 | -color brightcyan "^[[:space:]]*#[[:space:]]*(define|include(_next)?|(un|ifn?)def|endif|el(if|se)|if|warning|error|pragma)" |
26 | -color brightmagenta "'([^'\]|(\\["'abfnrtv\\]))'" "'\\(([0-3]?[0-7]{1,2}))'" "'\\x[0-9A-Fa-f]{1,2}'" |
27 | -## |
28 | -## GCC builtins |
29 | -color cyan "__attribute__[[:space:]]*\(\([^)]*\)\)" "__(aligned|asm|builtin|hidden|inline|packed|restrict|section|typeof|weak)__" |
30 | -## |
31 | -## String highlighting. You will in general want your comments and |
32 | -## strings to come last, because syntax highlighting rules will be |
33 | -## applied in the order they are read in. |
34 | -color brightyellow "<[^= ]*>" ""(\\.|[^"])*"" |
35 | -## |
36 | -## This string is VERY resource intensive! |
37 | -color brightyellow start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*"" |
38 | - |
39 | -## Comment highlighting |
40 | -color brightblue "//.*" |
41 | -color brightblue start="/\*" end="\*/" |
42 | - |
43 | -## Trailing whitespace |
44 | -color ,green "[[:space:]]+$" |
45 | |
46 | === removed directory '.pc/autoconfupdate.patch' |
47 | === removed file '.pc/autoconfupdate.patch/config.guess' |
48 | --- .pc/autoconfupdate.patch/config.guess 2012-10-01 12:57:07 +0000 |
49 | +++ .pc/autoconfupdate.patch/config.guess 1970-01-01 00:00:00 +0000 |
50 | @@ -1,1501 +0,0 @@ |
51 | -#! /bin/sh |
52 | -# Attempt to guess a canonical system name. |
53 | -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
54 | -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 |
55 | -# Free Software Foundation, Inc. |
56 | - |
57 | -timestamp='2009-11-20' |
58 | - |
59 | -# This file is free software; you can redistribute it and/or modify it |
60 | -# under the terms of the GNU General Public License as published by |
61 | -# the Free Software Foundation; either version 2 of the License, or |
62 | -# (at your option) any later version. |
63 | -# |
64 | -# This program is distributed in the hope that it will be useful, but |
65 | -# WITHOUT ANY WARRANTY; without even the implied warranty of |
66 | -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
67 | -# General Public License for more details. |
68 | -# |
69 | -# You should have received a copy of the GNU General Public License |
70 | -# along with this program; if not, write to the Free Software |
71 | -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA |
72 | -# 02110-1301, USA. |
73 | -# |
74 | -# As a special exception to the GNU General Public License, if you |
75 | -# distribute this file as part of a program that contains a |
76 | -# configuration script generated by Autoconf, you may include it under |
77 | -# the same distribution terms that you use for the rest of that program. |
78 | - |
79 | - |
80 | -# Originally written by Per Bothner. Please send patches (context |
81 | -# diff format) to <config-patches@gnu.org> and include a ChangeLog |
82 | -# entry. |
83 | -# |
84 | -# This script attempts to guess a canonical system name similar to |
85 | -# config.sub. If it succeeds, it prints the system name on stdout, and |
86 | -# exits with 0. Otherwise, it exits with 1. |
87 | -# |
88 | -# You can get the latest version of this script from: |
89 | -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD |
90 | - |
91 | -me=`echo "$0" | sed -e 's,.*/,,'` |
92 | - |
93 | -usage="\ |
94 | -Usage: $0 [OPTION] |
95 | - |
96 | -Output the configuration name of the system \`$me' is run on. |
97 | - |
98 | -Operation modes: |
99 | - -h, --help print this help, then exit |
100 | - -t, --time-stamp print date of last modification, then exit |
101 | - -v, --version print version number, then exit |
102 | - |
103 | -Report bugs and patches to <config-patches@gnu.org>." |
104 | - |
105 | -version="\ |
106 | -GNU config.guess ($timestamp) |
107 | - |
108 | -Originally written by Per Bothner. |
109 | -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, |
110 | -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
111 | - |
112 | -This is free software; see the source for copying conditions. There is NO |
113 | -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
114 | - |
115 | -help=" |
116 | -Try \`$me --help' for more information." |
117 | - |
118 | -# Parse command line |
119 | -while test $# -gt 0 ; do |
120 | - case $1 in |
121 | - --time-stamp | --time* | -t ) |
122 | - echo "$timestamp" ; exit ;; |
123 | - --version | -v ) |
124 | - echo "$version" ; exit ;; |
125 | - --help | --h* | -h ) |
126 | - echo "$usage"; exit ;; |
127 | - -- ) # Stop option processing |
128 | - shift; break ;; |
129 | - - ) # Use stdin as input. |
130 | - break ;; |
131 | - -* ) |
132 | - echo "$me: invalid option $1$help" >&2 |
133 | - exit 1 ;; |
134 | - * ) |
135 | - break ;; |
136 | - esac |
137 | -done |
138 | - |
139 | -if test $# != 0; then |
140 | - echo "$me: too many arguments$help" >&2 |
141 | - exit 1 |
142 | -fi |
143 | - |
144 | -trap 'exit 1' 1 2 15 |
145 | - |
146 | -# CC_FOR_BUILD -- compiler used by this script. Note that the use of a |
147 | -# compiler to aid in system detection is discouraged as it requires |
148 | -# temporary files to be created and, as you can see below, it is a |
149 | -# headache to deal with in a portable fashion. |
150 | - |
151 | -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still |
152 | -# use `HOST_CC' if defined, but it is deprecated. |
153 | - |
154 | -# Portable tmp directory creation inspired by the Autoconf team. |
155 | - |
156 | -set_cc_for_build=' |
157 | -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; |
158 | -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; |
159 | -: ${TMPDIR=/tmp} ; |
160 | - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || |
161 | - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || |
162 | - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || |
163 | - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; |
164 | -dummy=$tmp/dummy ; |
165 | -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; |
166 | -case $CC_FOR_BUILD,$HOST_CC,$CC in |
167 | - ,,) echo "int x;" > $dummy.c ; |
168 | - for c in cc gcc c89 c99 ; do |
169 | - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then |
170 | - CC_FOR_BUILD="$c"; break ; |
171 | - fi ; |
172 | - done ; |
173 | - if test x"$CC_FOR_BUILD" = x ; then |
174 | - CC_FOR_BUILD=no_compiler_found ; |
175 | - fi |
176 | - ;; |
177 | - ,,*) CC_FOR_BUILD=$CC ;; |
178 | - ,*,*) CC_FOR_BUILD=$HOST_CC ;; |
179 | -esac ; set_cc_for_build= ;' |
180 | - |
181 | -# This is needed to find uname on a Pyramid OSx when run in the BSD universe. |
182 | -# (ghazi@noc.rutgers.edu 1994-08-24) |
183 | -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then |
184 | - PATH=$PATH:/.attbin ; export PATH |
185 | -fi |
186 | - |
187 | -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown |
188 | -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown |
189 | -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown |
190 | -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown |
191 | - |
192 | -# Note: order is significant - the case branches are not exclusive. |
193 | - |
194 | -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in |
195 | - *:NetBSD:*:*) |
196 | - # NetBSD (nbsd) targets should (where applicable) match one or |
197 | - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, |
198 | - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently |
199 | - # switched to ELF, *-*-netbsd* would select the old |
200 | - # object file format. This provides both forward |
201 | - # compatibility and a consistent mechanism for selecting the |
202 | - # object file format. |
203 | - # |
204 | - # Note: NetBSD doesn't particularly care about the vendor |
205 | - # portion of the name. We always set it to "unknown". |
206 | - sysctl="sysctl -n hw.machine_arch" |
207 | - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ |
208 | - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` |
209 | - case "${UNAME_MACHINE_ARCH}" in |
210 | - armeb) machine=armeb-unknown ;; |
211 | - arm*) machine=arm-unknown ;; |
212 | - sh3el) machine=shl-unknown ;; |
213 | - sh3eb) machine=sh-unknown ;; |
214 | - sh5el) machine=sh5le-unknown ;; |
215 | - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; |
216 | - esac |
217 | - # The Operating System including object format, if it has switched |
218 | - # to ELF recently, or will in the future. |
219 | - case "${UNAME_MACHINE_ARCH}" in |
220 | - arm*|i386|m68k|ns32k|sh3*|sparc|vax) |
221 | - eval $set_cc_for_build |
222 | - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
223 | - | grep -q __ELF__ |
224 | - then |
225 | - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). |
226 | - # Return netbsd for either. FIX? |
227 | - os=netbsd |
228 | - else |
229 | - os=netbsdelf |
230 | - fi |
231 | - ;; |
232 | - *) |
233 | - os=netbsd |
234 | - ;; |
235 | - esac |
236 | - # The OS release |
237 | - # Debian GNU/NetBSD machines have a different userland, and |
238 | - # thus, need a distinct triplet. However, they do not need |
239 | - # kernel version information, so it can be replaced with a |
240 | - # suitable tag, in the style of linux-gnu. |
241 | - case "${UNAME_VERSION}" in |
242 | - Debian*) |
243 | - release='-gnu' |
244 | - ;; |
245 | - *) |
246 | - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` |
247 | - ;; |
248 | - esac |
249 | - # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: |
250 | - # contains redundant information, the shorter form: |
251 | - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. |
252 | - echo "${machine}-${os}${release}" |
253 | - exit ;; |
254 | - *:OpenBSD:*:*) |
255 | - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` |
256 | - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} |
257 | - exit ;; |
258 | - *:ekkoBSD:*:*) |
259 | - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} |
260 | - exit ;; |
261 | - *:SolidBSD:*:*) |
262 | - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} |
263 | - exit ;; |
264 | - macppc:MirBSD:*:*) |
265 | - echo powerpc-unknown-mirbsd${UNAME_RELEASE} |
266 | - exit ;; |
267 | - *:MirBSD:*:*) |
268 | - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} |
269 | - exit ;; |
270 | - alpha:OSF1:*:*) |
271 | - case $UNAME_RELEASE in |
272 | - *4.0) |
273 | - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` |
274 | - ;; |
275 | - *5.*) |
276 | - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` |
277 | - ;; |
278 | - esac |
279 | - # According to Compaq, /usr/sbin/psrinfo has been available on |
280 | - # OSF/1 and Tru64 systems produced since 1995. I hope that |
281 | - # covers most systems running today. This code pipes the CPU |
282 | - # types through head -n 1, so we only detect the type of CPU 0. |
283 | - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` |
284 | - case "$ALPHA_CPU_TYPE" in |
285 | - "EV4 (21064)") |
286 | - UNAME_MACHINE="alpha" ;; |
287 | - "EV4.5 (21064)") |
288 | - UNAME_MACHINE="alpha" ;; |
289 | - "LCA4 (21066/21068)") |
290 | - UNAME_MACHINE="alpha" ;; |
291 | - "EV5 (21164)") |
292 | - UNAME_MACHINE="alphaev5" ;; |
293 | - "EV5.6 (21164A)") |
294 | - UNAME_MACHINE="alphaev56" ;; |
295 | - "EV5.6 (21164PC)") |
296 | - UNAME_MACHINE="alphapca56" ;; |
297 | - "EV5.7 (21164PC)") |
298 | - UNAME_MACHINE="alphapca57" ;; |
299 | - "EV6 (21264)") |
300 | - UNAME_MACHINE="alphaev6" ;; |
301 | - "EV6.7 (21264A)") |
302 | - UNAME_MACHINE="alphaev67" ;; |
303 | - "EV6.8CB (21264C)") |
304 | - UNAME_MACHINE="alphaev68" ;; |
305 | - "EV6.8AL (21264B)") |
306 | - UNAME_MACHINE="alphaev68" ;; |
307 | - "EV6.8CX (21264D)") |
308 | - UNAME_MACHINE="alphaev68" ;; |
309 | - "EV6.9A (21264/EV69A)") |
310 | - UNAME_MACHINE="alphaev69" ;; |
311 | - "EV7 (21364)") |
312 | - UNAME_MACHINE="alphaev7" ;; |
313 | - "EV7.9 (21364A)") |
314 | - UNAME_MACHINE="alphaev79" ;; |
315 | - esac |
316 | - # A Pn.n version is a patched version. |
317 | - # A Vn.n version is a released version. |
318 | - # A Tn.n version is a released field test version. |
319 | - # A Xn.n version is an unreleased experimental baselevel. |
320 | - # 1.2 uses "1.2" for uname -r. |
321 | - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
322 | - exit ;; |
323 | - Alpha\ *:Windows_NT*:*) |
324 | - # How do we know it's Interix rather than the generic POSIX subsystem? |
325 | - # Should we change UNAME_MACHINE based on the output of uname instead |
326 | - # of the specific Alpha model? |
327 | - echo alpha-pc-interix |
328 | - exit ;; |
329 | - 21064:Windows_NT:50:3) |
330 | - echo alpha-dec-winnt3.5 |
331 | - exit ;; |
332 | - Amiga*:UNIX_System_V:4.0:*) |
333 | - echo m68k-unknown-sysv4 |
334 | - exit ;; |
335 | - *:[Aa]miga[Oo][Ss]:*:*) |
336 | - echo ${UNAME_MACHINE}-unknown-amigaos |
337 | - exit ;; |
338 | - *:[Mm]orph[Oo][Ss]:*:*) |
339 | - echo ${UNAME_MACHINE}-unknown-morphos |
340 | - exit ;; |
341 | - *:OS/390:*:*) |
342 | - echo i370-ibm-openedition |
343 | - exit ;; |
344 | - *:z/VM:*:*) |
345 | - echo s390-ibm-zvmoe |
346 | - exit ;; |
347 | - *:OS400:*:*) |
348 | - echo powerpc-ibm-os400 |
349 | - exit ;; |
350 | - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) |
351 | - echo arm-acorn-riscix${UNAME_RELEASE} |
352 | - exit ;; |
353 | - arm:riscos:*:*|arm:RISCOS:*:*) |
354 | - echo arm-unknown-riscos |
355 | - exit ;; |
356 | - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) |
357 | - echo hppa1.1-hitachi-hiuxmpp |
358 | - exit ;; |
359 | - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) |
360 | - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. |
361 | - if test "`(/bin/universe) 2>/dev/null`" = att ; then |
362 | - echo pyramid-pyramid-sysv3 |
363 | - else |
364 | - echo pyramid-pyramid-bsd |
365 | - fi |
366 | - exit ;; |
367 | - NILE*:*:*:dcosx) |
368 | - echo pyramid-pyramid-svr4 |
369 | - exit ;; |
370 | - DRS?6000:unix:4.0:6*) |
371 | - echo sparc-icl-nx6 |
372 | - exit ;; |
373 | - DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) |
374 | - case `/usr/bin/uname -p` in |
375 | - sparc) echo sparc-icl-nx7; exit ;; |
376 | - esac ;; |
377 | - s390x:SunOS:*:*) |
378 | - echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
379 | - exit ;; |
380 | - sun4H:SunOS:5.*:*) |
381 | - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
382 | - exit ;; |
383 | - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) |
384 | - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
385 | - exit ;; |
386 | - i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) |
387 | - echo i386-pc-auroraux${UNAME_RELEASE} |
388 | - exit ;; |
389 | - i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) |
390 | - eval $set_cc_for_build |
391 | - SUN_ARCH="i386" |
392 | - # If there is a compiler, see if it is configured for 64-bit objects. |
393 | - # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. |
394 | - # This test works for both compilers. |
395 | - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then |
396 | - if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ |
397 | - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ |
398 | - grep IS_64BIT_ARCH >/dev/null |
399 | - then |
400 | - SUN_ARCH="x86_64" |
401 | - fi |
402 | - fi |
403 | - echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
404 | - exit ;; |
405 | - sun4*:SunOS:6*:*) |
406 | - # According to config.sub, this is the proper way to canonicalize |
407 | - # SunOS6. Hard to guess exactly what SunOS6 will be like, but |
408 | - # it's likely to be more like Solaris than SunOS4. |
409 | - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
410 | - exit ;; |
411 | - sun4*:SunOS:*:*) |
412 | - case "`/usr/bin/arch -k`" in |
413 | - Series*|S4*) |
414 | - UNAME_RELEASE=`uname -v` |
415 | - ;; |
416 | - esac |
417 | - # Japanese Language versions have a version number like `4.1.3-JL'. |
418 | - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` |
419 | - exit ;; |
420 | - sun3*:SunOS:*:*) |
421 | - echo m68k-sun-sunos${UNAME_RELEASE} |
422 | - exit ;; |
423 | - sun*:*:4.2BSD:*) |
424 | - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` |
425 | - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 |
426 | - case "`/bin/arch`" in |
427 | - sun3) |
428 | - echo m68k-sun-sunos${UNAME_RELEASE} |
429 | - ;; |
430 | - sun4) |
431 | - echo sparc-sun-sunos${UNAME_RELEASE} |
432 | - ;; |
433 | - esac |
434 | - exit ;; |
435 | - aushp:SunOS:*:*) |
436 | - echo sparc-auspex-sunos${UNAME_RELEASE} |
437 | - exit ;; |
438 | - # The situation for MiNT is a little confusing. The machine name |
439 | - # can be virtually everything (everything which is not |
440 | - # "atarist" or "atariste" at least should have a processor |
441 | - # > m68000). The system name ranges from "MiNT" over "FreeMiNT" |
442 | - # to the lowercase version "mint" (or "freemint"). Finally |
443 | - # the system name "TOS" denotes a system which is actually not |
444 | - # MiNT. But MiNT is downward compatible to TOS, so this should |
445 | - # be no problem. |
446 | - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) |
447 | - echo m68k-atari-mint${UNAME_RELEASE} |
448 | - exit ;; |
449 | - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) |
450 | - echo m68k-atari-mint${UNAME_RELEASE} |
451 | - exit ;; |
452 | - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) |
453 | - echo m68k-atari-mint${UNAME_RELEASE} |
454 | - exit ;; |
455 | - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) |
456 | - echo m68k-milan-mint${UNAME_RELEASE} |
457 | - exit ;; |
458 | - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) |
459 | - echo m68k-hades-mint${UNAME_RELEASE} |
460 | - exit ;; |
461 | - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) |
462 | - echo m68k-unknown-mint${UNAME_RELEASE} |
463 | - exit ;; |
464 | - m68k:machten:*:*) |
465 | - echo m68k-apple-machten${UNAME_RELEASE} |
466 | - exit ;; |
467 | - powerpc:machten:*:*) |
468 | - echo powerpc-apple-machten${UNAME_RELEASE} |
469 | - exit ;; |
470 | - RISC*:Mach:*:*) |
471 | - echo mips-dec-mach_bsd4.3 |
472 | - exit ;; |
473 | - RISC*:ULTRIX:*:*) |
474 | - echo mips-dec-ultrix${UNAME_RELEASE} |
475 | - exit ;; |
476 | - VAX*:ULTRIX*:*:*) |
477 | - echo vax-dec-ultrix${UNAME_RELEASE} |
478 | - exit ;; |
479 | - 2020:CLIX:*:* | 2430:CLIX:*:*) |
480 | - echo clipper-intergraph-clix${UNAME_RELEASE} |
481 | - exit ;; |
482 | - mips:*:*:UMIPS | mips:*:*:RISCos) |
483 | - eval $set_cc_for_build |
484 | - sed 's/^ //' << EOF >$dummy.c |
485 | -#ifdef __cplusplus |
486 | -#include <stdio.h> /* for printf() prototype */ |
487 | - int main (int argc, char *argv[]) { |
488 | -#else |
489 | - int main (argc, argv) int argc; char *argv[]; { |
490 | -#endif |
491 | - #if defined (host_mips) && defined (MIPSEB) |
492 | - #if defined (SYSTYPE_SYSV) |
493 | - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); |
494 | - #endif |
495 | - #if defined (SYSTYPE_SVR4) |
496 | - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); |
497 | - #endif |
498 | - #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) |
499 | - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); |
500 | - #endif |
501 | - #endif |
502 | - exit (-1); |
503 | - } |
504 | -EOF |
505 | - $CC_FOR_BUILD -o $dummy $dummy.c && |
506 | - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && |
507 | - SYSTEM_NAME=`$dummy $dummyarg` && |
508 | - { echo "$SYSTEM_NAME"; exit; } |
509 | - echo mips-mips-riscos${UNAME_RELEASE} |
510 | - exit ;; |
511 | - Motorola:PowerMAX_OS:*:*) |
512 | - echo powerpc-motorola-powermax |
513 | - exit ;; |
514 | - Motorola:*:4.3:PL8-*) |
515 | - echo powerpc-harris-powermax |
516 | - exit ;; |
517 | - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) |
518 | - echo powerpc-harris-powermax |
519 | - exit ;; |
520 | - Night_Hawk:Power_UNIX:*:*) |
521 | - echo powerpc-harris-powerunix |
522 | - exit ;; |
523 | - m88k:CX/UX:7*:*) |
524 | - echo m88k-harris-cxux7 |
525 | - exit ;; |
526 | - m88k:*:4*:R4*) |
527 | - echo m88k-motorola-sysv4 |
528 | - exit ;; |
529 | - m88k:*:3*:R3*) |
530 | - echo m88k-motorola-sysv3 |
531 | - exit ;; |
532 | - AViiON:dgux:*:*) |
533 | - # DG/UX returns AViiON for all architectures |
534 | - UNAME_PROCESSOR=`/usr/bin/uname -p` |
535 | - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] |
536 | - then |
537 | - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ |
538 | - [ ${TARGET_BINARY_INTERFACE}x = x ] |
539 | - then |
540 | - echo m88k-dg-dgux${UNAME_RELEASE} |
541 | - else |
542 | - echo m88k-dg-dguxbcs${UNAME_RELEASE} |
543 | - fi |
544 | - else |
545 | - echo i586-dg-dgux${UNAME_RELEASE} |
546 | - fi |
547 | - exit ;; |
548 | - M88*:DolphinOS:*:*) # DolphinOS (SVR3) |
549 | - echo m88k-dolphin-sysv3 |
550 | - exit ;; |
551 | - M88*:*:R3*:*) |
552 | - # Delta 88k system running SVR3 |
553 | - echo m88k-motorola-sysv3 |
554 | - exit ;; |
555 | - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) |
556 | - echo m88k-tektronix-sysv3 |
557 | - exit ;; |
558 | - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) |
559 | - echo m68k-tektronix-bsd |
560 | - exit ;; |
561 | - *:IRIX*:*:*) |
562 | - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` |
563 | - exit ;; |
564 | - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. |
565 | - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id |
566 | - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' |
567 | - i*86:AIX:*:*) |
568 | - echo i386-ibm-aix |
569 | - exit ;; |
570 | - ia64:AIX:*:*) |
571 | - if [ -x /usr/bin/oslevel ] ; then |
572 | - IBM_REV=`/usr/bin/oslevel` |
573 | - else |
574 | - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} |
575 | - fi |
576 | - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} |
577 | - exit ;; |
578 | - *:AIX:2:3) |
579 | - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then |
580 | - eval $set_cc_for_build |
581 | - sed 's/^ //' << EOF >$dummy.c |
582 | - #include <sys/systemcfg.h> |
583 | - |
584 | - main() |
585 | - { |
586 | - if (!__power_pc()) |
587 | - exit(1); |
588 | - puts("powerpc-ibm-aix3.2.5"); |
589 | - exit(0); |
590 | - } |
591 | -EOF |
592 | - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` |
593 | - then |
594 | - echo "$SYSTEM_NAME" |
595 | - else |
596 | - echo rs6000-ibm-aix3.2.5 |
597 | - fi |
598 | - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then |
599 | - echo rs6000-ibm-aix3.2.4 |
600 | - else |
601 | - echo rs6000-ibm-aix3.2 |
602 | - fi |
603 | - exit ;; |
604 | - *:AIX:*:[456]) |
605 | - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` |
606 | - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then |
607 | - IBM_ARCH=rs6000 |
608 | - else |
609 | - IBM_ARCH=powerpc |
610 | - fi |
611 | - if [ -x /usr/bin/oslevel ] ; then |
612 | - IBM_REV=`/usr/bin/oslevel` |
613 | - else |
614 | - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} |
615 | - fi |
616 | - echo ${IBM_ARCH}-ibm-aix${IBM_REV} |
617 | - exit ;; |
618 | - *:AIX:*:*) |
619 | - echo rs6000-ibm-aix |
620 | - exit ;; |
621 | - ibmrt:4.4BSD:*|romp-ibm:BSD:*) |
622 | - echo romp-ibm-bsd4.4 |
623 | - exit ;; |
624 | - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and |
625 | - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to |
626 | - exit ;; # report: romp-ibm BSD 4.3 |
627 | - *:BOSX:*:*) |
628 | - echo rs6000-bull-bosx |
629 | - exit ;; |
630 | - DPX/2?00:B.O.S.:*:*) |
631 | - echo m68k-bull-sysv3 |
632 | - exit ;; |
633 | - 9000/[34]??:4.3bsd:1.*:*) |
634 | - echo m68k-hp-bsd |
635 | - exit ;; |
636 | - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) |
637 | - echo m68k-hp-bsd4.4 |
638 | - exit ;; |
639 | - 9000/[34678]??:HP-UX:*:*) |
640 | - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` |
641 | - case "${UNAME_MACHINE}" in |
642 | - 9000/31? ) HP_ARCH=m68000 ;; |
643 | - 9000/[34]?? ) HP_ARCH=m68k ;; |
644 | - 9000/[678][0-9][0-9]) |
645 | - if [ -x /usr/bin/getconf ]; then |
646 | - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` |
647 | - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` |
648 | - case "${sc_cpu_version}" in |
649 | - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 |
650 | - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 |
651 | - 532) # CPU_PA_RISC2_0 |
652 | - case "${sc_kernel_bits}" in |
653 | - 32) HP_ARCH="hppa2.0n" ;; |
654 | - 64) HP_ARCH="hppa2.0w" ;; |
655 | - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 |
656 | - esac ;; |
657 | - esac |
658 | - fi |
659 | - if [ "${HP_ARCH}" = "" ]; then |
660 | - eval $set_cc_for_build |
661 | - sed 's/^ //' << EOF >$dummy.c |
662 | - |
663 | - #define _HPUX_SOURCE |
664 | - #include <stdlib.h> |
665 | - #include <unistd.h> |
666 | - |
667 | - int main () |
668 | - { |
669 | - #if defined(_SC_KERNEL_BITS) |
670 | - long bits = sysconf(_SC_KERNEL_BITS); |
671 | - #endif |
672 | - long cpu = sysconf (_SC_CPU_VERSION); |
673 | - |
674 | - switch (cpu) |
675 | - { |
676 | - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; |
677 | - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; |
678 | - case CPU_PA_RISC2_0: |
679 | - #if defined(_SC_KERNEL_BITS) |
680 | - switch (bits) |
681 | - { |
682 | - case 64: puts ("hppa2.0w"); break; |
683 | - case 32: puts ("hppa2.0n"); break; |
684 | - default: puts ("hppa2.0"); break; |
685 | - } break; |
686 | - #else /* !defined(_SC_KERNEL_BITS) */ |
687 | - puts ("hppa2.0"); break; |
688 | - #endif |
689 | - default: puts ("hppa1.0"); break; |
690 | - } |
691 | - exit (0); |
692 | - } |
693 | -EOF |
694 | - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` |
695 | - test -z "$HP_ARCH" && HP_ARCH=hppa |
696 | - fi ;; |
697 | - esac |
698 | - if [ ${HP_ARCH} = "hppa2.0w" ] |
699 | - then |
700 | - eval $set_cc_for_build |
701 | - |
702 | - # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating |
703 | - # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler |
704 | - # generating 64-bit code. GNU and HP use different nomenclature: |
705 | - # |
706 | - # $ CC_FOR_BUILD=cc ./config.guess |
707 | - # => hppa2.0w-hp-hpux11.23 |
708 | - # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess |
709 | - # => hppa64-hp-hpux11.23 |
710 | - |
711 | - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | |
712 | - grep -q __LP64__ |
713 | - then |
714 | - HP_ARCH="hppa2.0w" |
715 | - else |
716 | - HP_ARCH="hppa64" |
717 | - fi |
718 | - fi |
719 | - echo ${HP_ARCH}-hp-hpux${HPUX_REV} |
720 | - exit ;; |
721 | - ia64:HP-UX:*:*) |
722 | - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` |
723 | - echo ia64-hp-hpux${HPUX_REV} |
724 | - exit ;; |
725 | - 3050*:HI-UX:*:*) |
726 | - eval $set_cc_for_build |
727 | - sed 's/^ //' << EOF >$dummy.c |
728 | - #include <unistd.h> |
729 | - int |
730 | - main () |
731 | - { |
732 | - long cpu = sysconf (_SC_CPU_VERSION); |
733 | - /* The order matters, because CPU_IS_HP_MC68K erroneously returns |
734 | - true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct |
735 | - results, however. */ |
736 | - if (CPU_IS_PA_RISC (cpu)) |
737 | - { |
738 | - switch (cpu) |
739 | - { |
740 | - case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; |
741 | - case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; |
742 | - case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; |
743 | - default: puts ("hppa-hitachi-hiuxwe2"); break; |
744 | - } |
745 | - } |
746 | - else if (CPU_IS_HP_MC68K (cpu)) |
747 | - puts ("m68k-hitachi-hiuxwe2"); |
748 | - else puts ("unknown-hitachi-hiuxwe2"); |
749 | - exit (0); |
750 | - } |
751 | -EOF |
752 | - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && |
753 | - { echo "$SYSTEM_NAME"; exit; } |
754 | - echo unknown-hitachi-hiuxwe2 |
755 | - exit ;; |
756 | - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) |
757 | - echo hppa1.1-hp-bsd |
758 | - exit ;; |
759 | - 9000/8??:4.3bsd:*:*) |
760 | - echo hppa1.0-hp-bsd |
761 | - exit ;; |
762 | - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) |
763 | - echo hppa1.0-hp-mpeix |
764 | - exit ;; |
765 | - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) |
766 | - echo hppa1.1-hp-osf |
767 | - exit ;; |
768 | - hp8??:OSF1:*:*) |
769 | - echo hppa1.0-hp-osf |
770 | - exit ;; |
771 | - i*86:OSF1:*:*) |
772 | - if [ -x /usr/sbin/sysversion ] ; then |
773 | - echo ${UNAME_MACHINE}-unknown-osf1mk |
774 | - else |
775 | - echo ${UNAME_MACHINE}-unknown-osf1 |
776 | - fi |
777 | - exit ;; |
778 | - parisc*:Lites*:*:*) |
779 | - echo hppa1.1-hp-lites |
780 | - exit ;; |
781 | - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) |
782 | - echo c1-convex-bsd |
783 | - exit ;; |
784 | - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) |
785 | - if getsysinfo -f scalar_acc |
786 | - then echo c32-convex-bsd |
787 | - else echo c2-convex-bsd |
788 | - fi |
789 | - exit ;; |
790 | - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) |
791 | - echo c34-convex-bsd |
792 | - exit ;; |
793 | - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) |
794 | - echo c38-convex-bsd |
795 | - exit ;; |
796 | - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) |
797 | - echo c4-convex-bsd |
798 | - exit ;; |
799 | - CRAY*Y-MP:*:*:*) |
800 | - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
801 | - exit ;; |
802 | - CRAY*[A-Z]90:*:*:*) |
803 | - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ |
804 | - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ |
805 | - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ |
806 | - -e 's/\.[^.]*$/.X/' |
807 | - exit ;; |
808 | - CRAY*TS:*:*:*) |
809 | - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
810 | - exit ;; |
811 | - CRAY*T3E:*:*:*) |
812 | - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
813 | - exit ;; |
814 | - CRAY*SV1:*:*:*) |
815 | - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
816 | - exit ;; |
817 | - *:UNICOS/mp:*:*) |
818 | - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
819 | - exit ;; |
820 | - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) |
821 | - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
822 | - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
823 | - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` |
824 | - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
825 | - exit ;; |
826 | - 5000:UNIX_System_V:4.*:*) |
827 | - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
828 | - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` |
829 | - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
830 | - exit ;; |
831 | - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) |
832 | - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} |
833 | - exit ;; |
834 | - sparc*:BSD/OS:*:*) |
835 | - echo sparc-unknown-bsdi${UNAME_RELEASE} |
836 | - exit ;; |
837 | - *:BSD/OS:*:*) |
838 | - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} |
839 | - exit ;; |
840 | - *:FreeBSD:*:*) |
841 | - case ${UNAME_MACHINE} in |
842 | - pc98) |
843 | - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
844 | - amd64) |
845 | - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
846 | - *) |
847 | - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
848 | - esac |
849 | - exit ;; |
850 | - i*:CYGWIN*:*) |
851 | - echo ${UNAME_MACHINE}-pc-cygwin |
852 | - exit ;; |
853 | - *:MINGW*:*) |
854 | - echo ${UNAME_MACHINE}-pc-mingw32 |
855 | - exit ;; |
856 | - i*:windows32*:*) |
857 | - # uname -m includes "-pc" on this system. |
858 | - echo ${UNAME_MACHINE}-mingw32 |
859 | - exit ;; |
860 | - i*:PW*:*) |
861 | - echo ${UNAME_MACHINE}-pc-pw32 |
862 | - exit ;; |
863 | - *:Interix*:*) |
864 | - case ${UNAME_MACHINE} in |
865 | - x86) |
866 | - echo i586-pc-interix${UNAME_RELEASE} |
867 | - exit ;; |
868 | - authenticamd | genuineintel | EM64T) |
869 | - echo x86_64-unknown-interix${UNAME_RELEASE} |
870 | - exit ;; |
871 | - IA64) |
872 | - echo ia64-unknown-interix${UNAME_RELEASE} |
873 | - exit ;; |
874 | - esac ;; |
875 | - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) |
876 | - echo i${UNAME_MACHINE}-pc-mks |
877 | - exit ;; |
878 | - 8664:Windows_NT:*) |
879 | - echo x86_64-pc-mks |
880 | - exit ;; |
881 | - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) |
882 | - # How do we know it's Interix rather than the generic POSIX subsystem? |
883 | - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we |
884 | - # UNAME_MACHINE based on the output of uname instead of i386? |
885 | - echo i586-pc-interix |
886 | - exit ;; |
887 | - i*:UWIN*:*) |
888 | - echo ${UNAME_MACHINE}-pc-uwin |
889 | - exit ;; |
890 | - amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) |
891 | - echo x86_64-unknown-cygwin |
892 | - exit ;; |
893 | - p*:CYGWIN*:*) |
894 | - echo powerpcle-unknown-cygwin |
895 | - exit ;; |
896 | - prep*:SunOS:5.*:*) |
897 | - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
898 | - exit ;; |
899 | - *:GNU:*:*) |
900 | - # the GNU system |
901 | - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` |
902 | - exit ;; |
903 | - *:GNU/*:*:*) |
904 | - # other systems with GNU libc and userland |
905 | - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu |
906 | - exit ;; |
907 | - i*86:Minix:*:*) |
908 | - echo ${UNAME_MACHINE}-pc-minix |
909 | - exit ;; |
910 | - alpha:Linux:*:*) |
911 | - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in |
912 | - EV5) UNAME_MACHINE=alphaev5 ;; |
913 | - EV56) UNAME_MACHINE=alphaev56 ;; |
914 | - PCA56) UNAME_MACHINE=alphapca56 ;; |
915 | - PCA57) UNAME_MACHINE=alphapca56 ;; |
916 | - EV6) UNAME_MACHINE=alphaev6 ;; |
917 | - EV67) UNAME_MACHINE=alphaev67 ;; |
918 | - EV68*) UNAME_MACHINE=alphaev68 ;; |
919 | - esac |
920 | - objdump --private-headers /bin/sh | grep -q ld.so.1 |
921 | - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi |
922 | - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} |
923 | - exit ;; |
924 | - arm*:Linux:*:*) |
925 | - eval $set_cc_for_build |
926 | - if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
927 | - | grep -q __ARM_EABI__ |
928 | - then |
929 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
930 | - else |
931 | - echo ${UNAME_MACHINE}-unknown-linux-gnueabi |
932 | - fi |
933 | - exit ;; |
934 | - avr32*:Linux:*:*) |
935 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
936 | - exit ;; |
937 | - cris:Linux:*:*) |
938 | - echo cris-axis-linux-gnu |
939 | - exit ;; |
940 | - crisv32:Linux:*:*) |
941 | - echo crisv32-axis-linux-gnu |
942 | - exit ;; |
943 | - frv:Linux:*:*) |
944 | - echo frv-unknown-linux-gnu |
945 | - exit ;; |
946 | - i*86:Linux:*:*) |
947 | - LIBC=gnu |
948 | - eval $set_cc_for_build |
949 | - sed 's/^ //' << EOF >$dummy.c |
950 | - #ifdef __dietlibc__ |
951 | - LIBC=dietlibc |
952 | - #endif |
953 | -EOF |
954 | - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` |
955 | - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" |
956 | - exit ;; |
957 | - ia64:Linux:*:*) |
958 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
959 | - exit ;; |
960 | - m32r*:Linux:*:*) |
961 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
962 | - exit ;; |
963 | - m68*:Linux:*:*) |
964 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
965 | - exit ;; |
966 | - mips:Linux:*:* | mips64:Linux:*:*) |
967 | - eval $set_cc_for_build |
968 | - sed 's/^ //' << EOF >$dummy.c |
969 | - #undef CPU |
970 | - #undef ${UNAME_MACHINE} |
971 | - #undef ${UNAME_MACHINE}el |
972 | - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) |
973 | - CPU=${UNAME_MACHINE}el |
974 | - #else |
975 | - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) |
976 | - CPU=${UNAME_MACHINE} |
977 | - #else |
978 | - CPU= |
979 | - #endif |
980 | - #endif |
981 | -EOF |
982 | - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` |
983 | - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } |
984 | - ;; |
985 | - or32:Linux:*:*) |
986 | - echo or32-unknown-linux-gnu |
987 | - exit ;; |
988 | - padre:Linux:*:*) |
989 | - echo sparc-unknown-linux-gnu |
990 | - exit ;; |
991 | - parisc64:Linux:*:* | hppa64:Linux:*:*) |
992 | - echo hppa64-unknown-linux-gnu |
993 | - exit ;; |
994 | - parisc:Linux:*:* | hppa:Linux:*:*) |
995 | - # Look for CPU level |
996 | - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in |
997 | - PA7*) echo hppa1.1-unknown-linux-gnu ;; |
998 | - PA8*) echo hppa2.0-unknown-linux-gnu ;; |
999 | - *) echo hppa-unknown-linux-gnu ;; |
1000 | - esac |
1001 | - exit ;; |
1002 | - ppc64:Linux:*:*) |
1003 | - echo powerpc64-unknown-linux-gnu |
1004 | - exit ;; |
1005 | - ppc:Linux:*:*) |
1006 | - echo powerpc-unknown-linux-gnu |
1007 | - exit ;; |
1008 | - s390:Linux:*:* | s390x:Linux:*:*) |
1009 | - echo ${UNAME_MACHINE}-ibm-linux |
1010 | - exit ;; |
1011 | - sh64*:Linux:*:*) |
1012 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
1013 | - exit ;; |
1014 | - sh*:Linux:*:*) |
1015 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
1016 | - exit ;; |
1017 | - sparc:Linux:*:* | sparc64:Linux:*:*) |
1018 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
1019 | - exit ;; |
1020 | - vax:Linux:*:*) |
1021 | - echo ${UNAME_MACHINE}-dec-linux-gnu |
1022 | - exit ;; |
1023 | - x86_64:Linux:*:*) |
1024 | - echo x86_64-unknown-linux-gnu |
1025 | - exit ;; |
1026 | - xtensa*:Linux:*:*) |
1027 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
1028 | - exit ;; |
1029 | - i*86:DYNIX/ptx:4*:*) |
1030 | - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. |
1031 | - # earlier versions are messed up and put the nodename in both |
1032 | - # sysname and nodename. |
1033 | - echo i386-sequent-sysv4 |
1034 | - exit ;; |
1035 | - i*86:UNIX_SV:4.2MP:2.*) |
1036 | - # Unixware is an offshoot of SVR4, but it has its own version |
1037 | - # number series starting with 2... |
1038 | - # I am not positive that other SVR4 systems won't match this, |
1039 | - # I just have to hope. -- rms. |
1040 | - # Use sysv4.2uw... so that sysv4* matches it. |
1041 | - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} |
1042 | - exit ;; |
1043 | - i*86:OS/2:*:*) |
1044 | - # If we were able to find `uname', then EMX Unix compatibility |
1045 | - # is probably installed. |
1046 | - echo ${UNAME_MACHINE}-pc-os2-emx |
1047 | - exit ;; |
1048 | - i*86:XTS-300:*:STOP) |
1049 | - echo ${UNAME_MACHINE}-unknown-stop |
1050 | - exit ;; |
1051 | - i*86:atheos:*:*) |
1052 | - echo ${UNAME_MACHINE}-unknown-atheos |
1053 | - exit ;; |
1054 | - i*86:syllable:*:*) |
1055 | - echo ${UNAME_MACHINE}-pc-syllable |
1056 | - exit ;; |
1057 | - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) |
1058 | - echo i386-unknown-lynxos${UNAME_RELEASE} |
1059 | - exit ;; |
1060 | - i*86:*DOS:*:*) |
1061 | - echo ${UNAME_MACHINE}-pc-msdosdjgpp |
1062 | - exit ;; |
1063 | - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) |
1064 | - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` |
1065 | - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then |
1066 | - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} |
1067 | - else |
1068 | - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} |
1069 | - fi |
1070 | - exit ;; |
1071 | - i*86:*:5:[678]*) |
1072 | - # UnixWare 7.x, OpenUNIX and OpenServer 6. |
1073 | - case `/bin/uname -X | grep "^Machine"` in |
1074 | - *486*) UNAME_MACHINE=i486 ;; |
1075 | - *Pentium) UNAME_MACHINE=i586 ;; |
1076 | - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; |
1077 | - esac |
1078 | - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} |
1079 | - exit ;; |
1080 | - i*86:*:3.2:*) |
1081 | - if test -f /usr/options/cb.name; then |
1082 | - UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` |
1083 | - echo ${UNAME_MACHINE}-pc-isc$UNAME_REL |
1084 | - elif /bin/uname -X 2>/dev/null >/dev/null ; then |
1085 | - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` |
1086 | - (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 |
1087 | - (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ |
1088 | - && UNAME_MACHINE=i586 |
1089 | - (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ |
1090 | - && UNAME_MACHINE=i686 |
1091 | - (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ |
1092 | - && UNAME_MACHINE=i686 |
1093 | - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL |
1094 | - else |
1095 | - echo ${UNAME_MACHINE}-pc-sysv32 |
1096 | - fi |
1097 | - exit ;; |
1098 | - pc:*:*:*) |
1099 | - # Left here for compatibility: |
1100 | - # uname -m prints for DJGPP always 'pc', but it prints nothing about |
1101 | - # the processor, so we play safe by assuming i586. |
1102 | - # Note: whatever this is, it MUST be the same as what config.sub |
1103 | - # prints for the "djgpp" host, or else GDB configury will decide that |
1104 | - # this is a cross-build. |
1105 | - echo i586-pc-msdosdjgpp |
1106 | - exit ;; |
1107 | - Intel:Mach:3*:*) |
1108 | - echo i386-pc-mach3 |
1109 | - exit ;; |
1110 | - paragon:*:*:*) |
1111 | - echo i860-intel-osf1 |
1112 | - exit ;; |
1113 | - i860:*:4.*:*) # i860-SVR4 |
1114 | - if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then |
1115 | - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 |
1116 | - else # Add other i860-SVR4 vendors below as they are discovered. |
1117 | - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 |
1118 | - fi |
1119 | - exit ;; |
1120 | - mini*:CTIX:SYS*5:*) |
1121 | - # "miniframe" |
1122 | - echo m68010-convergent-sysv |
1123 | - exit ;; |
1124 | - mc68k:UNIX:SYSTEM5:3.51m) |
1125 | - echo m68k-convergent-sysv |
1126 | - exit ;; |
1127 | - M680?0:D-NIX:5.3:*) |
1128 | - echo m68k-diab-dnix |
1129 | - exit ;; |
1130 | - M68*:*:R3V[5678]*:*) |
1131 | - test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; |
1132 | - 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) |
1133 | - OS_REL='' |
1134 | - test -r /etc/.relid \ |
1135 | - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` |
1136 | - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
1137 | - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } |
1138 | - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ |
1139 | - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; |
1140 | - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) |
1141 | - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
1142 | - && { echo i486-ncr-sysv4; exit; } ;; |
1143 | - NCR*:*:4.2:* | MPRAS*:*:4.2:*) |
1144 | - OS_REL='.3' |
1145 | - test -r /etc/.relid \ |
1146 | - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` |
1147 | - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
1148 | - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } |
1149 | - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ |
1150 | - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } |
1151 | - /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ |
1152 | - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; |
1153 | - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) |
1154 | - echo m68k-unknown-lynxos${UNAME_RELEASE} |
1155 | - exit ;; |
1156 | - mc68030:UNIX_System_V:4.*:*) |
1157 | - echo m68k-atari-sysv4 |
1158 | - exit ;; |
1159 | - TSUNAMI:LynxOS:2.*:*) |
1160 | - echo sparc-unknown-lynxos${UNAME_RELEASE} |
1161 | - exit ;; |
1162 | - rs6000:LynxOS:2.*:*) |
1163 | - echo rs6000-unknown-lynxos${UNAME_RELEASE} |
1164 | - exit ;; |
1165 | - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) |
1166 | - echo powerpc-unknown-lynxos${UNAME_RELEASE} |
1167 | - exit ;; |
1168 | - SM[BE]S:UNIX_SV:*:*) |
1169 | - echo mips-dde-sysv${UNAME_RELEASE} |
1170 | - exit ;; |
1171 | - RM*:ReliantUNIX-*:*:*) |
1172 | - echo mips-sni-sysv4 |
1173 | - exit ;; |
1174 | - RM*:SINIX-*:*:*) |
1175 | - echo mips-sni-sysv4 |
1176 | - exit ;; |
1177 | - *:SINIX-*:*:*) |
1178 | - if uname -p 2>/dev/null >/dev/null ; then |
1179 | - UNAME_MACHINE=`(uname -p) 2>/dev/null` |
1180 | - echo ${UNAME_MACHINE}-sni-sysv4 |
1181 | - else |
1182 | - echo ns32k-sni-sysv |
1183 | - fi |
1184 | - exit ;; |
1185 | - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort |
1186 | - # says <Richard.M.Bartel@ccMail.Census.GOV> |
1187 | - echo i586-unisys-sysv4 |
1188 | - exit ;; |
1189 | - *:UNIX_System_V:4*:FTX*) |
1190 | - # From Gerald Hewes <hewes@openmarket.com>. |
1191 | - # How about differentiating between stratus architectures? -djm |
1192 | - echo hppa1.1-stratus-sysv4 |
1193 | - exit ;; |
1194 | - *:*:*:FTX*) |
1195 | - # From seanf@swdc.stratus.com. |
1196 | - echo i860-stratus-sysv4 |
1197 | - exit ;; |
1198 | - i*86:VOS:*:*) |
1199 | - # From Paul.Green@stratus.com. |
1200 | - echo ${UNAME_MACHINE}-stratus-vos |
1201 | - exit ;; |
1202 | - *:VOS:*:*) |
1203 | - # From Paul.Green@stratus.com. |
1204 | - echo hppa1.1-stratus-vos |
1205 | - exit ;; |
1206 | - mc68*:A/UX:*:*) |
1207 | - echo m68k-apple-aux${UNAME_RELEASE} |
1208 | - exit ;; |
1209 | - news*:NEWS-OS:6*:*) |
1210 | - echo mips-sony-newsos6 |
1211 | - exit ;; |
1212 | - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) |
1213 | - if [ -d /usr/nec ]; then |
1214 | - echo mips-nec-sysv${UNAME_RELEASE} |
1215 | - else |
1216 | - echo mips-unknown-sysv${UNAME_RELEASE} |
1217 | - fi |
1218 | - exit ;; |
1219 | - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. |
1220 | - echo powerpc-be-beos |
1221 | - exit ;; |
1222 | - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. |
1223 | - echo powerpc-apple-beos |
1224 | - exit ;; |
1225 | - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. |
1226 | - echo i586-pc-beos |
1227 | - exit ;; |
1228 | - BePC:Haiku:*:*) # Haiku running on Intel PC compatible. |
1229 | - echo i586-pc-haiku |
1230 | - exit ;; |
1231 | - SX-4:SUPER-UX:*:*) |
1232 | - echo sx4-nec-superux${UNAME_RELEASE} |
1233 | - exit ;; |
1234 | - SX-5:SUPER-UX:*:*) |
1235 | - echo sx5-nec-superux${UNAME_RELEASE} |
1236 | - exit ;; |
1237 | - SX-6:SUPER-UX:*:*) |
1238 | - echo sx6-nec-superux${UNAME_RELEASE} |
1239 | - exit ;; |
1240 | - SX-7:SUPER-UX:*:*) |
1241 | - echo sx7-nec-superux${UNAME_RELEASE} |
1242 | - exit ;; |
1243 | - SX-8:SUPER-UX:*:*) |
1244 | - echo sx8-nec-superux${UNAME_RELEASE} |
1245 | - exit ;; |
1246 | - SX-8R:SUPER-UX:*:*) |
1247 | - echo sx8r-nec-superux${UNAME_RELEASE} |
1248 | - exit ;; |
1249 | - Power*:Rhapsody:*:*) |
1250 | - echo powerpc-apple-rhapsody${UNAME_RELEASE} |
1251 | - exit ;; |
1252 | - *:Rhapsody:*:*) |
1253 | - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} |
1254 | - exit ;; |
1255 | - *:Darwin:*:*) |
1256 | - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown |
1257 | - case $UNAME_PROCESSOR in |
1258 | - i386) |
1259 | - eval $set_cc_for_build |
1260 | - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then |
1261 | - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ |
1262 | - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ |
1263 | - grep IS_64BIT_ARCH >/dev/null |
1264 | - then |
1265 | - UNAME_PROCESSOR="x86_64" |
1266 | - fi |
1267 | - fi ;; |
1268 | - unknown) UNAME_PROCESSOR=powerpc ;; |
1269 | - esac |
1270 | - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} |
1271 | - exit ;; |
1272 | - *:procnto*:*:* | *:QNX:[0123456789]*:*) |
1273 | - UNAME_PROCESSOR=`uname -p` |
1274 | - if test "$UNAME_PROCESSOR" = "x86"; then |
1275 | - UNAME_PROCESSOR=i386 |
1276 | - UNAME_MACHINE=pc |
1277 | - fi |
1278 | - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} |
1279 | - exit ;; |
1280 | - *:QNX:*:4*) |
1281 | - echo i386-pc-qnx |
1282 | - exit ;; |
1283 | - NSE-?:NONSTOP_KERNEL:*:*) |
1284 | - echo nse-tandem-nsk${UNAME_RELEASE} |
1285 | - exit ;; |
1286 | - NSR-?:NONSTOP_KERNEL:*:*) |
1287 | - echo nsr-tandem-nsk${UNAME_RELEASE} |
1288 | - exit ;; |
1289 | - *:NonStop-UX:*:*) |
1290 | - echo mips-compaq-nonstopux |
1291 | - exit ;; |
1292 | - BS2000:POSIX*:*:*) |
1293 | - echo bs2000-siemens-sysv |
1294 | - exit ;; |
1295 | - DS/*:UNIX_System_V:*:*) |
1296 | - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} |
1297 | - exit ;; |
1298 | - *:Plan9:*:*) |
1299 | - # "uname -m" is not consistent, so use $cputype instead. 386 |
1300 | - # is converted to i386 for consistency with other x86 |
1301 | - # operating systems. |
1302 | - if test "$cputype" = "386"; then |
1303 | - UNAME_MACHINE=i386 |
1304 | - else |
1305 | - UNAME_MACHINE="$cputype" |
1306 | - fi |
1307 | - echo ${UNAME_MACHINE}-unknown-plan9 |
1308 | - exit ;; |
1309 | - *:TOPS-10:*:*) |
1310 | - echo pdp10-unknown-tops10 |
1311 | - exit ;; |
1312 | - *:TENEX:*:*) |
1313 | - echo pdp10-unknown-tenex |
1314 | - exit ;; |
1315 | - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) |
1316 | - echo pdp10-dec-tops20 |
1317 | - exit ;; |
1318 | - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) |
1319 | - echo pdp10-xkl-tops20 |
1320 | - exit ;; |
1321 | - *:TOPS-20:*:*) |
1322 | - echo pdp10-unknown-tops20 |
1323 | - exit ;; |
1324 | - *:ITS:*:*) |
1325 | - echo pdp10-unknown-its |
1326 | - exit ;; |
1327 | - SEI:*:*:SEIUX) |
1328 | - echo mips-sei-seiux${UNAME_RELEASE} |
1329 | - exit ;; |
1330 | - *:DragonFly:*:*) |
1331 | - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` |
1332 | - exit ;; |
1333 | - *:*VMS:*:*) |
1334 | - UNAME_MACHINE=`(uname -p) 2>/dev/null` |
1335 | - case "${UNAME_MACHINE}" in |
1336 | - A*) echo alpha-dec-vms ; exit ;; |
1337 | - I*) echo ia64-dec-vms ; exit ;; |
1338 | - V*) echo vax-dec-vms ; exit ;; |
1339 | - esac ;; |
1340 | - *:XENIX:*:SysV) |
1341 | - echo i386-pc-xenix |
1342 | - exit ;; |
1343 | - i*86:skyos:*:*) |
1344 | - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' |
1345 | - exit ;; |
1346 | - i*86:rdos:*:*) |
1347 | - echo ${UNAME_MACHINE}-pc-rdos |
1348 | - exit ;; |
1349 | - i*86:AROS:*:*) |
1350 | - echo ${UNAME_MACHINE}-pc-aros |
1351 | - exit ;; |
1352 | -esac |
1353 | - |
1354 | -#echo '(No uname command or uname output not recognized.)' 1>&2 |
1355 | -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 |
1356 | - |
1357 | -eval $set_cc_for_build |
1358 | -cat >$dummy.c <<EOF |
1359 | -#ifdef _SEQUENT_ |
1360 | -# include <sys/types.h> |
1361 | -# include <sys/utsname.h> |
1362 | -#endif |
1363 | -main () |
1364 | -{ |
1365 | -#if defined (sony) |
1366 | -#if defined (MIPSEB) |
1367 | - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, |
1368 | - I don't know.... */ |
1369 | - printf ("mips-sony-bsd\n"); exit (0); |
1370 | -#else |
1371 | -#include <sys/param.h> |
1372 | - printf ("m68k-sony-newsos%s\n", |
1373 | -#ifdef NEWSOS4 |
1374 | - "4" |
1375 | -#else |
1376 | - "" |
1377 | -#endif |
1378 | - ); exit (0); |
1379 | -#endif |
1380 | -#endif |
1381 | - |
1382 | -#if defined (__arm) && defined (__acorn) && defined (__unix) |
1383 | - printf ("arm-acorn-riscix\n"); exit (0); |
1384 | -#endif |
1385 | - |
1386 | -#if defined (hp300) && !defined (hpux) |
1387 | - printf ("m68k-hp-bsd\n"); exit (0); |
1388 | -#endif |
1389 | - |
1390 | -#if defined (NeXT) |
1391 | -#if !defined (__ARCHITECTURE__) |
1392 | -#define __ARCHITECTURE__ "m68k" |
1393 | -#endif |
1394 | - int version; |
1395 | - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; |
1396 | - if (version < 4) |
1397 | - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); |
1398 | - else |
1399 | - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); |
1400 | - exit (0); |
1401 | -#endif |
1402 | - |
1403 | -#if defined (MULTIMAX) || defined (n16) |
1404 | -#if defined (UMAXV) |
1405 | - printf ("ns32k-encore-sysv\n"); exit (0); |
1406 | -#else |
1407 | -#if defined (CMU) |
1408 | - printf ("ns32k-encore-mach\n"); exit (0); |
1409 | -#else |
1410 | - printf ("ns32k-encore-bsd\n"); exit (0); |
1411 | -#endif |
1412 | -#endif |
1413 | -#endif |
1414 | - |
1415 | -#if defined (__386BSD__) |
1416 | - printf ("i386-pc-bsd\n"); exit (0); |
1417 | -#endif |
1418 | - |
1419 | -#if defined (sequent) |
1420 | -#if defined (i386) |
1421 | - printf ("i386-sequent-dynix\n"); exit (0); |
1422 | -#endif |
1423 | -#if defined (ns32000) |
1424 | - printf ("ns32k-sequent-dynix\n"); exit (0); |
1425 | -#endif |
1426 | -#endif |
1427 | - |
1428 | -#if defined (_SEQUENT_) |
1429 | - struct utsname un; |
1430 | - |
1431 | - uname(&un); |
1432 | - |
1433 | - if (strncmp(un.version, "V2", 2) == 0) { |
1434 | - printf ("i386-sequent-ptx2\n"); exit (0); |
1435 | - } |
1436 | - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ |
1437 | - printf ("i386-sequent-ptx1\n"); exit (0); |
1438 | - } |
1439 | - printf ("i386-sequent-ptx\n"); exit (0); |
1440 | - |
1441 | -#endif |
1442 | - |
1443 | -#if defined (vax) |
1444 | -# if !defined (ultrix) |
1445 | -# include <sys/param.h> |
1446 | -# if defined (BSD) |
1447 | -# if BSD == 43 |
1448 | - printf ("vax-dec-bsd4.3\n"); exit (0); |
1449 | -# else |
1450 | -# if BSD == 199006 |
1451 | - printf ("vax-dec-bsd4.3reno\n"); exit (0); |
1452 | -# else |
1453 | - printf ("vax-dec-bsd\n"); exit (0); |
1454 | -# endif |
1455 | -# endif |
1456 | -# else |
1457 | - printf ("vax-dec-bsd\n"); exit (0); |
1458 | -# endif |
1459 | -# else |
1460 | - printf ("vax-dec-ultrix\n"); exit (0); |
1461 | -# endif |
1462 | -#endif |
1463 | - |
1464 | -#if defined (alliant) && defined (i860) |
1465 | - printf ("i860-alliant-bsd\n"); exit (0); |
1466 | -#endif |
1467 | - |
1468 | - exit (1); |
1469 | -} |
1470 | -EOF |
1471 | - |
1472 | -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && |
1473 | - { echo "$SYSTEM_NAME"; exit; } |
1474 | - |
1475 | -# Apollos put the system type in the environment. |
1476 | - |
1477 | -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } |
1478 | - |
1479 | -# Convex versions that predate uname can use getsysinfo(1) |
1480 | - |
1481 | -if [ -x /usr/convex/getsysinfo ] |
1482 | -then |
1483 | - case `getsysinfo -f cpu_type` in |
1484 | - c1*) |
1485 | - echo c1-convex-bsd |
1486 | - exit ;; |
1487 | - c2*) |
1488 | - if getsysinfo -f scalar_acc |
1489 | - then echo c32-convex-bsd |
1490 | - else echo c2-convex-bsd |
1491 | - fi |
1492 | - exit ;; |
1493 | - c34*) |
1494 | - echo c34-convex-bsd |
1495 | - exit ;; |
1496 | - c38*) |
1497 | - echo c38-convex-bsd |
1498 | - exit ;; |
1499 | - c4*) |
1500 | - echo c4-convex-bsd |
1501 | - exit ;; |
1502 | - esac |
1503 | -fi |
1504 | - |
1505 | -cat >&2 <<EOF |
1506 | -$0: unable to guess system type |
1507 | - |
1508 | -This script, last modified $timestamp, has failed to recognize |
1509 | -the operating system you are using. It is advised that you |
1510 | -download the most up to date version of the config scripts from |
1511 | - |
1512 | - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD |
1513 | -and |
1514 | - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD |
1515 | - |
1516 | -If the version you run ($0) is already up to date, please |
1517 | -send the following data and any information you think might be |
1518 | -pertinent to <config-patches@gnu.org> in order to provide the needed |
1519 | -information to handle your system. |
1520 | - |
1521 | -config.guess timestamp = $timestamp |
1522 | - |
1523 | -uname -m = `(uname -m) 2>/dev/null || echo unknown` |
1524 | -uname -r = `(uname -r) 2>/dev/null || echo unknown` |
1525 | -uname -s = `(uname -s) 2>/dev/null || echo unknown` |
1526 | -uname -v = `(uname -v) 2>/dev/null || echo unknown` |
1527 | - |
1528 | -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` |
1529 | -/bin/uname -X = `(/bin/uname -X) 2>/dev/null` |
1530 | - |
1531 | -hostinfo = `(hostinfo) 2>/dev/null` |
1532 | -/bin/universe = `(/bin/universe) 2>/dev/null` |
1533 | -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` |
1534 | -/bin/arch = `(/bin/arch) 2>/dev/null` |
1535 | -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` |
1536 | -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` |
1537 | - |
1538 | -UNAME_MACHINE = ${UNAME_MACHINE} |
1539 | -UNAME_RELEASE = ${UNAME_RELEASE} |
1540 | -UNAME_SYSTEM = ${UNAME_SYSTEM} |
1541 | -UNAME_VERSION = ${UNAME_VERSION} |
1542 | -EOF |
1543 | - |
1544 | -exit 1 |
1545 | - |
1546 | -# Local variables: |
1547 | -# eval: (add-hook 'write-file-hooks 'time-stamp) |
1548 | -# time-stamp-start: "timestamp='" |
1549 | -# time-stamp-format: "%:y-%02m-%02d" |
1550 | -# time-stamp-end: "'" |
1551 | -# End: |
1552 | |
1553 | === removed file '.pc/autoconfupdate.patch/config.sub' |
1554 | --- .pc/autoconfupdate.patch/config.sub 2012-10-01 12:57:07 +0000 |
1555 | +++ .pc/autoconfupdate.patch/config.sub 1970-01-01 00:00:00 +0000 |
1556 | @@ -1,1705 +0,0 @@ |
1557 | -#! /bin/sh |
1558 | -# Configuration validation subroutine script. |
1559 | -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
1560 | -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 |
1561 | -# Free Software Foundation, Inc. |
1562 | - |
1563 | -timestamp='2009-11-20' |
1564 | - |
1565 | -# This file is (in principle) common to ALL GNU software. |
1566 | -# The presence of a machine in this file suggests that SOME GNU software |
1567 | -# can handle that machine. It does not imply ALL GNU software can. |
1568 | -# |
1569 | -# This file is free software; you can redistribute it and/or modify |
1570 | -# it under the terms of the GNU General Public License as published by |
1571 | -# the Free Software Foundation; either version 2 of the License, or |
1572 | -# (at your option) any later version. |
1573 | -# |
1574 | -# This program is distributed in the hope that it will be useful, |
1575 | -# but WITHOUT ANY WARRANTY; without even the implied warranty of |
1576 | -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
1577 | -# GNU General Public License for more details. |
1578 | -# |
1579 | -# You should have received a copy of the GNU General Public License |
1580 | -# along with this program; if not, write to the Free Software |
1581 | -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA |
1582 | -# 02110-1301, USA. |
1583 | -# |
1584 | -# As a special exception to the GNU General Public License, if you |
1585 | -# distribute this file as part of a program that contains a |
1586 | -# configuration script generated by Autoconf, you may include it under |
1587 | -# the same distribution terms that you use for the rest of that program. |
1588 | - |
1589 | - |
1590 | -# Please send patches to <config-patches@gnu.org>. Submit a context |
1591 | -# diff and a properly formatted GNU ChangeLog entry. |
1592 | -# |
1593 | -# Configuration subroutine to validate and canonicalize a configuration type. |
1594 | -# Supply the specified configuration type as an argument. |
1595 | -# If it is invalid, we print an error message on stderr and exit with code 1. |
1596 | -# Otherwise, we print the canonical config type on stdout and succeed. |
1597 | - |
1598 | -# You can get the latest version of this script from: |
1599 | -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD |
1600 | - |
1601 | -# This file is supposed to be the same for all GNU packages |
1602 | -# and recognize all the CPU types, system types and aliases |
1603 | -# that are meaningful with *any* GNU software. |
1604 | -# Each package is responsible for reporting which valid configurations |
1605 | -# it does not support. The user should be able to distinguish |
1606 | -# a failure to support a valid configuration from a meaningless |
1607 | -# configuration. |
1608 | - |
1609 | -# The goal of this file is to map all the various variations of a given |
1610 | -# machine specification into a single specification in the form: |
1611 | -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM |
1612 | -# or in some cases, the newer four-part form: |
1613 | -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM |
1614 | -# It is wrong to echo any other type of specification. |
1615 | - |
1616 | -me=`echo "$0" | sed -e 's,.*/,,'` |
1617 | - |
1618 | -usage="\ |
1619 | -Usage: $0 [OPTION] CPU-MFR-OPSYS |
1620 | - $0 [OPTION] ALIAS |
1621 | - |
1622 | -Canonicalize a configuration name. |
1623 | - |
1624 | -Operation modes: |
1625 | - -h, --help print this help, then exit |
1626 | - -t, --time-stamp print date of last modification, then exit |
1627 | - -v, --version print version number, then exit |
1628 | - |
1629 | -Report bugs and patches to <config-patches@gnu.org>." |
1630 | - |
1631 | -version="\ |
1632 | -GNU config.sub ($timestamp) |
1633 | - |
1634 | -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, |
1635 | -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
1636 | - |
1637 | -This is free software; see the source for copying conditions. There is NO |
1638 | -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
1639 | - |
1640 | -help=" |
1641 | -Try \`$me --help' for more information." |
1642 | - |
1643 | -# Parse command line |
1644 | -while test $# -gt 0 ; do |
1645 | - case $1 in |
1646 | - --time-stamp | --time* | -t ) |
1647 | - echo "$timestamp" ; exit ;; |
1648 | - --version | -v ) |
1649 | - echo "$version" ; exit ;; |
1650 | - --help | --h* | -h ) |
1651 | - echo "$usage"; exit ;; |
1652 | - -- ) # Stop option processing |
1653 | - shift; break ;; |
1654 | - - ) # Use stdin as input. |
1655 | - break ;; |
1656 | - -* ) |
1657 | - echo "$me: invalid option $1$help" |
1658 | - exit 1 ;; |
1659 | - |
1660 | - *local*) |
1661 | - # First pass through any local machine types. |
1662 | - echo $1 |
1663 | - exit ;; |
1664 | - |
1665 | - * ) |
1666 | - break ;; |
1667 | - esac |
1668 | -done |
1669 | - |
1670 | -case $# in |
1671 | - 0) echo "$me: missing argument$help" >&2 |
1672 | - exit 1;; |
1673 | - 1) ;; |
1674 | - *) echo "$me: too many arguments$help" >&2 |
1675 | - exit 1;; |
1676 | -esac |
1677 | - |
1678 | -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). |
1679 | -# Here we must recognize all the valid KERNEL-OS combinations. |
1680 | -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` |
1681 | -case $maybe_os in |
1682 | - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ |
1683 | - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ |
1684 | - kopensolaris*-gnu* | \ |
1685 | - storm-chaos* | os2-emx* | rtmk-nova*) |
1686 | - os=-$maybe_os |
1687 | - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` |
1688 | - ;; |
1689 | - *) |
1690 | - basic_machine=`echo $1 | sed 's/-[^-]*$//'` |
1691 | - if [ $basic_machine != $1 ] |
1692 | - then os=`echo $1 | sed 's/.*-/-/'` |
1693 | - else os=; fi |
1694 | - ;; |
1695 | -esac |
1696 | - |
1697 | -### Let's recognize common machines as not being operating systems so |
1698 | -### that things like config.sub decstation-3100 work. We also |
1699 | -### recognize some manufacturers as not being operating systems, so we |
1700 | -### can provide default operating systems below. |
1701 | -case $os in |
1702 | - -sun*os*) |
1703 | - # Prevent following clause from handling this invalid input. |
1704 | - ;; |
1705 | - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ |
1706 | - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ |
1707 | - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ |
1708 | - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ |
1709 | - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ |
1710 | - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ |
1711 | - -apple | -axis | -knuth | -cray | -microblaze) |
1712 | - os= |
1713 | - basic_machine=$1 |
1714 | - ;; |
1715 | - -bluegene*) |
1716 | - os=-cnk |
1717 | - ;; |
1718 | - -sim | -cisco | -oki | -wec | -winbond) |
1719 | - os= |
1720 | - basic_machine=$1 |
1721 | - ;; |
1722 | - -scout) |
1723 | - ;; |
1724 | - -wrs) |
1725 | - os=-vxworks |
1726 | - basic_machine=$1 |
1727 | - ;; |
1728 | - -chorusos*) |
1729 | - os=-chorusos |
1730 | - basic_machine=$1 |
1731 | - ;; |
1732 | - -chorusrdb) |
1733 | - os=-chorusrdb |
1734 | - basic_machine=$1 |
1735 | - ;; |
1736 | - -hiux*) |
1737 | - os=-hiuxwe2 |
1738 | - ;; |
1739 | - -sco6) |
1740 | - os=-sco5v6 |
1741 | - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
1742 | - ;; |
1743 | - -sco5) |
1744 | - os=-sco3.2v5 |
1745 | - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
1746 | - ;; |
1747 | - -sco4) |
1748 | - os=-sco3.2v4 |
1749 | - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
1750 | - ;; |
1751 | - -sco3.2.[4-9]*) |
1752 | - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` |
1753 | - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
1754 | - ;; |
1755 | - -sco3.2v[4-9]*) |
1756 | - # Don't forget version if it is 3.2v4 or newer. |
1757 | - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
1758 | - ;; |
1759 | - -sco5v6*) |
1760 | - # Don't forget version if it is 3.2v4 or newer. |
1761 | - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
1762 | - ;; |
1763 | - -sco*) |
1764 | - os=-sco3.2v2 |
1765 | - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
1766 | - ;; |
1767 | - -udk*) |
1768 | - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
1769 | - ;; |
1770 | - -isc) |
1771 | - os=-isc2.2 |
1772 | - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
1773 | - ;; |
1774 | - -clix*) |
1775 | - basic_machine=clipper-intergraph |
1776 | - ;; |
1777 | - -isc*) |
1778 | - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
1779 | - ;; |
1780 | - -lynx*) |
1781 | - os=-lynxos |
1782 | - ;; |
1783 | - -ptx*) |
1784 | - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` |
1785 | - ;; |
1786 | - -windowsnt*) |
1787 | - os=`echo $os | sed -e 's/windowsnt/winnt/'` |
1788 | - ;; |
1789 | - -psos*) |
1790 | - os=-psos |
1791 | - ;; |
1792 | - -mint | -mint[0-9]*) |
1793 | - basic_machine=m68k-atari |
1794 | - os=-mint |
1795 | - ;; |
1796 | -esac |
1797 | - |
1798 | -# Decode aliases for certain CPU-COMPANY combinations. |
1799 | -case $basic_machine in |
1800 | - # Recognize the basic CPU types without company name. |
1801 | - # Some are omitted here because they have special meanings below. |
1802 | - 1750a | 580 \ |
1803 | - | a29k \ |
1804 | - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ |
1805 | - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ |
1806 | - | am33_2.0 \ |
1807 | - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ |
1808 | - | bfin \ |
1809 | - | c4x | clipper \ |
1810 | - | d10v | d30v | dlx | dsp16xx \ |
1811 | - | fido | fr30 | frv \ |
1812 | - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ |
1813 | - | i370 | i860 | i960 | ia64 \ |
1814 | - | ip2k | iq2000 \ |
1815 | - | lm32 \ |
1816 | - | m32c | m32r | m32rle | m68000 | m68k | m88k \ |
1817 | - | maxq | mb | microblaze | mcore | mep | metag \ |
1818 | - | mips | mipsbe | mipseb | mipsel | mipsle \ |
1819 | - | mips16 \ |
1820 | - | mips64 | mips64el \ |
1821 | - | mips64octeon | mips64octeonel \ |
1822 | - | mips64orion | mips64orionel \ |
1823 | - | mips64r5900 | mips64r5900el \ |
1824 | - | mips64vr | mips64vrel \ |
1825 | - | mips64vr4100 | mips64vr4100el \ |
1826 | - | mips64vr4300 | mips64vr4300el \ |
1827 | - | mips64vr5000 | mips64vr5000el \ |
1828 | - | mips64vr5900 | mips64vr5900el \ |
1829 | - | mipsisa32 | mipsisa32el \ |
1830 | - | mipsisa32r2 | mipsisa32r2el \ |
1831 | - | mipsisa64 | mipsisa64el \ |
1832 | - | mipsisa64r2 | mipsisa64r2el \ |
1833 | - | mipsisa64sb1 | mipsisa64sb1el \ |
1834 | - | mipsisa64sr71k | mipsisa64sr71kel \ |
1835 | - | mipstx39 | mipstx39el \ |
1836 | - | mn10200 | mn10300 \ |
1837 | - | moxie \ |
1838 | - | mt \ |
1839 | - | msp430 \ |
1840 | - | nios | nios2 \ |
1841 | - | ns16k | ns32k \ |
1842 | - | or32 \ |
1843 | - | pdp10 | pdp11 | pj | pjl \ |
1844 | - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ |
1845 | - | pyramid \ |
1846 | - | rx \ |
1847 | - | score \ |
1848 | - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ |
1849 | - | sh64 | sh64le \ |
1850 | - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ |
1851 | - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ |
1852 | - | spu | strongarm \ |
1853 | - | tahoe | thumb | tic4x | tic80 | tron \ |
1854 | - | ubicom32 \ |
1855 | - | v850 | v850e \ |
1856 | - | we32k \ |
1857 | - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ |
1858 | - | z8k | z80) |
1859 | - basic_machine=$basic_machine-unknown |
1860 | - ;; |
1861 | - m6811 | m68hc11 | m6812 | m68hc12 | picochip) |
1862 | - # Motorola 68HC11/12. |
1863 | - basic_machine=$basic_machine-unknown |
1864 | - os=-none |
1865 | - ;; |
1866 | - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) |
1867 | - ;; |
1868 | - ms1) |
1869 | - basic_machine=mt-unknown |
1870 | - ;; |
1871 | - |
1872 | - # We use `pc' rather than `unknown' |
1873 | - # because (1) that's what they normally are, and |
1874 | - # (2) the word "unknown" tends to confuse beginning users. |
1875 | - i*86 | x86_64) |
1876 | - basic_machine=$basic_machine-pc |
1877 | - ;; |
1878 | - # Object if more than one company name word. |
1879 | - *-*-*) |
1880 | - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 |
1881 | - exit 1 |
1882 | - ;; |
1883 | - # Recognize the basic CPU types with company name. |
1884 | - 580-* \ |
1885 | - | a29k-* \ |
1886 | - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ |
1887 | - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ |
1888 | - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ |
1889 | - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ |
1890 | - | avr-* | avr32-* \ |
1891 | - | bfin-* | bs2000-* \ |
1892 | - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ |
1893 | - | clipper-* | craynv-* | cydra-* \ |
1894 | - | d10v-* | d30v-* | dlx-* \ |
1895 | - | elxsi-* \ |
1896 | - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ |
1897 | - | h8300-* | h8500-* \ |
1898 | - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ |
1899 | - | i*86-* | i860-* | i960-* | ia64-* \ |
1900 | - | ip2k-* | iq2000-* \ |
1901 | - | lm32-* \ |
1902 | - | m32c-* | m32r-* | m32rle-* \ |
1903 | - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ |
1904 | - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ |
1905 | - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ |
1906 | - | mips16-* \ |
1907 | - | mips64-* | mips64el-* \ |
1908 | - | mips64octeon-* | mips64octeonel-* \ |
1909 | - | mips64orion-* | mips64orionel-* \ |
1910 | - | mips64r5900-* | mips64r5900el-* \ |
1911 | - | mips64vr-* | mips64vrel-* \ |
1912 | - | mips64vr4100-* | mips64vr4100el-* \ |
1913 | - | mips64vr4300-* | mips64vr4300el-* \ |
1914 | - | mips64vr5000-* | mips64vr5000el-* \ |
1915 | - | mips64vr5900-* | mips64vr5900el-* \ |
1916 | - | mipsisa32-* | mipsisa32el-* \ |
1917 | - | mipsisa32r2-* | mipsisa32r2el-* \ |
1918 | - | mipsisa64-* | mipsisa64el-* \ |
1919 | - | mipsisa64r2-* | mipsisa64r2el-* \ |
1920 | - | mipsisa64sb1-* | mipsisa64sb1el-* \ |
1921 | - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ |
1922 | - | mipstx39-* | mipstx39el-* \ |
1923 | - | mmix-* \ |
1924 | - | mt-* \ |
1925 | - | msp430-* \ |
1926 | - | nios-* | nios2-* \ |
1927 | - | none-* | np1-* | ns16k-* | ns32k-* \ |
1928 | - | orion-* \ |
1929 | - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ |
1930 | - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ |
1931 | - | pyramid-* \ |
1932 | - | romp-* | rs6000-* | rx-* \ |
1933 | - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ |
1934 | - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ |
1935 | - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ |
1936 | - | sparclite-* \ |
1937 | - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ |
1938 | - | tahoe-* | thumb-* \ |
1939 | - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ |
1940 | - | tron-* \ |
1941 | - | ubicom32-* \ |
1942 | - | v850-* | v850e-* | vax-* \ |
1943 | - | we32k-* \ |
1944 | - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ |
1945 | - | xstormy16-* | xtensa*-* \ |
1946 | - | ymp-* \ |
1947 | - | z8k-* | z80-*) |
1948 | - ;; |
1949 | - # Recognize the basic CPU types without company name, with glob match. |
1950 | - xtensa*) |
1951 | - basic_machine=$basic_machine-unknown |
1952 | - ;; |
1953 | - # Recognize the various machine names and aliases which stand |
1954 | - # for a CPU type and a company and sometimes even an OS. |
1955 | - 386bsd) |
1956 | - basic_machine=i386-unknown |
1957 | - os=-bsd |
1958 | - ;; |
1959 | - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) |
1960 | - basic_machine=m68000-att |
1961 | - ;; |
1962 | - 3b*) |
1963 | - basic_machine=we32k-att |
1964 | - ;; |
1965 | - a29khif) |
1966 | - basic_machine=a29k-amd |
1967 | - os=-udi |
1968 | - ;; |
1969 | - abacus) |
1970 | - basic_machine=abacus-unknown |
1971 | - ;; |
1972 | - adobe68k) |
1973 | - basic_machine=m68010-adobe |
1974 | - os=-scout |
1975 | - ;; |
1976 | - alliant | fx80) |
1977 | - basic_machine=fx80-alliant |
1978 | - ;; |
1979 | - altos | altos3068) |
1980 | - basic_machine=m68k-altos |
1981 | - ;; |
1982 | - am29k) |
1983 | - basic_machine=a29k-none |
1984 | - os=-bsd |
1985 | - ;; |
1986 | - amd64) |
1987 | - basic_machine=x86_64-pc |
1988 | - ;; |
1989 | - amd64-*) |
1990 | - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` |
1991 | - ;; |
1992 | - amdahl) |
1993 | - basic_machine=580-amdahl |
1994 | - os=-sysv |
1995 | - ;; |
1996 | - amiga | amiga-*) |
1997 | - basic_machine=m68k-unknown |
1998 | - ;; |
1999 | - amigaos | amigados) |
2000 | - basic_machine=m68k-unknown |
2001 | - os=-amigaos |
2002 | - ;; |
2003 | - amigaunix | amix) |
2004 | - basic_machine=m68k-unknown |
2005 | - os=-sysv4 |
2006 | - ;; |
2007 | - apollo68) |
2008 | - basic_machine=m68k-apollo |
2009 | - os=-sysv |
2010 | - ;; |
2011 | - apollo68bsd) |
2012 | - basic_machine=m68k-apollo |
2013 | - os=-bsd |
2014 | - ;; |
2015 | - aros) |
2016 | - basic_machine=i386-pc |
2017 | - os=-aros |
2018 | - ;; |
2019 | - aux) |
2020 | - basic_machine=m68k-apple |
2021 | - os=-aux |
2022 | - ;; |
2023 | - balance) |
2024 | - basic_machine=ns32k-sequent |
2025 | - os=-dynix |
2026 | - ;; |
2027 | - blackfin) |
2028 | - basic_machine=bfin-unknown |
2029 | - os=-linux |
2030 | - ;; |
2031 | - blackfin-*) |
2032 | - basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` |
2033 | - os=-linux |
2034 | - ;; |
2035 | - bluegene*) |
2036 | - basic_machine=powerpc-ibm |
2037 | - os=-cnk |
2038 | - ;; |
2039 | - c90) |
2040 | - basic_machine=c90-cray |
2041 | - os=-unicos |
2042 | - ;; |
2043 | - cegcc) |
2044 | - basic_machine=arm-unknown |
2045 | - os=-cegcc |
2046 | - ;; |
2047 | - convex-c1) |
2048 | - basic_machine=c1-convex |
2049 | - os=-bsd |
2050 | - ;; |
2051 | - convex-c2) |
2052 | - basic_machine=c2-convex |
2053 | - os=-bsd |
2054 | - ;; |
2055 | - convex-c32) |
2056 | - basic_machine=c32-convex |
2057 | - os=-bsd |
2058 | - ;; |
2059 | - convex-c34) |
2060 | - basic_machine=c34-convex |
2061 | - os=-bsd |
2062 | - ;; |
2063 | - convex-c38) |
2064 | - basic_machine=c38-convex |
2065 | - os=-bsd |
2066 | - ;; |
2067 | - cray | j90) |
2068 | - basic_machine=j90-cray |
2069 | - os=-unicos |
2070 | - ;; |
2071 | - craynv) |
2072 | - basic_machine=craynv-cray |
2073 | - os=-unicosmp |
2074 | - ;; |
2075 | - cr16) |
2076 | - basic_machine=cr16-unknown |
2077 | - os=-elf |
2078 | - ;; |
2079 | - crds | unos) |
2080 | - basic_machine=m68k-crds |
2081 | - ;; |
2082 | - crisv32 | crisv32-* | etraxfs*) |
2083 | - basic_machine=crisv32-axis |
2084 | - ;; |
2085 | - cris | cris-* | etrax*) |
2086 | - basic_machine=cris-axis |
2087 | - ;; |
2088 | - crx) |
2089 | - basic_machine=crx-unknown |
2090 | - os=-elf |
2091 | - ;; |
2092 | - da30 | da30-*) |
2093 | - basic_machine=m68k-da30 |
2094 | - ;; |
2095 | - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) |
2096 | - basic_machine=mips-dec |
2097 | - ;; |
2098 | - decsystem10* | dec10*) |
2099 | - basic_machine=pdp10-dec |
2100 | - os=-tops10 |
2101 | - ;; |
2102 | - decsystem20* | dec20*) |
2103 | - basic_machine=pdp10-dec |
2104 | - os=-tops20 |
2105 | - ;; |
2106 | - delta | 3300 | motorola-3300 | motorola-delta \ |
2107 | - | 3300-motorola | delta-motorola) |
2108 | - basic_machine=m68k-motorola |
2109 | - ;; |
2110 | - delta88) |
2111 | - basic_machine=m88k-motorola |
2112 | - os=-sysv3 |
2113 | - ;; |
2114 | - dicos) |
2115 | - basic_machine=i686-pc |
2116 | - os=-dicos |
2117 | - ;; |
2118 | - djgpp) |
2119 | - basic_machine=i586-pc |
2120 | - os=-msdosdjgpp |
2121 | - ;; |
2122 | - dpx20 | dpx20-*) |
2123 | - basic_machine=rs6000-bull |
2124 | - os=-bosx |
2125 | - ;; |
2126 | - dpx2* | dpx2*-bull) |
2127 | - basic_machine=m68k-bull |
2128 | - os=-sysv3 |
2129 | - ;; |
2130 | - ebmon29k) |
2131 | - basic_machine=a29k-amd |
2132 | - os=-ebmon |
2133 | - ;; |
2134 | - elxsi) |
2135 | - basic_machine=elxsi-elxsi |
2136 | - os=-bsd |
2137 | - ;; |
2138 | - encore | umax | mmax) |
2139 | - basic_machine=ns32k-encore |
2140 | - ;; |
2141 | - es1800 | OSE68k | ose68k | ose | OSE) |
2142 | - basic_machine=m68k-ericsson |
2143 | - os=-ose |
2144 | - ;; |
2145 | - fx2800) |
2146 | - basic_machine=i860-alliant |
2147 | - ;; |
2148 | - genix) |
2149 | - basic_machine=ns32k-ns |
2150 | - ;; |
2151 | - gmicro) |
2152 | - basic_machine=tron-gmicro |
2153 | - os=-sysv |
2154 | - ;; |
2155 | - go32) |
2156 | - basic_machine=i386-pc |
2157 | - os=-go32 |
2158 | - ;; |
2159 | - h3050r* | hiux*) |
2160 | - basic_machine=hppa1.1-hitachi |
2161 | - os=-hiuxwe2 |
2162 | - ;; |
2163 | - h8300hms) |
2164 | - basic_machine=h8300-hitachi |
2165 | - os=-hms |
2166 | - ;; |
2167 | - h8300xray) |
2168 | - basic_machine=h8300-hitachi |
2169 | - os=-xray |
2170 | - ;; |
2171 | - h8500hms) |
2172 | - basic_machine=h8500-hitachi |
2173 | - os=-hms |
2174 | - ;; |
2175 | - harris) |
2176 | - basic_machine=m88k-harris |
2177 | - os=-sysv3 |
2178 | - ;; |
2179 | - hp300-*) |
2180 | - basic_machine=m68k-hp |
2181 | - ;; |
2182 | - hp300bsd) |
2183 | - basic_machine=m68k-hp |
2184 | - os=-bsd |
2185 | - ;; |
2186 | - hp300hpux) |
2187 | - basic_machine=m68k-hp |
2188 | - os=-hpux |
2189 | - ;; |
2190 | - hp3k9[0-9][0-9] | hp9[0-9][0-9]) |
2191 | - basic_machine=hppa1.0-hp |
2192 | - ;; |
2193 | - hp9k2[0-9][0-9] | hp9k31[0-9]) |
2194 | - basic_machine=m68000-hp |
2195 | - ;; |
2196 | - hp9k3[2-9][0-9]) |
2197 | - basic_machine=m68k-hp |
2198 | - ;; |
2199 | - hp9k6[0-9][0-9] | hp6[0-9][0-9]) |
2200 | - basic_machine=hppa1.0-hp |
2201 | - ;; |
2202 | - hp9k7[0-79][0-9] | hp7[0-79][0-9]) |
2203 | - basic_machine=hppa1.1-hp |
2204 | - ;; |
2205 | - hp9k78[0-9] | hp78[0-9]) |
2206 | - # FIXME: really hppa2.0-hp |
2207 | - basic_machine=hppa1.1-hp |
2208 | - ;; |
2209 | - hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) |
2210 | - # FIXME: really hppa2.0-hp |
2211 | - basic_machine=hppa1.1-hp |
2212 | - ;; |
2213 | - hp9k8[0-9][13679] | hp8[0-9][13679]) |
2214 | - basic_machine=hppa1.1-hp |
2215 | - ;; |
2216 | - hp9k8[0-9][0-9] | hp8[0-9][0-9]) |
2217 | - basic_machine=hppa1.0-hp |
2218 | - ;; |
2219 | - hppa-next) |
2220 | - os=-nextstep3 |
2221 | - ;; |
2222 | - hppaosf) |
2223 | - basic_machine=hppa1.1-hp |
2224 | - os=-osf |
2225 | - ;; |
2226 | - hppro) |
2227 | - basic_machine=hppa1.1-hp |
2228 | - os=-proelf |
2229 | - ;; |
2230 | - i370-ibm* | ibm*) |
2231 | - basic_machine=i370-ibm |
2232 | - ;; |
2233 | -# I'm not sure what "Sysv32" means. Should this be sysv3.2? |
2234 | - i*86v32) |
2235 | - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` |
2236 | - os=-sysv32 |
2237 | - ;; |
2238 | - i*86v4*) |
2239 | - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` |
2240 | - os=-sysv4 |
2241 | - ;; |
2242 | - i*86v) |
2243 | - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` |
2244 | - os=-sysv |
2245 | - ;; |
2246 | - i*86sol2) |
2247 | - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` |
2248 | - os=-solaris2 |
2249 | - ;; |
2250 | - i386mach) |
2251 | - basic_machine=i386-mach |
2252 | - os=-mach |
2253 | - ;; |
2254 | - i386-vsta | vsta) |
2255 | - basic_machine=i386-unknown |
2256 | - os=-vsta |
2257 | - ;; |
2258 | - iris | iris4d) |
2259 | - basic_machine=mips-sgi |
2260 | - case $os in |
2261 | - -irix*) |
2262 | - ;; |
2263 | - *) |
2264 | - os=-irix4 |
2265 | - ;; |
2266 | - esac |
2267 | - ;; |
2268 | - isi68 | isi) |
2269 | - basic_machine=m68k-isi |
2270 | - os=-sysv |
2271 | - ;; |
2272 | - m68knommu) |
2273 | - basic_machine=m68k-unknown |
2274 | - os=-linux |
2275 | - ;; |
2276 | - m68knommu-*) |
2277 | - basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` |
2278 | - os=-linux |
2279 | - ;; |
2280 | - m88k-omron*) |
2281 | - basic_machine=m88k-omron |
2282 | - ;; |
2283 | - magnum | m3230) |
2284 | - basic_machine=mips-mips |
2285 | - os=-sysv |
2286 | - ;; |
2287 | - merlin) |
2288 | - basic_machine=ns32k-utek |
2289 | - os=-sysv |
2290 | - ;; |
2291 | - microblaze) |
2292 | - basic_machine=microblaze-xilinx |
2293 | - ;; |
2294 | - mingw32) |
2295 | - basic_machine=i386-pc |
2296 | - os=-mingw32 |
2297 | - ;; |
2298 | - mingw32ce) |
2299 | - basic_machine=arm-unknown |
2300 | - os=-mingw32ce |
2301 | - ;; |
2302 | - miniframe) |
2303 | - basic_machine=m68000-convergent |
2304 | - ;; |
2305 | - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) |
2306 | - basic_machine=m68k-atari |
2307 | - os=-mint |
2308 | - ;; |
2309 | - mips3*-*) |
2310 | - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` |
2311 | - ;; |
2312 | - mips3*) |
2313 | - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown |
2314 | - ;; |
2315 | - monitor) |
2316 | - basic_machine=m68k-rom68k |
2317 | - os=-coff |
2318 | - ;; |
2319 | - morphos) |
2320 | - basic_machine=powerpc-unknown |
2321 | - os=-morphos |
2322 | - ;; |
2323 | - msdos) |
2324 | - basic_machine=i386-pc |
2325 | - os=-msdos |
2326 | - ;; |
2327 | - ms1-*) |
2328 | - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` |
2329 | - ;; |
2330 | - mvs) |
2331 | - basic_machine=i370-ibm |
2332 | - os=-mvs |
2333 | - ;; |
2334 | - ncr3000) |
2335 | - basic_machine=i486-ncr |
2336 | - os=-sysv4 |
2337 | - ;; |
2338 | - netbsd386) |
2339 | - basic_machine=i386-unknown |
2340 | - os=-netbsd |
2341 | - ;; |
2342 | - netwinder) |
2343 | - basic_machine=armv4l-rebel |
2344 | - os=-linux |
2345 | - ;; |
2346 | - news | news700 | news800 | news900) |
2347 | - basic_machine=m68k-sony |
2348 | - os=-newsos |
2349 | - ;; |
2350 | - news1000) |
2351 | - basic_machine=m68030-sony |
2352 | - os=-newsos |
2353 | - ;; |
2354 | - news-3600 | risc-news) |
2355 | - basic_machine=mips-sony |
2356 | - os=-newsos |
2357 | - ;; |
2358 | - necv70) |
2359 | - basic_machine=v70-nec |
2360 | - os=-sysv |
2361 | - ;; |
2362 | - next | m*-next ) |
2363 | - basic_machine=m68k-next |
2364 | - case $os in |
2365 | - -nextstep* ) |
2366 | - ;; |
2367 | - -ns2*) |
2368 | - os=-nextstep2 |
2369 | - ;; |
2370 | - *) |
2371 | - os=-nextstep3 |
2372 | - ;; |
2373 | - esac |
2374 | - ;; |
2375 | - nh3000) |
2376 | - basic_machine=m68k-harris |
2377 | - os=-cxux |
2378 | - ;; |
2379 | - nh[45]000) |
2380 | - basic_machine=m88k-harris |
2381 | - os=-cxux |
2382 | - ;; |
2383 | - nindy960) |
2384 | - basic_machine=i960-intel |
2385 | - os=-nindy |
2386 | - ;; |
2387 | - mon960) |
2388 | - basic_machine=i960-intel |
2389 | - os=-mon960 |
2390 | - ;; |
2391 | - nonstopux) |
2392 | - basic_machine=mips-compaq |
2393 | - os=-nonstopux |
2394 | - ;; |
2395 | - np1) |
2396 | - basic_machine=np1-gould |
2397 | - ;; |
2398 | - nsr-tandem) |
2399 | - basic_machine=nsr-tandem |
2400 | - ;; |
2401 | - op50n-* | op60c-*) |
2402 | - basic_machine=hppa1.1-oki |
2403 | - os=-proelf |
2404 | - ;; |
2405 | - openrisc | openrisc-*) |
2406 | - basic_machine=or32-unknown |
2407 | - ;; |
2408 | - os400) |
2409 | - basic_machine=powerpc-ibm |
2410 | - os=-os400 |
2411 | - ;; |
2412 | - OSE68000 | ose68000) |
2413 | - basic_machine=m68000-ericsson |
2414 | - os=-ose |
2415 | - ;; |
2416 | - os68k) |
2417 | - basic_machine=m68k-none |
2418 | - os=-os68k |
2419 | - ;; |
2420 | - pa-hitachi) |
2421 | - basic_machine=hppa1.1-hitachi |
2422 | - os=-hiuxwe2 |
2423 | - ;; |
2424 | - paragon) |
2425 | - basic_machine=i860-intel |
2426 | - os=-osf |
2427 | - ;; |
2428 | - parisc) |
2429 | - basic_machine=hppa-unknown |
2430 | - os=-linux |
2431 | - ;; |
2432 | - parisc-*) |
2433 | - basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` |
2434 | - os=-linux |
2435 | - ;; |
2436 | - pbd) |
2437 | - basic_machine=sparc-tti |
2438 | - ;; |
2439 | - pbb) |
2440 | - basic_machine=m68k-tti |
2441 | - ;; |
2442 | - pc532 | pc532-*) |
2443 | - basic_machine=ns32k-pc532 |
2444 | - ;; |
2445 | - pc98) |
2446 | - basic_machine=i386-pc |
2447 | - ;; |
2448 | - pc98-*) |
2449 | - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` |
2450 | - ;; |
2451 | - pentium | p5 | k5 | k6 | nexgen | viac3) |
2452 | - basic_machine=i586-pc |
2453 | - ;; |
2454 | - pentiumpro | p6 | 6x86 | athlon | athlon_*) |
2455 | - basic_machine=i686-pc |
2456 | - ;; |
2457 | - pentiumii | pentium2 | pentiumiii | pentium3) |
2458 | - basic_machine=i686-pc |
2459 | - ;; |
2460 | - pentium4) |
2461 | - basic_machine=i786-pc |
2462 | - ;; |
2463 | - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) |
2464 | - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` |
2465 | - ;; |
2466 | - pentiumpro-* | p6-* | 6x86-* | athlon-*) |
2467 | - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` |
2468 | - ;; |
2469 | - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) |
2470 | - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` |
2471 | - ;; |
2472 | - pentium4-*) |
2473 | - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` |
2474 | - ;; |
2475 | - pn) |
2476 | - basic_machine=pn-gould |
2477 | - ;; |
2478 | - power) basic_machine=power-ibm |
2479 | - ;; |
2480 | - ppc) basic_machine=powerpc-unknown |
2481 | - ;; |
2482 | - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` |
2483 | - ;; |
2484 | - ppcle | powerpclittle | ppc-le | powerpc-little) |
2485 | - basic_machine=powerpcle-unknown |
2486 | - ;; |
2487 | - ppcle-* | powerpclittle-*) |
2488 | - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` |
2489 | - ;; |
2490 | - ppc64) basic_machine=powerpc64-unknown |
2491 | - ;; |
2492 | - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` |
2493 | - ;; |
2494 | - ppc64le | powerpc64little | ppc64-le | powerpc64-little) |
2495 | - basic_machine=powerpc64le-unknown |
2496 | - ;; |
2497 | - ppc64le-* | powerpc64little-*) |
2498 | - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` |
2499 | - ;; |
2500 | - ps2) |
2501 | - basic_machine=i386-ibm |
2502 | - ;; |
2503 | - pw32) |
2504 | - basic_machine=i586-unknown |
2505 | - os=-pw32 |
2506 | - ;; |
2507 | - rdos) |
2508 | - basic_machine=i386-pc |
2509 | - os=-rdos |
2510 | - ;; |
2511 | - rom68k) |
2512 | - basic_machine=m68k-rom68k |
2513 | - os=-coff |
2514 | - ;; |
2515 | - rm[46]00) |
2516 | - basic_machine=mips-siemens |
2517 | - ;; |
2518 | - rtpc | rtpc-*) |
2519 | - basic_machine=romp-ibm |
2520 | - ;; |
2521 | - s390 | s390-*) |
2522 | - basic_machine=s390-ibm |
2523 | - ;; |
2524 | - s390x | s390x-*) |
2525 | - basic_machine=s390x-ibm |
2526 | - ;; |
2527 | - sa29200) |
2528 | - basic_machine=a29k-amd |
2529 | - os=-udi |
2530 | - ;; |
2531 | - sb1) |
2532 | - basic_machine=mipsisa64sb1-unknown |
2533 | - ;; |
2534 | - sb1el) |
2535 | - basic_machine=mipsisa64sb1el-unknown |
2536 | - ;; |
2537 | - sde) |
2538 | - basic_machine=mipsisa32-sde |
2539 | - os=-elf |
2540 | - ;; |
2541 | - sei) |
2542 | - basic_machine=mips-sei |
2543 | - os=-seiux |
2544 | - ;; |
2545 | - sequent) |
2546 | - basic_machine=i386-sequent |
2547 | - ;; |
2548 | - sh) |
2549 | - basic_machine=sh-hitachi |
2550 | - os=-hms |
2551 | - ;; |
2552 | - sh5el) |
2553 | - basic_machine=sh5le-unknown |
2554 | - ;; |
2555 | - sh64) |
2556 | - basic_machine=sh64-unknown |
2557 | - ;; |
2558 | - sparclite-wrs | simso-wrs) |
2559 | - basic_machine=sparclite-wrs |
2560 | - os=-vxworks |
2561 | - ;; |
2562 | - sps7) |
2563 | - basic_machine=m68k-bull |
2564 | - os=-sysv2 |
2565 | - ;; |
2566 | - spur) |
2567 | - basic_machine=spur-unknown |
2568 | - ;; |
2569 | - st2000) |
2570 | - basic_machine=m68k-tandem |
2571 | - ;; |
2572 | - stratus) |
2573 | - basic_machine=i860-stratus |
2574 | - os=-sysv4 |
2575 | - ;; |
2576 | - sun2) |
2577 | - basic_machine=m68000-sun |
2578 | - ;; |
2579 | - sun2os3) |
2580 | - basic_machine=m68000-sun |
2581 | - os=-sunos3 |
2582 | - ;; |
2583 | - sun2os4) |
2584 | - basic_machine=m68000-sun |
2585 | - os=-sunos4 |
2586 | - ;; |
2587 | - sun3os3) |
2588 | - basic_machine=m68k-sun |
2589 | - os=-sunos3 |
2590 | - ;; |
2591 | - sun3os4) |
2592 | - basic_machine=m68k-sun |
2593 | - os=-sunos4 |
2594 | - ;; |
2595 | - sun4os3) |
2596 | - basic_machine=sparc-sun |
2597 | - os=-sunos3 |
2598 | - ;; |
2599 | - sun4os4) |
2600 | - basic_machine=sparc-sun |
2601 | - os=-sunos4 |
2602 | - ;; |
2603 | - sun4sol2) |
2604 | - basic_machine=sparc-sun |
2605 | - os=-solaris2 |
2606 | - ;; |
2607 | - sun3 | sun3-*) |
2608 | - basic_machine=m68k-sun |
2609 | - ;; |
2610 | - sun4) |
2611 | - basic_machine=sparc-sun |
2612 | - ;; |
2613 | - sun386 | sun386i | roadrunner) |
2614 | - basic_machine=i386-sun |
2615 | - ;; |
2616 | - sv1) |
2617 | - basic_machine=sv1-cray |
2618 | - os=-unicos |
2619 | - ;; |
2620 | - symmetry) |
2621 | - basic_machine=i386-sequent |
2622 | - os=-dynix |
2623 | - ;; |
2624 | - t3e) |
2625 | - basic_machine=alphaev5-cray |
2626 | - os=-unicos |
2627 | - ;; |
2628 | - t90) |
2629 | - basic_machine=t90-cray |
2630 | - os=-unicos |
2631 | - ;; |
2632 | - tic54x | c54x*) |
2633 | - basic_machine=tic54x-unknown |
2634 | - os=-coff |
2635 | - ;; |
2636 | - tic55x | c55x*) |
2637 | - basic_machine=tic55x-unknown |
2638 | - os=-coff |
2639 | - ;; |
2640 | - tic6x | c6x*) |
2641 | - basic_machine=tic6x-unknown |
2642 | - os=-coff |
2643 | - ;; |
2644 | - tile*) |
2645 | - basic_machine=tile-unknown |
2646 | - os=-linux-gnu |
2647 | - ;; |
2648 | - tx39) |
2649 | - basic_machine=mipstx39-unknown |
2650 | - ;; |
2651 | - tx39el) |
2652 | - basic_machine=mipstx39el-unknown |
2653 | - ;; |
2654 | - toad1) |
2655 | - basic_machine=pdp10-xkl |
2656 | - os=-tops20 |
2657 | - ;; |
2658 | - tower | tower-32) |
2659 | - basic_machine=m68k-ncr |
2660 | - ;; |
2661 | - tpf) |
2662 | - basic_machine=s390x-ibm |
2663 | - os=-tpf |
2664 | - ;; |
2665 | - udi29k) |
2666 | - basic_machine=a29k-amd |
2667 | - os=-udi |
2668 | - ;; |
2669 | - ultra3) |
2670 | - basic_machine=a29k-nyu |
2671 | - os=-sym1 |
2672 | - ;; |
2673 | - v810 | necv810) |
2674 | - basic_machine=v810-nec |
2675 | - os=-none |
2676 | - ;; |
2677 | - vaxv) |
2678 | - basic_machine=vax-dec |
2679 | - os=-sysv |
2680 | - ;; |
2681 | - vms) |
2682 | - basic_machine=vax-dec |
2683 | - os=-vms |
2684 | - ;; |
2685 | - vpp*|vx|vx-*) |
2686 | - basic_machine=f301-fujitsu |
2687 | - ;; |
2688 | - vxworks960) |
2689 | - basic_machine=i960-wrs |
2690 | - os=-vxworks |
2691 | - ;; |
2692 | - vxworks68) |
2693 | - basic_machine=m68k-wrs |
2694 | - os=-vxworks |
2695 | - ;; |
2696 | - vxworks29k) |
2697 | - basic_machine=a29k-wrs |
2698 | - os=-vxworks |
2699 | - ;; |
2700 | - w65*) |
2701 | - basic_machine=w65-wdc |
2702 | - os=-none |
2703 | - ;; |
2704 | - w89k-*) |
2705 | - basic_machine=hppa1.1-winbond |
2706 | - os=-proelf |
2707 | - ;; |
2708 | - xbox) |
2709 | - basic_machine=i686-pc |
2710 | - os=-mingw32 |
2711 | - ;; |
2712 | - xps | xps100) |
2713 | - basic_machine=xps100-honeywell |
2714 | - ;; |
2715 | - ymp) |
2716 | - basic_machine=ymp-cray |
2717 | - os=-unicos |
2718 | - ;; |
2719 | - z8k-*-coff) |
2720 | - basic_machine=z8k-unknown |
2721 | - os=-sim |
2722 | - ;; |
2723 | - z80-*-coff) |
2724 | - basic_machine=z80-unknown |
2725 | - os=-sim |
2726 | - ;; |
2727 | - none) |
2728 | - basic_machine=none-none |
2729 | - os=-none |
2730 | - ;; |
2731 | - |
2732 | -# Here we handle the default manufacturer of certain CPU types. It is in |
2733 | -# some cases the only manufacturer, in others, it is the most popular. |
2734 | - w89k) |
2735 | - basic_machine=hppa1.1-winbond |
2736 | - ;; |
2737 | - op50n) |
2738 | - basic_machine=hppa1.1-oki |
2739 | - ;; |
2740 | - op60c) |
2741 | - basic_machine=hppa1.1-oki |
2742 | - ;; |
2743 | - romp) |
2744 | - basic_machine=romp-ibm |
2745 | - ;; |
2746 | - mmix) |
2747 | - basic_machine=mmix-knuth |
2748 | - ;; |
2749 | - rs6000) |
2750 | - basic_machine=rs6000-ibm |
2751 | - ;; |
2752 | - vax) |
2753 | - basic_machine=vax-dec |
2754 | - ;; |
2755 | - pdp10) |
2756 | - # there are many clones, so DEC is not a safe bet |
2757 | - basic_machine=pdp10-unknown |
2758 | - ;; |
2759 | - pdp11) |
2760 | - basic_machine=pdp11-dec |
2761 | - ;; |
2762 | - we32k) |
2763 | - basic_machine=we32k-att |
2764 | - ;; |
2765 | - sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) |
2766 | - basic_machine=sh-unknown |
2767 | - ;; |
2768 | - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) |
2769 | - basic_machine=sparc-sun |
2770 | - ;; |
2771 | - cydra) |
2772 | - basic_machine=cydra-cydrome |
2773 | - ;; |
2774 | - orion) |
2775 | - basic_machine=orion-highlevel |
2776 | - ;; |
2777 | - orion105) |
2778 | - basic_machine=clipper-highlevel |
2779 | - ;; |
2780 | - mac | mpw | mac-mpw) |
2781 | - basic_machine=m68k-apple |
2782 | - ;; |
2783 | - pmac | pmac-mpw) |
2784 | - basic_machine=powerpc-apple |
2785 | - ;; |
2786 | - *-unknown) |
2787 | - # Make sure to match an already-canonicalized machine name. |
2788 | - ;; |
2789 | - *) |
2790 | - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 |
2791 | - exit 1 |
2792 | - ;; |
2793 | -esac |
2794 | - |
2795 | -# Here we canonicalize certain aliases for manufacturers. |
2796 | -case $basic_machine in |
2797 | - *-digital*) |
2798 | - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` |
2799 | - ;; |
2800 | - *-commodore*) |
2801 | - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` |
2802 | - ;; |
2803 | - *) |
2804 | - ;; |
2805 | -esac |
2806 | - |
2807 | -# Decode manufacturer-specific aliases for certain operating systems. |
2808 | - |
2809 | -if [ x"$os" != x"" ] |
2810 | -then |
2811 | -case $os in |
2812 | - # First match some system type aliases |
2813 | - # that might get confused with valid system types. |
2814 | - # -solaris* is a basic system type, with this one exception. |
2815 | - -auroraux) |
2816 | - os=-auroraux |
2817 | - ;; |
2818 | - -solaris1 | -solaris1.*) |
2819 | - os=`echo $os | sed -e 's|solaris1|sunos4|'` |
2820 | - ;; |
2821 | - -solaris) |
2822 | - os=-solaris2 |
2823 | - ;; |
2824 | - -svr4*) |
2825 | - os=-sysv4 |
2826 | - ;; |
2827 | - -unixware*) |
2828 | - os=-sysv4.2uw |
2829 | - ;; |
2830 | - -gnu/linux*) |
2831 | - os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` |
2832 | - ;; |
2833 | - # First accept the basic system types. |
2834 | - # The portable systems comes first. |
2835 | - # Each alternative MUST END IN A *, to match a version number. |
2836 | - # -sysv* is not here because it comes later, after sysvr4. |
2837 | - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ |
2838 | - | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ |
2839 | - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ |
2840 | - | -sym* | -kopensolaris* \ |
2841 | - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ |
2842 | - | -aos* | -aros* \ |
2843 | - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ |
2844 | - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ |
2845 | - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ |
2846 | - | -openbsd* | -solidbsd* \ |
2847 | - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ |
2848 | - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ |
2849 | - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ |
2850 | - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ |
2851 | - | -chorusos* | -chorusrdb* | -cegcc* \ |
2852 | - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
2853 | - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ |
2854 | - | -uxpv* | -beos* | -mpeix* | -udk* \ |
2855 | - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ |
2856 | - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ |
2857 | - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ |
2858 | - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ |
2859 | - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ |
2860 | - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ |
2861 | - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) |
2862 | - # Remember, each alternative MUST END IN *, to match a version number. |
2863 | - ;; |
2864 | - -qnx*) |
2865 | - case $basic_machine in |
2866 | - x86-* | i*86-*) |
2867 | - ;; |
2868 | - *) |
2869 | - os=-nto$os |
2870 | - ;; |
2871 | - esac |
2872 | - ;; |
2873 | - -nto-qnx*) |
2874 | - ;; |
2875 | - -nto*) |
2876 | - os=`echo $os | sed -e 's|nto|nto-qnx|'` |
2877 | - ;; |
2878 | - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ |
2879 | - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ |
2880 | - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) |
2881 | - ;; |
2882 | - -mac*) |
2883 | - os=`echo $os | sed -e 's|mac|macos|'` |
2884 | - ;; |
2885 | - -linux-dietlibc) |
2886 | - os=-linux-dietlibc |
2887 | - ;; |
2888 | - -linux*) |
2889 | - os=`echo $os | sed -e 's|linux|linux-gnu|'` |
2890 | - ;; |
2891 | - -sunos5*) |
2892 | - os=`echo $os | sed -e 's|sunos5|solaris2|'` |
2893 | - ;; |
2894 | - -sunos6*) |
2895 | - os=`echo $os | sed -e 's|sunos6|solaris3|'` |
2896 | - ;; |
2897 | - -opened*) |
2898 | - os=-openedition |
2899 | - ;; |
2900 | - -os400*) |
2901 | - os=-os400 |
2902 | - ;; |
2903 | - -wince*) |
2904 | - os=-wince |
2905 | - ;; |
2906 | - -osfrose*) |
2907 | - os=-osfrose |
2908 | - ;; |
2909 | - -osf*) |
2910 | - os=-osf |
2911 | - ;; |
2912 | - -utek*) |
2913 | - os=-bsd |
2914 | - ;; |
2915 | - -dynix*) |
2916 | - os=-bsd |
2917 | - ;; |
2918 | - -acis*) |
2919 | - os=-aos |
2920 | - ;; |
2921 | - -atheos*) |
2922 | - os=-atheos |
2923 | - ;; |
2924 | - -syllable*) |
2925 | - os=-syllable |
2926 | - ;; |
2927 | - -386bsd) |
2928 | - os=-bsd |
2929 | - ;; |
2930 | - -ctix* | -uts*) |
2931 | - os=-sysv |
2932 | - ;; |
2933 | - -nova*) |
2934 | - os=-rtmk-nova |
2935 | - ;; |
2936 | - -ns2 ) |
2937 | - os=-nextstep2 |
2938 | - ;; |
2939 | - -nsk*) |
2940 | - os=-nsk |
2941 | - ;; |
2942 | - # Preserve the version number of sinix5. |
2943 | - -sinix5.*) |
2944 | - os=`echo $os | sed -e 's|sinix|sysv|'` |
2945 | - ;; |
2946 | - -sinix*) |
2947 | - os=-sysv4 |
2948 | - ;; |
2949 | - -tpf*) |
2950 | - os=-tpf |
2951 | - ;; |
2952 | - -triton*) |
2953 | - os=-sysv3 |
2954 | - ;; |
2955 | - -oss*) |
2956 | - os=-sysv3 |
2957 | - ;; |
2958 | - -svr4) |
2959 | - os=-sysv4 |
2960 | - ;; |
2961 | - -svr3) |
2962 | - os=-sysv3 |
2963 | - ;; |
2964 | - -sysvr4) |
2965 | - os=-sysv4 |
2966 | - ;; |
2967 | - # This must come after -sysvr4. |
2968 | - -sysv*) |
2969 | - ;; |
2970 | - -ose*) |
2971 | - os=-ose |
2972 | - ;; |
2973 | - -es1800*) |
2974 | - os=-ose |
2975 | - ;; |
2976 | - -xenix) |
2977 | - os=-xenix |
2978 | - ;; |
2979 | - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) |
2980 | - os=-mint |
2981 | - ;; |
2982 | - -aros*) |
2983 | - os=-aros |
2984 | - ;; |
2985 | - -kaos*) |
2986 | - os=-kaos |
2987 | - ;; |
2988 | - -zvmoe) |
2989 | - os=-zvmoe |
2990 | - ;; |
2991 | - -dicos*) |
2992 | - os=-dicos |
2993 | - ;; |
2994 | - -none) |
2995 | - ;; |
2996 | - *) |
2997 | - # Get rid of the `-' at the beginning of $os. |
2998 | - os=`echo $os | sed 's/[^-]*-//'` |
2999 | - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 |
3000 | - exit 1 |
3001 | - ;; |
3002 | -esac |
3003 | -else |
3004 | - |
3005 | -# Here we handle the default operating systems that come with various machines. |
3006 | -# The value should be what the vendor currently ships out the door with their |
3007 | -# machine or put another way, the most popular os provided with the machine. |
3008 | - |
3009 | -# Note that if you're going to try to match "-MANUFACTURER" here (say, |
3010 | -# "-sun"), then you have to tell the case statement up towards the top |
3011 | -# that MANUFACTURER isn't an operating system. Otherwise, code above |
3012 | -# will signal an error saying that MANUFACTURER isn't an operating |
3013 | -# system, and we'll never get to this point. |
3014 | - |
3015 | -case $basic_machine in |
3016 | - score-*) |
3017 | - os=-elf |
3018 | - ;; |
3019 | - spu-*) |
3020 | - os=-elf |
3021 | - ;; |
3022 | - *-acorn) |
3023 | - os=-riscix1.2 |
3024 | - ;; |
3025 | - arm*-rebel) |
3026 | - os=-linux |
3027 | - ;; |
3028 | - arm*-semi) |
3029 | - os=-aout |
3030 | - ;; |
3031 | - c4x-* | tic4x-*) |
3032 | - os=-coff |
3033 | - ;; |
3034 | - # This must come before the *-dec entry. |
3035 | - pdp10-*) |
3036 | - os=-tops20 |
3037 | - ;; |
3038 | - pdp11-*) |
3039 | - os=-none |
3040 | - ;; |
3041 | - *-dec | vax-*) |
3042 | - os=-ultrix4.2 |
3043 | - ;; |
3044 | - m68*-apollo) |
3045 | - os=-domain |
3046 | - ;; |
3047 | - i386-sun) |
3048 | - os=-sunos4.0.2 |
3049 | - ;; |
3050 | - m68000-sun) |
3051 | - os=-sunos3 |
3052 | - # This also exists in the configure program, but was not the |
3053 | - # default. |
3054 | - # os=-sunos4 |
3055 | - ;; |
3056 | - m68*-cisco) |
3057 | - os=-aout |
3058 | - ;; |
3059 | - mep-*) |
3060 | - os=-elf |
3061 | - ;; |
3062 | - mips*-cisco) |
3063 | - os=-elf |
3064 | - ;; |
3065 | - mips*-*) |
3066 | - os=-elf |
3067 | - ;; |
3068 | - or32-*) |
3069 | - os=-coff |
3070 | - ;; |
3071 | - *-tti) # must be before sparc entry or we get the wrong os. |
3072 | - os=-sysv3 |
3073 | - ;; |
3074 | - sparc-* | *-sun) |
3075 | - os=-sunos4.1.1 |
3076 | - ;; |
3077 | - *-be) |
3078 | - os=-beos |
3079 | - ;; |
3080 | - *-haiku) |
3081 | - os=-haiku |
3082 | - ;; |
3083 | - *-ibm) |
3084 | - os=-aix |
3085 | - ;; |
3086 | - *-knuth) |
3087 | - os=-mmixware |
3088 | - ;; |
3089 | - *-wec) |
3090 | - os=-proelf |
3091 | - ;; |
3092 | - *-winbond) |
3093 | - os=-proelf |
3094 | - ;; |
3095 | - *-oki) |
3096 | - os=-proelf |
3097 | - ;; |
3098 | - *-hp) |
3099 | - os=-hpux |
3100 | - ;; |
3101 | - *-hitachi) |
3102 | - os=-hiux |
3103 | - ;; |
3104 | - i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) |
3105 | - os=-sysv |
3106 | - ;; |
3107 | - *-cbm) |
3108 | - os=-amigaos |
3109 | - ;; |
3110 | - *-dg) |
3111 | - os=-dgux |
3112 | - ;; |
3113 | - *-dolphin) |
3114 | - os=-sysv3 |
3115 | - ;; |
3116 | - m68k-ccur) |
3117 | - os=-rtu |
3118 | - ;; |
3119 | - m88k-omron*) |
3120 | - os=-luna |
3121 | - ;; |
3122 | - *-next ) |
3123 | - os=-nextstep |
3124 | - ;; |
3125 | - *-sequent) |
3126 | - os=-ptx |
3127 | - ;; |
3128 | - *-crds) |
3129 | - os=-unos |
3130 | - ;; |
3131 | - *-ns) |
3132 | - os=-genix |
3133 | - ;; |
3134 | - i370-*) |
3135 | - os=-mvs |
3136 | - ;; |
3137 | - *-next) |
3138 | - os=-nextstep3 |
3139 | - ;; |
3140 | - *-gould) |
3141 | - os=-sysv |
3142 | - ;; |
3143 | - *-highlevel) |
3144 | - os=-bsd |
3145 | - ;; |
3146 | - *-encore) |
3147 | - os=-bsd |
3148 | - ;; |
3149 | - *-sgi) |
3150 | - os=-irix |
3151 | - ;; |
3152 | - *-siemens) |
3153 | - os=-sysv4 |
3154 | - ;; |
3155 | - *-masscomp) |
3156 | - os=-rtu |
3157 | - ;; |
3158 | - f30[01]-fujitsu | f700-fujitsu) |
3159 | - os=-uxpv |
3160 | - ;; |
3161 | - *-rom68k) |
3162 | - os=-coff |
3163 | - ;; |
3164 | - *-*bug) |
3165 | - os=-coff |
3166 | - ;; |
3167 | - *-apple) |
3168 | - os=-macos |
3169 | - ;; |
3170 | - *-atari*) |
3171 | - os=-mint |
3172 | - ;; |
3173 | - *) |
3174 | - os=-none |
3175 | - ;; |
3176 | -esac |
3177 | -fi |
3178 | - |
3179 | -# Here we handle the case where we know the os, and the CPU type, but not the |
3180 | -# manufacturer. We pick the logical manufacturer. |
3181 | -vendor=unknown |
3182 | -case $basic_machine in |
3183 | - *-unknown) |
3184 | - case $os in |
3185 | - -riscix*) |
3186 | - vendor=acorn |
3187 | - ;; |
3188 | - -sunos*) |
3189 | - vendor=sun |
3190 | - ;; |
3191 | - -cnk*|-aix*) |
3192 | - vendor=ibm |
3193 | - ;; |
3194 | - -beos*) |
3195 | - vendor=be |
3196 | - ;; |
3197 | - -hpux*) |
3198 | - vendor=hp |
3199 | - ;; |
3200 | - -mpeix*) |
3201 | - vendor=hp |
3202 | - ;; |
3203 | - -hiux*) |
3204 | - vendor=hitachi |
3205 | - ;; |
3206 | - -unos*) |
3207 | - vendor=crds |
3208 | - ;; |
3209 | - -dgux*) |
3210 | - vendor=dg |
3211 | - ;; |
3212 | - -luna*) |
3213 | - vendor=omron |
3214 | - ;; |
3215 | - -genix*) |
3216 | - vendor=ns |
3217 | - ;; |
3218 | - -mvs* | -opened*) |
3219 | - vendor=ibm |
3220 | - ;; |
3221 | - -os400*) |
3222 | - vendor=ibm |
3223 | - ;; |
3224 | - -ptx*) |
3225 | - vendor=sequent |
3226 | - ;; |
3227 | - -tpf*) |
3228 | - vendor=ibm |
3229 | - ;; |
3230 | - -vxsim* | -vxworks* | -windiss*) |
3231 | - vendor=wrs |
3232 | - ;; |
3233 | - -aux*) |
3234 | - vendor=apple |
3235 | - ;; |
3236 | - -hms*) |
3237 | - vendor=hitachi |
3238 | - ;; |
3239 | - -mpw* | -macos*) |
3240 | - vendor=apple |
3241 | - ;; |
3242 | - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) |
3243 | - vendor=atari |
3244 | - ;; |
3245 | - -vos*) |
3246 | - vendor=stratus |
3247 | - ;; |
3248 | - esac |
3249 | - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` |
3250 | - ;; |
3251 | -esac |
3252 | - |
3253 | -echo $basic_machine$os |
3254 | -exit |
3255 | - |
3256 | -# Local variables: |
3257 | -# eval: (add-hook 'write-file-hooks 'time-stamp) |
3258 | -# time-stamp-start: "timestamp='" |
3259 | -# time-stamp-format: "%:y-%02m-%02d" |
3260 | -# time-stamp-end: "'" |
3261 | -# End: |
3262 | |
3263 | === modified file 'COPYING.DOC' (properties changed: -x to +x) |
3264 | === modified file 'ChangeLog' |
3265 | --- ChangeLog 2010-08-30 19:35:50 +0000 |
3266 | +++ ChangeLog 2012-12-17 03:56:19 +0000 |
3267 | @@ -1,3 +1,71 @@ |
3268 | +GNU nano 2.3.1 - 2011.05.10 |
3269 | +2011-05-10 Chris Allegretta <chrisa@asty.org> |
3270 | + * text.c (do_enter): Only increment totsize by the auto-indented amount, size the previous line's size was |
3271 | + already counted. Fixes bug reported by Robert Spanjaard. |
3272 | + |
3273 | +2011-05-08 Chris Allegretta <chrisa@asty.org> |
3274 | + * doc/syntax/Makefile.am: Finally get around to sorting the syntax file list |
3275 | + |
3276 | +2011-05-08 Matthew Wild <mattj100@Savannah> |
3277 | + * doc/syntax/spec.nanorc: New lua syntax highlighting config |
3278 | + |
3279 | +2011-03-28 Asterios Dramis <asterios.dramis@gmail.com> |
3280 | + * doc/syntax/spec.nanorc: New RPM spec file highlighting config |
3281 | + |
3282 | +2011-03-12 Chris Allegretta <chrisa@asty.org> |
3283 | + * po/*: Sync latest translation fixes, add an update_linguas.sh script. Rename |
3284 | + existing update.pl to update_sources.pl to make it more specific. |
3285 | + |
3286 | +2011-03-04 Chris Allegretta <chrisa@asty.org> |
3287 | + * color.c (color_update): Add check for whether the file even exists |
3288 | + before we try to run the magic check on it. Fixes error messages to stderr |
3289 | + when reading in files that don't exist, reported by Mike Frysinger. |
3290 | + |
3291 | +2011-03-03 Chris Allegretta <chrisa@asty.org> |
3292 | + * color.c (color_update): Remove unneeded debugging message from |
3293 | + libmagic commit. Fixed extra messages going to stderr reported by Mike Frysinger. |
3294 | + |
3295 | +GNU nano 2.3.0 - 2011.02.26 |
3296 | +2011-02-26 Chris Allegretta <chrisa@asty.org> |
3297 | + * Change RAW in function_type enum to RAWINPUT, to fix compilation on AIX, |
3298 | + reported by Richard G Daniel <skunk@iskunk.org>. |
3299 | + |
3300 | +2011-02-23 Chris Allegretta <chrisa@asty.org> |
3301 | + * Fix some more severe warnings from 'g++ -pedantic', from patch originally |
3302 | + by Eitan Adler <lists@eitanadler.com> |
3303 | + |
3304 | +2011-02-23 Kamil Dudka <kdudka@redhat.com> |
3305 | + * doc/man/nanorc.5: Fix small typo |
3306 | + |
3307 | +2011-02-22 Chris Allegretta <chrisa@asty.org> |
3308 | + * color.c (nfreeregex): Fix that we were trying to set the pointer passed by value |
3309 | + to NULL. Fixes crashes on file save reported by Ken Tyler and Matthieu Lejeune. |
3310 | + |
3311 | +2011-02-18 Chris Allegretta <chrisa@asty.org> |
3312 | + * New saved cursor position history option. Command line option -P or --poslog, rc file |
3313 | + entry "poslog". Search history changes to ~/.nano/search_history, cursor position log |
3314 | + is ~/.nano/filepos_history. Added checks to move the legacy .nano_history file to the new |
3315 | + location. Several new functions to files.c: load_poshistory(), save_poshistory(), |
3316 | + check_poshistory(), update_poshistory(), and reworking of histfilename(). New FAQ entry |
3317 | + 4.15 discussing the change and offering an interoperability workaround. |
3318 | + * files.c (load_history): Set last_search to the last search value we loaded from history, |
3319 | + so do_research will succeed without needing to manually load the last seach in. Fixes |
3320 | + bug reported by Matthieu Lejeune. |
3321 | + |
3322 | +2011-02-12 Chris Allegretta <chrisa@asty.org> |
3323 | + * Initial libmagic implementation, adapted from Eitan Adler <eitanadlerlist@gmail.com>. |
3324 | + New nanorc entry "magic" to enable this functionality, nanorc file and man page updates. |
3325 | + |
3326 | +2011-02-06 Chris Allegretta <chrisa@asty.org> |
3327 | + * src/*: Retire iso_me_harder_funcmap based on suggestion by <bernd.spaeth@gmx.net> |
3328 | + This does add 20KB to nano's executable size but it gets rid of a lot of indirection |
3329 | + that makes people stomach turn. There are several new stub functions and need of more |
3330 | + tidying as a result of this. |
3331 | + * files.c (write_file): Fix problems with writing the backup file (albeit interactively) |
3332 | + with new function prompt_failed_backupwrite(), allows more secure handling of problems |
3333 | + with failing to write the backup file compared to 'allow_insecure_backup'. |
3334 | + * winio.c (edit_redraw): Removed unused variable |
3335 | + |
3336 | 2010-11-15 Chris Allegretta <chrisa@asty.org> |
3337 | * Add a section to the FAQ about using nanorc on Win32 systems. |
3338 | |
3339 | @@ -7,8 +75,6 @@ |
3340 | disabled in restricted mode. Fixes Savannah bug 31625 reported by |
3341 | Charlie Somerville. |
3342 | |
3343 | -2010-08-10 - nano 2.2 branch cut here |
3344 | - |
3345 | GNU nano 2.2.5 - 2010.08.05 |
3346 | 2010-08-04 Lauri Kasanen <curaga@operamail.comcuraga@operamail.com> |
3347 | * doc/syntax/mgp.nanorc: New Magicpoint syntax highlighting definition |
3348 | |
3349 | === modified file 'NEWS' |
3350 | --- NEWS 2010-08-30 19:35:50 +0000 |
3351 | +++ NEWS 2012-12-17 03:56:19 +0000 |
3352 | @@ -1,12 +1,22 @@ |
3353 | -2010.11.22 - GNU nano 2.2.6 "Pimp my BBS" wants you to go to |
3354 | - www.desertbus.org and donate a few bucks for the great |
3355 | - Child's Play Charity! This is just a small release to |
3356 | - update a bug where restricted mode was not particularly |
3357 | - restricted since key bindings were introduced. It also |
3358 | - signals the return of win32 builds which now feature |
3359 | - nanorc support; please see the FAQ for details of how |
3360 | - to enable it, this feature is a bit of a kludge for now. |
3361 | - Remember that when all else fails, USE SPACE JUMP. |
3362 | +2011.05.10 - GNU nano 2.3.1 "I'm in space" is released. This |
3363 | + release includes some fixes for the new libmagic code, as |
3364 | + well as a fix for improper character counts when using |
3365 | + auto-indent. Also included are new syntax highlighting |
3366 | + definitions for RPM spec and lua files. Thanks for |
3367 | + using nano and keep circulating the tapes. |
3368 | + |
3369 | +2011.02.26 - GNU nano 2.3.0 "Septic surprise" is released. This first |
3370 | + release in the 2.3 unstable series bring several new |
3371 | + features. First, libmagic support for syntax highlighting |
3372 | + has been added on top of the existing file extension |
3373 | + and header support already available. Secondly, cursor |
3374 | + position can be saved between editing sessions with |
3375 | + the -P or --poslog command line flags, or via "set poslog" |
3376 | + in your .nanorc. Also included are some fixes for |
3377 | + compilation with g++, and better handling of issues |
3378 | + writing the backup file, which should reduce the need |
3379 | + for the 'set allow_insecure_backup" nanorc option. |
3380 | + Don't stop, get it get it, don't stop, get it get it. |
3381 | |
3382 | 2010.08.05 - GNU nano 2.2.5 "Inactivity timeout" is now available. |
3383 | This release includes slightly less restrictive checkng |
3384 | @@ -1315,4 +1325,4 @@ |
3385 | update your bookmarks, tell your friends, and all that |
3386 | jazz. |
3387 | |
3388 | -$Id: NEWS 4516 2010-08-11 02:42:32Z astyanax $ |
3389 | +$Id: NEWS 4536 2011-02-26 14:28:42Z astyanax $ |
3390 | |
3391 | === modified file 'TODO' |
3392 | --- TODO 2010-08-30 19:35:50 +0000 |
3393 | +++ TODO 2012-12-17 03:56:19 +0000 |
3394 | @@ -96,4 +96,4 @@ |
3395 | - Unjustify command (^U after ^J) [DONE =-]. |
3396 | - Username completion (~user) [DONE =-]. |
3397 | |
3398 | -$Id: TODO 4516 2010-08-11 02:42:32Z astyanax $ |
3399 | +$Id: TODO 4513 2010-08-06 01:20:51Z astyanax $ |
3400 | |
3401 | === modified file 'config.guess' |
3402 | --- config.guess 2012-10-01 12:57:07 +0000 |
3403 | +++ config.guess 2012-12-17 03:56:19 +0000 |
3404 | @@ -1,10 +1,10 @@ |
3405 | #! /bin/sh |
3406 | # Attempt to guess a canonical system name. |
3407 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
3408 | -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
3409 | -# 2011, 2012 Free Software Foundation, Inc. |
3410 | +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 |
3411 | +# Free Software Foundation, Inc. |
3412 | |
3413 | -timestamp='2012-02-10' |
3414 | +timestamp='2009-11-20' |
3415 | |
3416 | # This file is free software; you can redistribute it and/or modify it |
3417 | # under the terms of the GNU General Public License as published by |
3418 | @@ -17,7 +17,9 @@ |
3419 | # General Public License for more details. |
3420 | # |
3421 | # You should have received a copy of the GNU General Public License |
3422 | -# along with this program; if not, see <http://www.gnu.org/licenses/>. |
3423 | +# along with this program; if not, write to the Free Software |
3424 | +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA |
3425 | +# 02110-1301, USA. |
3426 | # |
3427 | # As a special exception to the GNU General Public License, if you |
3428 | # distribute this file as part of a program that contains a |
3429 | @@ -54,9 +56,8 @@ |
3430 | GNU config.guess ($timestamp) |
3431 | |
3432 | Originally written by Per Bothner. |
3433 | -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
3434 | -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 |
3435 | -Free Software Foundation, Inc. |
3436 | +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, |
3437 | +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
3438 | |
3439 | This is free software; see the source for copying conditions. There is NO |
3440 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
3441 | @@ -143,7 +144,7 @@ |
3442 | case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in |
3443 | *:NetBSD:*:*) |
3444 | # NetBSD (nbsd) targets should (where applicable) match one or |
3445 | - # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, |
3446 | + # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, |
3447 | # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently |
3448 | # switched to ELF, *-*-netbsd* would select the old |
3449 | # object file format. This provides both forward |
3450 | @@ -179,7 +180,7 @@ |
3451 | fi |
3452 | ;; |
3453 | *) |
3454 | - os=netbsd |
3455 | + os=netbsd |
3456 | ;; |
3457 | esac |
3458 | # The OS release |
3459 | @@ -222,7 +223,7 @@ |
3460 | UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` |
3461 | ;; |
3462 | *5.*) |
3463 | - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` |
3464 | + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` |
3465 | ;; |
3466 | esac |
3467 | # According to Compaq, /usr/sbin/psrinfo has been available on |
3468 | @@ -268,10 +269,7 @@ |
3469 | # A Xn.n version is an unreleased experimental baselevel. |
3470 | # 1.2 uses "1.2" for uname -r. |
3471 | echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
3472 | - # Reset EXIT trap before exiting to avoid spurious non-zero exit code. |
3473 | - exitcode=$? |
3474 | - trap '' 0 |
3475 | - exit $exitcode ;; |
3476 | + exit ;; |
3477 | Alpha\ *:Windows_NT*:*) |
3478 | # How do we know it's Interix rather than the generic POSIX subsystem? |
3479 | # Should we change UNAME_MACHINE based on the output of uname instead |
3480 | @@ -297,7 +295,7 @@ |
3481 | echo s390-ibm-zvmoe |
3482 | exit ;; |
3483 | *:OS400:*:*) |
3484 | - echo powerpc-ibm-os400 |
3485 | + echo powerpc-ibm-os400 |
3486 | exit ;; |
3487 | arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) |
3488 | echo arm-acorn-riscix${UNAME_RELEASE} |
3489 | @@ -396,23 +394,23 @@ |
3490 | # MiNT. But MiNT is downward compatible to TOS, so this should |
3491 | # be no problem. |
3492 | atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) |
3493 | - echo m68k-atari-mint${UNAME_RELEASE} |
3494 | + echo m68k-atari-mint${UNAME_RELEASE} |
3495 | exit ;; |
3496 | atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) |
3497 | echo m68k-atari-mint${UNAME_RELEASE} |
3498 | - exit ;; |
3499 | + exit ;; |
3500 | *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) |
3501 | - echo m68k-atari-mint${UNAME_RELEASE} |
3502 | + echo m68k-atari-mint${UNAME_RELEASE} |
3503 | exit ;; |
3504 | milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) |
3505 | - echo m68k-milan-mint${UNAME_RELEASE} |
3506 | - exit ;; |
3507 | + echo m68k-milan-mint${UNAME_RELEASE} |
3508 | + exit ;; |
3509 | hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) |
3510 | - echo m68k-hades-mint${UNAME_RELEASE} |
3511 | - exit ;; |
3512 | + echo m68k-hades-mint${UNAME_RELEASE} |
3513 | + exit ;; |
3514 | *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) |
3515 | - echo m68k-unknown-mint${UNAME_RELEASE} |
3516 | - exit ;; |
3517 | + echo m68k-unknown-mint${UNAME_RELEASE} |
3518 | + exit ;; |
3519 | m68k:machten:*:*) |
3520 | echo m68k-apple-machten${UNAME_RELEASE} |
3521 | exit ;; |
3522 | @@ -482,8 +480,8 @@ |
3523 | echo m88k-motorola-sysv3 |
3524 | exit ;; |
3525 | AViiON:dgux:*:*) |
3526 | - # DG/UX returns AViiON for all architectures |
3527 | - UNAME_PROCESSOR=`/usr/bin/uname -p` |
3528 | + # DG/UX returns AViiON for all architectures |
3529 | + UNAME_PROCESSOR=`/usr/bin/uname -p` |
3530 | if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] |
3531 | then |
3532 | if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ |
3533 | @@ -496,7 +494,7 @@ |
3534 | else |
3535 | echo i586-dg-dgux${UNAME_RELEASE} |
3536 | fi |
3537 | - exit ;; |
3538 | + exit ;; |
3539 | M88*:DolphinOS:*:*) # DolphinOS (SVR3) |
3540 | echo m88k-dolphin-sysv3 |
3541 | exit ;; |
3542 | @@ -553,7 +551,7 @@ |
3543 | echo rs6000-ibm-aix3.2 |
3544 | fi |
3545 | exit ;; |
3546 | - *:AIX:*:[4567]) |
3547 | + *:AIX:*:[456]) |
3548 | IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` |
3549 | if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then |
3550 | IBM_ARCH=rs6000 |
3551 | @@ -596,52 +594,52 @@ |
3552 | 9000/[678][0-9][0-9]) |
3553 | if [ -x /usr/bin/getconf ]; then |
3554 | sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` |
3555 | - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` |
3556 | - case "${sc_cpu_version}" in |
3557 | - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 |
3558 | - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 |
3559 | - 532) # CPU_PA_RISC2_0 |
3560 | - case "${sc_kernel_bits}" in |
3561 | - 32) HP_ARCH="hppa2.0n" ;; |
3562 | - 64) HP_ARCH="hppa2.0w" ;; |
3563 | + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` |
3564 | + case "${sc_cpu_version}" in |
3565 | + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 |
3566 | + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 |
3567 | + 532) # CPU_PA_RISC2_0 |
3568 | + case "${sc_kernel_bits}" in |
3569 | + 32) HP_ARCH="hppa2.0n" ;; |
3570 | + 64) HP_ARCH="hppa2.0w" ;; |
3571 | '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 |
3572 | - esac ;; |
3573 | - esac |
3574 | + esac ;; |
3575 | + esac |
3576 | fi |
3577 | if [ "${HP_ARCH}" = "" ]; then |
3578 | eval $set_cc_for_build |
3579 | - sed 's/^ //' << EOF >$dummy.c |
3580 | - |
3581 | - #define _HPUX_SOURCE |
3582 | - #include <stdlib.h> |
3583 | - #include <unistd.h> |
3584 | - |
3585 | - int main () |
3586 | - { |
3587 | - #if defined(_SC_KERNEL_BITS) |
3588 | - long bits = sysconf(_SC_KERNEL_BITS); |
3589 | - #endif |
3590 | - long cpu = sysconf (_SC_CPU_VERSION); |
3591 | - |
3592 | - switch (cpu) |
3593 | - { |
3594 | - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; |
3595 | - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; |
3596 | - case CPU_PA_RISC2_0: |
3597 | - #if defined(_SC_KERNEL_BITS) |
3598 | - switch (bits) |
3599 | - { |
3600 | - case 64: puts ("hppa2.0w"); break; |
3601 | - case 32: puts ("hppa2.0n"); break; |
3602 | - default: puts ("hppa2.0"); break; |
3603 | - } break; |
3604 | - #else /* !defined(_SC_KERNEL_BITS) */ |
3605 | - puts ("hppa2.0"); break; |
3606 | - #endif |
3607 | - default: puts ("hppa1.0"); break; |
3608 | - } |
3609 | - exit (0); |
3610 | - } |
3611 | + sed 's/^ //' << EOF >$dummy.c |
3612 | + |
3613 | + #define _HPUX_SOURCE |
3614 | + #include <stdlib.h> |
3615 | + #include <unistd.h> |
3616 | + |
3617 | + int main () |
3618 | + { |
3619 | + #if defined(_SC_KERNEL_BITS) |
3620 | + long bits = sysconf(_SC_KERNEL_BITS); |
3621 | + #endif |
3622 | + long cpu = sysconf (_SC_CPU_VERSION); |
3623 | + |
3624 | + switch (cpu) |
3625 | + { |
3626 | + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; |
3627 | + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; |
3628 | + case CPU_PA_RISC2_0: |
3629 | + #if defined(_SC_KERNEL_BITS) |
3630 | + switch (bits) |
3631 | + { |
3632 | + case 64: puts ("hppa2.0w"); break; |
3633 | + case 32: puts ("hppa2.0n"); break; |
3634 | + default: puts ("hppa2.0"); break; |
3635 | + } break; |
3636 | + #else /* !defined(_SC_KERNEL_BITS) */ |
3637 | + puts ("hppa2.0"); break; |
3638 | + #endif |
3639 | + default: puts ("hppa1.0"); break; |
3640 | + } |
3641 | + exit (0); |
3642 | + } |
3643 | EOF |
3644 | (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` |
3645 | test -z "$HP_ARCH" && HP_ARCH=hppa |
3646 | @@ -732,22 +730,22 @@ |
3647 | exit ;; |
3648 | C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) |
3649 | echo c1-convex-bsd |
3650 | - exit ;; |
3651 | + exit ;; |
3652 | C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) |
3653 | if getsysinfo -f scalar_acc |
3654 | then echo c32-convex-bsd |
3655 | else echo c2-convex-bsd |
3656 | fi |
3657 | - exit ;; |
3658 | + exit ;; |
3659 | C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) |
3660 | echo c34-convex-bsd |
3661 | - exit ;; |
3662 | + exit ;; |
3663 | C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) |
3664 | echo c38-convex-bsd |
3665 | - exit ;; |
3666 | + exit ;; |
3667 | C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) |
3668 | echo c4-convex-bsd |
3669 | - exit ;; |
3670 | + exit ;; |
3671 | CRAY*Y-MP:*:*:*) |
3672 | echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
3673 | exit ;; |
3674 | @@ -771,14 +769,14 @@ |
3675 | exit ;; |
3676 | F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) |
3677 | FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
3678 | - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
3679 | - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` |
3680 | - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
3681 | - exit ;; |
3682 | + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
3683 | + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` |
3684 | + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
3685 | + exit ;; |
3686 | 5000:UNIX_System_V:4.*:*) |
3687 | - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
3688 | - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` |
3689 | - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
3690 | + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
3691 | + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` |
3692 | + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
3693 | exit ;; |
3694 | i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) |
3695 | echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} |
3696 | @@ -790,12 +788,13 @@ |
3697 | echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} |
3698 | exit ;; |
3699 | *:FreeBSD:*:*) |
3700 | - UNAME_PROCESSOR=`/usr/bin/uname -p` |
3701 | - case ${UNAME_PROCESSOR} in |
3702 | + case ${UNAME_MACHINE} in |
3703 | + pc98) |
3704 | + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
3705 | amd64) |
3706 | echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
3707 | *) |
3708 | - echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
3709 | + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
3710 | esac |
3711 | exit ;; |
3712 | i*:CYGWIN*:*) |
3713 | @@ -804,18 +803,15 @@ |
3714 | *:MINGW*:*) |
3715 | echo ${UNAME_MACHINE}-pc-mingw32 |
3716 | exit ;; |
3717 | - i*:MSYS*:*) |
3718 | - echo ${UNAME_MACHINE}-pc-msys |
3719 | - exit ;; |
3720 | i*:windows32*:*) |
3721 | - # uname -m includes "-pc" on this system. |
3722 | - echo ${UNAME_MACHINE}-mingw32 |
3723 | + # uname -m includes "-pc" on this system. |
3724 | + echo ${UNAME_MACHINE}-mingw32 |
3725 | exit ;; |
3726 | i*:PW*:*) |
3727 | echo ${UNAME_MACHINE}-pc-pw32 |
3728 | exit ;; |
3729 | *:Interix*:*) |
3730 | - case ${UNAME_MACHINE} in |
3731 | + case ${UNAME_MACHINE} in |
3732 | x86) |
3733 | echo i586-pc-interix${UNAME_RELEASE} |
3734 | exit ;; |
3735 | @@ -861,13 +857,6 @@ |
3736 | i*86:Minix:*:*) |
3737 | echo ${UNAME_MACHINE}-pc-minix |
3738 | exit ;; |
3739 | - aarch64:Linux:*:*) |
3740 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
3741 | - exit ;; |
3742 | - aarch64_be:Linux:*:*) |
3743 | - UNAME_MACHINE=aarch64_be |
3744 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
3745 | - exit ;; |
3746 | alpha:Linux:*:*) |
3747 | case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in |
3748 | EV5) UNAME_MACHINE=alphaev5 ;; |
3749 | @@ -877,7 +866,7 @@ |
3750 | EV6) UNAME_MACHINE=alphaev6 ;; |
3751 | EV67) UNAME_MACHINE=alphaev67 ;; |
3752 | EV68*) UNAME_MACHINE=alphaev68 ;; |
3753 | - esac |
3754 | + esac |
3755 | objdump --private-headers /bin/sh | grep -q ld.so.1 |
3756 | if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi |
3757 | echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} |
3758 | @@ -889,29 +878,20 @@ |
3759 | then |
3760 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
3761 | else |
3762 | - if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ |
3763 | - | grep -q __ARM_PCS_VFP |
3764 | - then |
3765 | - echo ${UNAME_MACHINE}-unknown-linux-gnueabi |
3766 | - else |
3767 | - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf |
3768 | - fi |
3769 | + echo ${UNAME_MACHINE}-unknown-linux-gnueabi |
3770 | fi |
3771 | exit ;; |
3772 | avr32*:Linux:*:*) |
3773 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
3774 | exit ;; |
3775 | cris:Linux:*:*) |
3776 | - echo ${UNAME_MACHINE}-axis-linux-gnu |
3777 | + echo cris-axis-linux-gnu |
3778 | exit ;; |
3779 | crisv32:Linux:*:*) |
3780 | - echo ${UNAME_MACHINE}-axis-linux-gnu |
3781 | + echo crisv32-axis-linux-gnu |
3782 | exit ;; |
3783 | frv:Linux:*:*) |
3784 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
3785 | - exit ;; |
3786 | - hexagon:Linux:*:*) |
3787 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
3788 | + echo frv-unknown-linux-gnu |
3789 | exit ;; |
3790 | i*86:Linux:*:*) |
3791 | LIBC=gnu |
3792 | @@ -953,7 +933,7 @@ |
3793 | test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } |
3794 | ;; |
3795 | or32:Linux:*:*) |
3796 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
3797 | + echo or32-unknown-linux-gnu |
3798 | exit ;; |
3799 | padre:Linux:*:*) |
3800 | echo sparc-unknown-linux-gnu |
3801 | @@ -979,7 +959,7 @@ |
3802 | echo ${UNAME_MACHINE}-ibm-linux |
3803 | exit ;; |
3804 | sh64*:Linux:*:*) |
3805 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
3806 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
3807 | exit ;; |
3808 | sh*:Linux:*:*) |
3809 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
3810 | @@ -987,17 +967,14 @@ |
3811 | sparc:Linux:*:* | sparc64:Linux:*:*) |
3812 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
3813 | exit ;; |
3814 | - tile*:Linux:*:*) |
3815 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
3816 | - exit ;; |
3817 | vax:Linux:*:*) |
3818 | echo ${UNAME_MACHINE}-dec-linux-gnu |
3819 | exit ;; |
3820 | x86_64:Linux:*:*) |
3821 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
3822 | + echo x86_64-unknown-linux-gnu |
3823 | exit ;; |
3824 | xtensa*:Linux:*:*) |
3825 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
3826 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
3827 | exit ;; |
3828 | i*86:DYNIX/ptx:4*:*) |
3829 | # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. |
3830 | @@ -1006,11 +983,11 @@ |
3831 | echo i386-sequent-sysv4 |
3832 | exit ;; |
3833 | i*86:UNIX_SV:4.2MP:2.*) |
3834 | - # Unixware is an offshoot of SVR4, but it has its own version |
3835 | - # number series starting with 2... |
3836 | - # I am not positive that other SVR4 systems won't match this, |
3837 | + # Unixware is an offshoot of SVR4, but it has its own version |
3838 | + # number series starting with 2... |
3839 | + # I am not positive that other SVR4 systems won't match this, |
3840 | # I just have to hope. -- rms. |
3841 | - # Use sysv4.2uw... so that sysv4* matches it. |
3842 | + # Use sysv4.2uw... so that sysv4* matches it. |
3843 | echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} |
3844 | exit ;; |
3845 | i*86:OS/2:*:*) |
3846 | @@ -1042,7 +1019,7 @@ |
3847 | fi |
3848 | exit ;; |
3849 | i*86:*:5:[678]*) |
3850 | - # UnixWare 7.x, OpenUNIX and OpenServer 6. |
3851 | + # UnixWare 7.x, OpenUNIX and OpenServer 6. |
3852 | case `/bin/uname -X | grep "^Machine"` in |
3853 | *486*) UNAME_MACHINE=i486 ;; |
3854 | *Pentium) UNAME_MACHINE=i586 ;; |
3855 | @@ -1070,13 +1047,13 @@ |
3856 | exit ;; |
3857 | pc:*:*:*) |
3858 | # Left here for compatibility: |
3859 | - # uname -m prints for DJGPP always 'pc', but it prints nothing about |
3860 | - # the processor, so we play safe by assuming i586. |
3861 | + # uname -m prints for DJGPP always 'pc', but it prints nothing about |
3862 | + # the processor, so we play safe by assuming i586. |
3863 | # Note: whatever this is, it MUST be the same as what config.sub |
3864 | # prints for the "djgpp" host, or else GDB configury will decide that |
3865 | # this is a cross-build. |
3866 | echo i586-pc-msdosdjgpp |
3867 | - exit ;; |
3868 | + exit ;; |
3869 | Intel:Mach:3*:*) |
3870 | echo i386-pc-mach3 |
3871 | exit ;; |
3872 | @@ -1111,8 +1088,8 @@ |
3873 | /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ |
3874 | && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; |
3875 | 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) |
3876 | - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
3877 | - && { echo i486-ncr-sysv4; exit; } ;; |
3878 | + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
3879 | + && { echo i486-ncr-sysv4; exit; } ;; |
3880 | NCR*:*:4.2:* | MPRAS*:*:4.2:*) |
3881 | OS_REL='.3' |
3882 | test -r /etc/.relid \ |
3883 | @@ -1155,10 +1132,10 @@ |
3884 | echo ns32k-sni-sysv |
3885 | fi |
3886 | exit ;; |
3887 | - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort |
3888 | - # says <Richard.M.Bartel@ccMail.Census.GOV> |
3889 | - echo i586-unisys-sysv4 |
3890 | - exit ;; |
3891 | + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort |
3892 | + # says <Richard.M.Bartel@ccMail.Census.GOV> |
3893 | + echo i586-unisys-sysv4 |
3894 | + exit ;; |
3895 | *:UNIX_System_V:4*:FTX*) |
3896 | # From Gerald Hewes <hewes@openmarket.com>. |
3897 | # How about differentiating between stratus architectures? -djm |
3898 | @@ -1184,11 +1161,11 @@ |
3899 | exit ;; |
3900 | R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) |
3901 | if [ -d /usr/nec ]; then |
3902 | - echo mips-nec-sysv${UNAME_RELEASE} |
3903 | + echo mips-nec-sysv${UNAME_RELEASE} |
3904 | else |
3905 | - echo mips-unknown-sysv${UNAME_RELEASE} |
3906 | + echo mips-unknown-sysv${UNAME_RELEASE} |
3907 | fi |
3908 | - exit ;; |
3909 | + exit ;; |
3910 | BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. |
3911 | echo powerpc-be-beos |
3912 | exit ;; |
3913 | @@ -1253,9 +1230,6 @@ |
3914 | *:QNX:*:4*) |
3915 | echo i386-pc-qnx |
3916 | exit ;; |
3917 | - NEO-?:NONSTOP_KERNEL:*:*) |
3918 | - echo neo-tandem-nsk${UNAME_RELEASE} |
3919 | - exit ;; |
3920 | NSE-?:NONSTOP_KERNEL:*:*) |
3921 | echo nse-tandem-nsk${UNAME_RELEASE} |
3922 | exit ;; |
3923 | @@ -1301,13 +1275,13 @@ |
3924 | echo pdp10-unknown-its |
3925 | exit ;; |
3926 | SEI:*:*:SEIUX) |
3927 | - echo mips-sei-seiux${UNAME_RELEASE} |
3928 | + echo mips-sei-seiux${UNAME_RELEASE} |
3929 | exit ;; |
3930 | *:DragonFly:*:*) |
3931 | echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` |
3932 | exit ;; |
3933 | *:*VMS:*:*) |
3934 | - UNAME_MACHINE=`(uname -p) 2>/dev/null` |
3935 | + UNAME_MACHINE=`(uname -p) 2>/dev/null` |
3936 | case "${UNAME_MACHINE}" in |
3937 | A*) echo alpha-dec-vms ; exit ;; |
3938 | I*) echo ia64-dec-vms ; exit ;; |
3939 | @@ -1325,9 +1299,6 @@ |
3940 | i*86:AROS:*:*) |
3941 | echo ${UNAME_MACHINE}-pc-aros |
3942 | exit ;; |
3943 | - x86_64:VMkernel:*:*) |
3944 | - echo ${UNAME_MACHINE}-unknown-esx |
3945 | - exit ;; |
3946 | esac |
3947 | |
3948 | #echo '(No uname command or uname output not recognized.)' 1>&2 |
3949 | @@ -1350,11 +1321,11 @@ |
3950 | #include <sys/param.h> |
3951 | printf ("m68k-sony-newsos%s\n", |
3952 | #ifdef NEWSOS4 |
3953 | - "4" |
3954 | + "4" |
3955 | #else |
3956 | - "" |
3957 | + "" |
3958 | #endif |
3959 | - ); exit (0); |
3960 | + ); exit (0); |
3961 | #endif |
3962 | #endif |
3963 | |
3964 | |
3965 | === modified file 'config.h.in' |
3966 | --- config.h.in 2010-04-15 19:26:23 +0000 |
3967 | +++ config.h.in 2012-12-17 03:56:19 +0000 |
3968 | @@ -103,9 +103,15 @@ |
3969 | /* Define to 1 if you have the <libintl.h> header file. */ |
3970 | #undef HAVE_LIBINTL_H |
3971 | |
3972 | +/* Define to 1 if you have the `magic' library (-lmagic). */ |
3973 | +#undef HAVE_LIBMAGIC |
3974 | + |
3975 | /* Define to 1 if you have the <limits.h> header file. */ |
3976 | #undef HAVE_LIMITS_H |
3977 | |
3978 | +/* Define to 1 if you have the <magic.h> header file. */ |
3979 | +#undef HAVE_MAGIC_H |
3980 | + |
3981 | /* Define to 1 if you have the `mblen' function. */ |
3982 | #undef HAVE_MBLEN |
3983 | |
3984 | |
3985 | === modified file 'config.sub' |
3986 | --- config.sub 2012-10-01 12:57:07 +0000 |
3987 | +++ config.sub 2012-12-17 03:56:19 +0000 |
3988 | @@ -1,10 +1,10 @@ |
3989 | #! /bin/sh |
3990 | # Configuration validation subroutine script. |
3991 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
3992 | -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
3993 | -# 2011, 2012 Free Software Foundation, Inc. |
3994 | +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 |
3995 | +# Free Software Foundation, Inc. |
3996 | |
3997 | -timestamp='2012-04-18' |
3998 | +timestamp='2009-11-20' |
3999 | |
4000 | # This file is (in principle) common to ALL GNU software. |
4001 | # The presence of a machine in this file suggests that SOME GNU software |
4002 | @@ -21,7 +21,9 @@ |
4003 | # GNU General Public License for more details. |
4004 | # |
4005 | # You should have received a copy of the GNU General Public License |
4006 | -# along with this program; if not, see <http://www.gnu.org/licenses/>. |
4007 | +# along with this program; if not, write to the Free Software |
4008 | +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA |
4009 | +# 02110-1301, USA. |
4010 | # |
4011 | # As a special exception to the GNU General Public License, if you |
4012 | # distribute this file as part of a program that contains a |
4013 | @@ -73,9 +75,8 @@ |
4014 | version="\ |
4015 | GNU config.sub ($timestamp) |
4016 | |
4017 | -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
4018 | -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 |
4019 | -Free Software Foundation, Inc. |
4020 | +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, |
4021 | +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
4022 | |
4023 | This is free software; see the source for copying conditions. There is NO |
4024 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
4025 | @@ -122,18 +123,13 @@ |
4026 | # Here we must recognize all the valid KERNEL-OS combinations. |
4027 | maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` |
4028 | case $maybe_os in |
4029 | - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ |
4030 | - linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ |
4031 | - knetbsd*-gnu* | netbsd*-gnu* | \ |
4032 | + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ |
4033 | + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ |
4034 | kopensolaris*-gnu* | \ |
4035 | storm-chaos* | os2-emx* | rtmk-nova*) |
4036 | os=-$maybe_os |
4037 | basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` |
4038 | ;; |
4039 | - android-linux) |
4040 | - os=-linux-android |
4041 | - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown |
4042 | - ;; |
4043 | *) |
4044 | basic_machine=`echo $1 | sed 's/-[^-]*$//'` |
4045 | if [ $basic_machine != $1 ] |
4046 | @@ -160,8 +156,8 @@ |
4047 | os= |
4048 | basic_machine=$1 |
4049 | ;; |
4050 | - -bluegene*) |
4051 | - os=-cnk |
4052 | + -bluegene*) |
4053 | + os=-cnk |
4054 | ;; |
4055 | -sim | -cisco | -oki | -wec | -winbond) |
4056 | os= |
4057 | @@ -177,10 +173,10 @@ |
4058 | os=-chorusos |
4059 | basic_machine=$1 |
4060 | ;; |
4061 | - -chorusrdb) |
4062 | - os=-chorusrdb |
4063 | + -chorusrdb) |
4064 | + os=-chorusrdb |
4065 | basic_machine=$1 |
4066 | - ;; |
4067 | + ;; |
4068 | -hiux*) |
4069 | os=-hiuxwe2 |
4070 | ;; |
4071 | @@ -225,12 +221,6 @@ |
4072 | -isc*) |
4073 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
4074 | ;; |
4075 | - -lynx*178) |
4076 | - os=-lynxos178 |
4077 | - ;; |
4078 | - -lynx*5) |
4079 | - os=-lynxos5 |
4080 | - ;; |
4081 | -lynx*) |
4082 | os=-lynxos |
4083 | ;; |
4084 | @@ -255,22 +245,17 @@ |
4085 | # Some are omitted here because they have special meanings below. |
4086 | 1750a | 580 \ |
4087 | | a29k \ |
4088 | - | aarch64 | aarch64_be \ |
4089 | | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ |
4090 | | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ |
4091 | | am33_2.0 \ |
4092 | | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ |
4093 | - | be32 | be64 \ |
4094 | | bfin \ |
4095 | | c4x | clipper \ |
4096 | | d10v | d30v | dlx | dsp16xx \ |
4097 | - | epiphany \ |
4098 | | fido | fr30 | frv \ |
4099 | | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ |
4100 | - | hexagon \ |
4101 | | i370 | i860 | i960 | ia64 \ |
4102 | | ip2k | iq2000 \ |
4103 | - | le32 | le64 \ |
4104 | | lm32 \ |
4105 | | m32c | m32r | m32rle | m68000 | m68k | m88k \ |
4106 | | maxq | mb | microblaze | mcore | mep | metag \ |
4107 | @@ -296,39 +281,29 @@ |
4108 | | moxie \ |
4109 | | mt \ |
4110 | | msp430 \ |
4111 | - | nds32 | nds32le | nds32be \ |
4112 | | nios | nios2 \ |
4113 | | ns16k | ns32k \ |
4114 | - | open8 \ |
4115 | | or32 \ |
4116 | | pdp10 | pdp11 | pj | pjl \ |
4117 | - | powerpc | powerpc64 | powerpc64le | powerpcle \ |
4118 | + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ |
4119 | | pyramid \ |
4120 | - | rl78 | rx \ |
4121 | + | rx \ |
4122 | | score \ |
4123 | | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ |
4124 | | sh64 | sh64le \ |
4125 | | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ |
4126 | | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ |
4127 | - | spu \ |
4128 | - | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ |
4129 | + | spu | strongarm \ |
4130 | + | tahoe | thumb | tic4x | tic80 | tron \ |
4131 | | ubicom32 \ |
4132 | - | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ |
4133 | + | v850 | v850e \ |
4134 | | we32k \ |
4135 | - | x86 | xc16x | xstormy16 | xtensa \ |
4136 | + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ |
4137 | | z8k | z80) |
4138 | basic_machine=$basic_machine-unknown |
4139 | ;; |
4140 | - c54x) |
4141 | - basic_machine=tic54x-unknown |
4142 | - ;; |
4143 | - c55x) |
4144 | - basic_machine=tic55x-unknown |
4145 | - ;; |
4146 | - c6x) |
4147 | - basic_machine=tic6x-unknown |
4148 | - ;; |
4149 | - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) |
4150 | + m6811 | m68hc11 | m6812 | m68hc12 | picochip) |
4151 | + # Motorola 68HC11/12. |
4152 | basic_machine=$basic_machine-unknown |
4153 | os=-none |
4154 | ;; |
4155 | @@ -338,21 +313,6 @@ |
4156 | basic_machine=mt-unknown |
4157 | ;; |
4158 | |
4159 | - strongarm | thumb | xscale) |
4160 | - basic_machine=arm-unknown |
4161 | - ;; |
4162 | - xgate) |
4163 | - basic_machine=$basic_machine-unknown |
4164 | - os=-none |
4165 | - ;; |
4166 | - xscaleeb) |
4167 | - basic_machine=armeb-unknown |
4168 | - ;; |
4169 | - |
4170 | - xscaleel) |
4171 | - basic_machine=armel-unknown |
4172 | - ;; |
4173 | - |
4174 | # We use `pc' rather than `unknown' |
4175 | # because (1) that's what they normally are, and |
4176 | # (2) the word "unknown" tends to confuse beginning users. |
4177 | @@ -367,25 +327,21 @@ |
4178 | # Recognize the basic CPU types with company name. |
4179 | 580-* \ |
4180 | | a29k-* \ |
4181 | - | aarch64-* | aarch64_be-* \ |
4182 | | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ |
4183 | | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ |
4184 | | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ |
4185 | | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ |
4186 | | avr-* | avr32-* \ |
4187 | - | be32-* | be64-* \ |
4188 | | bfin-* | bs2000-* \ |
4189 | - | c[123]* | c30-* | [cjt]90-* | c4x-* \ |
4190 | + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ |
4191 | | clipper-* | craynv-* | cydra-* \ |
4192 | | d10v-* | d30v-* | dlx-* \ |
4193 | | elxsi-* \ |
4194 | | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ |
4195 | | h8300-* | h8500-* \ |
4196 | | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ |
4197 | - | hexagon-* \ |
4198 | | i*86-* | i860-* | i960-* | ia64-* \ |
4199 | | ip2k-* | iq2000-* \ |
4200 | - | le32-* | le64-* \ |
4201 | | lm32-* \ |
4202 | | m32c-* | m32r-* | m32rle-* \ |
4203 | | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ |
4204 | @@ -411,29 +367,25 @@ |
4205 | | mmix-* \ |
4206 | | mt-* \ |
4207 | | msp430-* \ |
4208 | - | nds32-* | nds32le-* | nds32be-* \ |
4209 | | nios-* | nios2-* \ |
4210 | | none-* | np1-* | ns16k-* | ns32k-* \ |
4211 | - | open8-* \ |
4212 | | orion-* \ |
4213 | | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ |
4214 | - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ |
4215 | + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ |
4216 | | pyramid-* \ |
4217 | - | rl78-* | romp-* | rs6000-* | rx-* \ |
4218 | + | romp-* | rs6000-* | rx-* \ |
4219 | | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ |
4220 | | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ |
4221 | | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ |
4222 | | sparclite-* \ |
4223 | - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ |
4224 | - | tahoe-* \ |
4225 | - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ |
4226 | - | tile*-* \ |
4227 | + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ |
4228 | + | tahoe-* | thumb-* \ |
4229 | + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ |
4230 | | tron-* \ |
4231 | | ubicom32-* \ |
4232 | - | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ |
4233 | - | vax-* \ |
4234 | + | v850-* | v850e-* | vax-* \ |
4235 | | we32k-* \ |
4236 | - | x86-* | x86_64-* | xc16x-* | xps100-* \ |
4237 | + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ |
4238 | | xstormy16-* | xtensa*-* \ |
4239 | | ymp-* \ |
4240 | | z8k-* | z80-*) |
4241 | @@ -458,7 +410,7 @@ |
4242 | basic_machine=a29k-amd |
4243 | os=-udi |
4244 | ;; |
4245 | - abacus) |
4246 | + abacus) |
4247 | basic_machine=abacus-unknown |
4248 | ;; |
4249 | adobe68k) |
4250 | @@ -528,20 +480,11 @@ |
4251 | basic_machine=powerpc-ibm |
4252 | os=-cnk |
4253 | ;; |
4254 | - c54x-*) |
4255 | - basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` |
4256 | - ;; |
4257 | - c55x-*) |
4258 | - basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` |
4259 | - ;; |
4260 | - c6x-*) |
4261 | - basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` |
4262 | - ;; |
4263 | c90) |
4264 | basic_machine=c90-cray |
4265 | os=-unicos |
4266 | ;; |
4267 | - cegcc) |
4268 | + cegcc) |
4269 | basic_machine=arm-unknown |
4270 | os=-cegcc |
4271 | ;; |
4272 | @@ -573,7 +516,7 @@ |
4273 | basic_machine=craynv-cray |
4274 | os=-unicosmp |
4275 | ;; |
4276 | - cr16 | cr16-*) |
4277 | + cr16) |
4278 | basic_machine=cr16-unknown |
4279 | os=-elf |
4280 | ;; |
4281 | @@ -731,6 +674,7 @@ |
4282 | i370-ibm* | ibm*) |
4283 | basic_machine=i370-ibm |
4284 | ;; |
4285 | +# I'm not sure what "Sysv32" means. Should this be sysv3.2? |
4286 | i*86v32) |
4287 | basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` |
4288 | os=-sysv32 |
4289 | @@ -788,7 +732,7 @@ |
4290 | basic_machine=ns32k-utek |
4291 | os=-sysv |
4292 | ;; |
4293 | - microblaze) |
4294 | + microblaze) |
4295 | basic_machine=microblaze-xilinx |
4296 | ;; |
4297 | mingw32) |
4298 | @@ -827,18 +771,10 @@ |
4299 | ms1-*) |
4300 | basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` |
4301 | ;; |
4302 | - msys) |
4303 | - basic_machine=i386-pc |
4304 | - os=-msys |
4305 | - ;; |
4306 | mvs) |
4307 | basic_machine=i370-ibm |
4308 | os=-mvs |
4309 | ;; |
4310 | - nacl) |
4311 | - basic_machine=le32-unknown |
4312 | - os=-nacl |
4313 | - ;; |
4314 | ncr3000) |
4315 | basic_machine=i486-ncr |
4316 | os=-sysv4 |
4317 | @@ -903,12 +839,6 @@ |
4318 | np1) |
4319 | basic_machine=np1-gould |
4320 | ;; |
4321 | - neo-tandem) |
4322 | - basic_machine=neo-tandem |
4323 | - ;; |
4324 | - nse-tandem) |
4325 | - basic_machine=nse-tandem |
4326 | - ;; |
4327 | nsr-tandem) |
4328 | basic_machine=nsr-tandem |
4329 | ;; |
4330 | @@ -991,10 +921,9 @@ |
4331 | ;; |
4332 | power) basic_machine=power-ibm |
4333 | ;; |
4334 | - ppc | ppcbe) basic_machine=powerpc-unknown |
4335 | + ppc) basic_machine=powerpc-unknown |
4336 | ;; |
4337 | - ppc-* | ppcbe-*) |
4338 | - basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` |
4339 | + ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` |
4340 | ;; |
4341 | ppcle | powerpclittle | ppc-le | powerpc-little) |
4342 | basic_machine=powerpcle-unknown |
4343 | @@ -1088,9 +1017,6 @@ |
4344 | basic_machine=i860-stratus |
4345 | os=-sysv4 |
4346 | ;; |
4347 | - strongarm-* | thumb-*) |
4348 | - basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` |
4349 | - ;; |
4350 | sun2) |
4351 | basic_machine=m68000-sun |
4352 | ;; |
4353 | @@ -1147,8 +1073,20 @@ |
4354 | basic_machine=t90-cray |
4355 | os=-unicos |
4356 | ;; |
4357 | + tic54x | c54x*) |
4358 | + basic_machine=tic54x-unknown |
4359 | + os=-coff |
4360 | + ;; |
4361 | + tic55x | c55x*) |
4362 | + basic_machine=tic55x-unknown |
4363 | + os=-coff |
4364 | + ;; |
4365 | + tic6x | c6x*) |
4366 | + basic_machine=tic6x-unknown |
4367 | + os=-coff |
4368 | + ;; |
4369 | tile*) |
4370 | - basic_machine=$basic_machine-unknown |
4371 | + basic_machine=tile-unknown |
4372 | os=-linux-gnu |
4373 | ;; |
4374 | tx39) |
4375 | @@ -1218,9 +1156,6 @@ |
4376 | xps | xps100) |
4377 | basic_machine=xps100-honeywell |
4378 | ;; |
4379 | - xscale-* | xscalee[bl]-*) |
4380 | - basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` |
4381 | - ;; |
4382 | ymp) |
4383 | basic_machine=ymp-cray |
4384 | os=-unicos |
4385 | @@ -1318,11 +1253,11 @@ |
4386 | if [ x"$os" != x"" ] |
4387 | then |
4388 | case $os in |
4389 | - # First match some system type aliases |
4390 | - # that might get confused with valid system types. |
4391 | + # First match some system type aliases |
4392 | + # that might get confused with valid system types. |
4393 | # -solaris* is a basic system type, with this one exception. |
4394 | - -auroraux) |
4395 | - os=-auroraux |
4396 | + -auroraux) |
4397 | + os=-auroraux |
4398 | ;; |
4399 | -solaris1 | -solaris1.*) |
4400 | os=`echo $os | sed -e 's|solaris1|sunos4|'` |
4401 | @@ -1358,9 +1293,8 @@ |
4402 | | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ |
4403 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ |
4404 | | -chorusos* | -chorusrdb* | -cegcc* \ |
4405 | - | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
4406 | - | -mingw32* | -linux-gnu* | -linux-android* \ |
4407 | - | -linux-newlib* | -linux-uclibc* \ |
4408 | + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
4409 | + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ |
4410 | | -uxpv* | -beos* | -mpeix* | -udk* \ |
4411 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ |
4412 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ |
4413 | @@ -1407,7 +1341,7 @@ |
4414 | -opened*) |
4415 | os=-openedition |
4416 | ;; |
4417 | - -os400*) |
4418 | + -os400*) |
4419 | os=-os400 |
4420 | ;; |
4421 | -wince*) |
4422 | @@ -1456,7 +1390,7 @@ |
4423 | -sinix*) |
4424 | os=-sysv4 |
4425 | ;; |
4426 | - -tpf*) |
4427 | + -tpf*) |
4428 | os=-tpf |
4429 | ;; |
4430 | -triton*) |
4431 | @@ -1501,8 +1435,6 @@ |
4432 | -dicos*) |
4433 | os=-dicos |
4434 | ;; |
4435 | - -nacl*) |
4436 | - ;; |
4437 | -none) |
4438 | ;; |
4439 | *) |
4440 | @@ -1525,10 +1457,10 @@ |
4441 | # system, and we'll never get to this point. |
4442 | |
4443 | case $basic_machine in |
4444 | - score-*) |
4445 | + score-*) |
4446 | os=-elf |
4447 | ;; |
4448 | - spu-*) |
4449 | + spu-*) |
4450 | os=-elf |
4451 | ;; |
4452 | *-acorn) |
4453 | @@ -1540,20 +1472,8 @@ |
4454 | arm*-semi) |
4455 | os=-aout |
4456 | ;; |
4457 | - c4x-* | tic4x-*) |
4458 | - os=-coff |
4459 | - ;; |
4460 | - hexagon-*) |
4461 | - os=-elf |
4462 | - ;; |
4463 | - tic54x-*) |
4464 | - os=-coff |
4465 | - ;; |
4466 | - tic55x-*) |
4467 | - os=-coff |
4468 | - ;; |
4469 | - tic6x-*) |
4470 | - os=-coff |
4471 | + c4x-* | tic4x-*) |
4472 | + os=-coff |
4473 | ;; |
4474 | # This must come before the *-dec entry. |
4475 | pdp10-*) |
4476 | @@ -1573,11 +1493,14 @@ |
4477 | ;; |
4478 | m68000-sun) |
4479 | os=-sunos3 |
4480 | + # This also exists in the configure program, but was not the |
4481 | + # default. |
4482 | + # os=-sunos4 |
4483 | ;; |
4484 | m68*-cisco) |
4485 | os=-aout |
4486 | ;; |
4487 | - mep-*) |
4488 | + mep-*) |
4489 | os=-elf |
4490 | ;; |
4491 | mips*-cisco) |
4492 | @@ -1604,7 +1527,7 @@ |
4493 | *-ibm) |
4494 | os=-aix |
4495 | ;; |
4496 | - *-knuth) |
4497 | + *-knuth) |
4498 | os=-mmixware |
4499 | ;; |
4500 | *-wec) |
4501 | |
4502 | === modified file 'configure' |
4503 | --- configure 2010-08-30 19:35:50 +0000 |
4504 | +++ configure 2012-12-17 03:56:19 +0000 |
4505 | @@ -1,6 +1,6 @@ |
4506 | #! /bin/sh |
4507 | # Guess values for system-dependent variables and create Makefiles. |
4508 | -# Generated by GNU Autoconf 2.65 for GNU nano 2.2.6. |
4509 | +# Generated by GNU Autoconf 2.65 for GNU nano 2.3.1. |
4510 | # |
4511 | # Report bugs to <nano-devel@gnu.org>. |
4512 | # |
4513 | @@ -552,8 +552,8 @@ |
4514 | # Identity of this package. |
4515 | PACKAGE_NAME='GNU nano' |
4516 | PACKAGE_TARNAME='nano' |
4517 | -PACKAGE_VERSION='2.2.6' |
4518 | -PACKAGE_STRING='GNU nano 2.2.6' |
4519 | +PACKAGE_VERSION='2.3.1' |
4520 | +PACKAGE_STRING='GNU nano 2.3.1' |
4521 | PACKAGE_BUGREPORT='nano-devel@gnu.org' |
4522 | PACKAGE_URL='http://www.gnu.org/software/nano/' |
4523 | |
4524 | @@ -1300,7 +1300,7 @@ |
4525 | # Omit some internal or obsolete options to make the list less imposing. |
4526 | # This message is too long to be a string in the A/UX 3.1 sh. |
4527 | cat <<_ACEOF |
4528 | -\`configure' configures GNU nano 2.2.6 to adapt to many kinds of systems. |
4529 | +\`configure' configures GNU nano 2.3.1 to adapt to many kinds of systems. |
4530 | |
4531 | Usage: $0 [OPTION]... [VAR=VALUE]... |
4532 | |
4533 | @@ -1371,7 +1371,7 @@ |
4534 | |
4535 | if test -n "$ac_init_help"; then |
4536 | case $ac_init_help in |
4537 | - short | recursive ) echo "Configuration of GNU nano 2.2.6:";; |
4538 | + short | recursive ) echo "Configuration of GNU nano 2.3.1:";; |
4539 | esac |
4540 | cat <<\_ACEOF |
4541 | |
4542 | @@ -1492,7 +1492,7 @@ |
4543 | test -n "$ac_init_help" && exit $ac_status |
4544 | if $ac_init_version; then |
4545 | cat <<\_ACEOF |
4546 | -GNU nano configure 2.2.6 |
4547 | +GNU nano configure 2.3.1 |
4548 | generated by GNU Autoconf 2.65 |
4549 | |
4550 | Copyright (C) 2009 Free Software Foundation, Inc. |
4551 | @@ -1863,7 +1863,7 @@ |
4552 | This file contains any messages produced by compilers while |
4553 | running configure, to aid debugging if configure makes a mistake. |
4554 | |
4555 | -It was created by GNU nano $as_me 2.2.6, which was |
4556 | +It was created by GNU nano $as_me 2.3.1, which was |
4557 | generated by GNU Autoconf 2.65. Invocation command line was |
4558 | |
4559 | $ $0 $@ |
4560 | @@ -2782,7 +2782,7 @@ |
4561 | |
4562 | # Define the identity of the package. |
4563 | PACKAGE='nano' |
4564 | - VERSION='2.2.6' |
4565 | + VERSION='2.3.1' |
4566 | |
4567 | |
4568 | cat >>confdefs.h <<_ACEOF |
4569 | @@ -6758,7 +6758,7 @@ |
4570 | |
4571 | fi |
4572 | |
4573 | -for ac_header in getopt.h libintl.h limits.h regex.h sys/param.h wchar.h wctype.h stdarg.h |
4574 | +for ac_header in getopt.h libintl.h limits.h regex.h sys/param.h wchar.h wctype.h stdarg.h magic.h |
4575 | do : |
4576 | as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` |
4577 | ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" |
4578 | @@ -8316,6 +8316,51 @@ |
4579 | fi |
4580 | |
4581 | |
4582 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for magic_open in -lmagic" >&5 |
4583 | +$as_echo_n "checking for magic_open in -lmagic... " >&6; } |
4584 | +if test "${ac_cv_lib_magic_magic_open+set}" = set; then : |
4585 | + $as_echo_n "(cached) " >&6 |
4586 | +else |
4587 | + ac_check_lib_save_LIBS=$LIBS |
4588 | +LIBS="-lmagic $LIBS" |
4589 | +cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4590 | +/* end confdefs.h. */ |
4591 | + |
4592 | +/* Override any GCC internal prototype to avoid an error. |
4593 | + Use char because int might match the return type of a GCC |
4594 | + builtin and then its argument prototype would still apply. */ |
4595 | +#ifdef __cplusplus |
4596 | +extern "C" |
4597 | +#endif |
4598 | +char magic_open (); |
4599 | +int |
4600 | +main () |
4601 | +{ |
4602 | +return magic_open (); |
4603 | + ; |
4604 | + return 0; |
4605 | +} |
4606 | +_ACEOF |
4607 | +if ac_fn_c_try_link "$LINENO"; then : |
4608 | + ac_cv_lib_magic_magic_open=yes |
4609 | +else |
4610 | + ac_cv_lib_magic_magic_open=no |
4611 | +fi |
4612 | +rm -f core conftest.err conftest.$ac_objext \ |
4613 | + conftest$ac_exeext conftest.$ac_ext |
4614 | +LIBS=$ac_check_lib_save_LIBS |
4615 | +fi |
4616 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_magic_magic_open" >&5 |
4617 | +$as_echo "$ac_cv_lib_magic_magic_open" >&6; } |
4618 | +if test "x$ac_cv_lib_magic_magic_open" = x""yes; then : |
4619 | + cat >>confdefs.h <<_ACEOF |
4620 | +#define HAVE_LIBMAGIC 1 |
4621 | +_ACEOF |
4622 | + |
4623 | + LIBS="-lmagic $LIBS" |
4624 | + |
4625 | +fi |
4626 | + |
4627 | |
4628 | # Check for groff html support |
4629 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HTML support in groff" >&5 |
4630 | @@ -8884,7 +8929,7 @@ |
4631 | # report actual input values of CONFIG_FILES etc. instead of their |
4632 | # values after options handling. |
4633 | ac_log=" |
4634 | -This file was extended by GNU nano $as_me 2.2.6, which was |
4635 | +This file was extended by GNU nano $as_me 2.3.1, which was |
4636 | generated by GNU Autoconf 2.65. Invocation command line was |
4637 | |
4638 | CONFIG_FILES = $CONFIG_FILES |
4639 | @@ -8952,7 +8997,7 @@ |
4640 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
4641 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
4642 | ac_cs_version="\\ |
4643 | -GNU nano config.status 2.2.6 |
4644 | +GNU nano config.status 2.3.1 |
4645 | configured by $0, generated by GNU Autoconf 2.65, |
4646 | with options \\"\$ac_cs_config\\" |
4647 | |
4648 | |
4649 | === modified file 'configure.ac' |
4650 | --- configure.ac 2010-08-30 19:35:50 +0000 |
4651 | +++ configure.ac 2012-12-17 03:56:19 +0000 |
4652 | @@ -18,9 +18,9 @@ |
4653 | # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, |
4654 | # USA. |
4655 | # |
4656 | -# $Id: configure.ac 4516 2010-08-11 02:42:32Z astyanax $ |
4657 | +# $Id: configure.ac 4538 2011-02-26 14:41:55Z astyanax $ |
4658 | |
4659 | -AC_INIT([GNU nano], [2.2.6], [nano-devel@gnu.org], [nano]) |
4660 | +AC_INIT([GNU nano], [2.3.1], [nano-devel@gnu.org], [nano]) |
4661 | AC_CONFIG_SRCDIR([src/nano.c]) |
4662 | AC_CANONICAL_TARGET([]) |
4663 | AM_INIT_AUTOMAKE |
4664 | @@ -50,7 +50,7 @@ |
4665 | dnl Checks for header files. |
4666 | |
4667 | AC_HEADER_STDC |
4668 | -AC_CHECK_HEADERS(getopt.h libintl.h limits.h regex.h sys/param.h wchar.h wctype.h stdarg.h) |
4669 | +AC_CHECK_HEADERS(getopt.h libintl.h limits.h regex.h sys/param.h wchar.h wctype.h stdarg.h magic.h) |
4670 | |
4671 | dnl Checks for options. |
4672 | |
4673 | @@ -583,6 +583,7 @@ |
4674 | AC_MSG_RESULT(no), |
4675 | AC_MSG_WARN([*** Can't check for macro redefinability when cross-compiling])) |
4676 | |
4677 | +AC_CHECK_LIB(magic, magic_open) |
4678 | |
4679 | # Check for groff html support |
4680 | AC_MSG_CHECKING([for HTML support in groff]) |
4681 | |
4682 | === modified file 'debian/changelog' |
4683 | --- debian/changelog 2012-10-01 12:57:07 +0000 |
4684 | +++ debian/changelog 2012-12-17 03:56:19 +0000 |
4685 | @@ -1,3 +1,10 @@ |
4686 | +nano (2.3.1-0ubuntu1) raring; urgency=low |
4687 | + |
4688 | + * New upstream release (LP: #1091076) |
4689 | + - Refreshed auto.patch and sent it upstream. |
4690 | + |
4691 | + -- Matthew Fischer <matthew.fischer@canonical.com> Sun, 16 Dec 2012 20:45:57 -0700 |
4692 | + |
4693 | nano (2.2.6-1ubuntu1) quantal; urgency=low |
4694 | |
4695 | * Update config.guess,sub for aarch64 |
4696 | |
4697 | === modified file 'doc/faq.html' |
4698 | --- doc/faq.html 2010-08-30 19:35:50 +0000 |
4699 | +++ doc/faq.html 2012-12-17 03:56:19 +0000 |
4700 | @@ -46,7 +46,8 @@ |
4701 | <a href="#4.11">4.11. How do I make nano my default editor (in Pine, mutt, etc.)?</a><br> |
4702 | <a href="#4.12">4.12. I've compiled nano with color support, but I don't see any color when I run it!</a><br> |
4703 | <a href="#4.13">4.13. How do I select text for or paste text from the clipboard in an X terminal when I'm running nano in one and nano's mouse support is turned on?</a><br> |
4704 | - <a href="#4.14">4.14. When I paste text into a document, each line gets indented further than the last. Why does nano do this, and how can I avoid it?</a></p></blockquote> |
4705 | + <a href="#4.14">4.14. When I paste text into a document, each line gets indented further than the last. Why does nano do this, and how can I avoid it?</a><br> |
4706 | + <a href="#4.15">4.15. On startup I get a message that says "Detected a legacy nano history file". Now other nano versionc can't find my search history!</a></p></blockquote> |
4707 | <h2><a href="#5">5. Internationalization</a></h2> |
4708 | <blockquote><p><a href="#5.1">5.1. There's no translation for my language!</a><br> |
4709 | <a href="#5.2">5.2. I don't like the translation for <x> in my language. How can I fix it?</a><br> |
4710 | @@ -222,6 +223,11 @@ |
4711 | <blockquote><p>Try holding down the Shift key and selecting or pasting the text as you normally would.</p></blockquote> |
4712 | <h2><a name="4.14"></a>4.14. When I paste text into a document, each line gets indented further than the last. Why does nano do this, and how can I avoid it?</h2> |
4713 | <blockquote><p>You have the autoindent feature turned on. Hit Meta-I to turn it off, paste your text, and then hit Meta-I again to turn it back on.</p></blockquote> |
4714 | +<h2><a name="4.15"></a>4.15. On startup I get a message that says "Detected a legacy nano history file". Now other nano versionc can't find my search history!</h2> |
4715 | +<blockquote><p>In nano 2.3.0, cursor position history was introduced, and both files now reside under a .nano directory in your home. Nano was trying to move this file into the new location so it could continue to use it. This means that if you try and use an earlier version of nano, it will be unable to see your previous search history. To fix this, run the following commands:<br> |
4716 | +mv ~/.nano/search_history ~/.nano_history<br> |
4717 | +ln -sf ~/.nano_history ~/.nano/search_history<br> |
4718 | +</p></blockquote> |
4719 | <hr width="100%"> |
4720 | <h1><a name="5"></a>5. Internationalization</h1> |
4721 | <h2><a name="5.1"></a>5.1. There's no translation for my language!</h2> |
4722 | @@ -326,6 +332,6 @@ |
4723 | 2000/11/18 - Previous string display (4.5).<br> |
4724 | 2000/09/27 - Moved addresses to nano-editor.org.<br> |
4725 | 2000/06/31 - Initial framework.</p></blockquote> |
4726 | -<p>$Id: faq.html 4521 2010-11-15 06:58:22Z astyanax $</p> |
4727 | +<p>$Id: faq.html 4530 2011-02-18 07:30:57Z astyanax $</p> |
4728 | </body> |
4729 | </html> |
4730 | |
4731 | === modified file 'doc/man/fr/nano.1.html' |
4732 | --- doc/man/fr/nano.1.html 2010-08-30 19:35:50 +0000 |
4733 | +++ doc/man/fr/nano.1.html 2012-12-17 03:56:19 +0000 |
4734 | @@ -1,25 +1,14 @@ |
4735 | -<!-- Creator : groff version 1.20.1 --> |
4736 | -<!-- CreationDate: Tue Aug 10 22:44:00 2010 --> |
4737 | -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" |
4738 | -"http://www.w3.org/TR/html4/loose.dtd"> |
4739 | +<!-- Creator : groff version 1.18.1 --> |
4740 | +<!-- CreationDate: Fri Nov 27 00:08:49 2009 --> |
4741 | <html> |
4742 | <head> |
4743 | <meta name="generator" content="groff -Thtml, see www.gnu.org"> |
4744 | -<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> |
4745 | <meta name="Content-Style" content="text/css"> |
4746 | -<style type="text/css"> |
4747 | - p { margin-top: 0; margin-bottom: 0; vertical-align: top } |
4748 | - pre { margin-top: 0; margin-bottom: 0; vertical-align: top } |
4749 | - table { margin-top: 0; margin-bottom: 0; vertical-align: top } |
4750 | - h1 { text-align: center } |
4751 | -</style> |
4752 | <title>NANO</title> |
4753 | - |
4754 | </head> |
4755 | <body> |
4756 | |
4757 | -<h1 align="center">NANO</h1> |
4758 | - |
4759 | +<h1 align=center>NANO</h1> |
4760 | <a href="#NOM">NOM</a><br> |
4761 | <a href="#SYNOPSIS">SYNOPSIS</a><br> |
4762 | <a href="#DESCRIPTION">DESCRIPTION</a><br> |
4763 | @@ -33,528 +22,987 @@ |
4764 | <a href="#TRADUCTION">TRADUCTION</a><br> |
4765 | |
4766 | <hr> |
4767 | - |
4768 | - |
4769 | -<h2>NOM |
4770 | <a name="NOM"></a> |
4771 | -</h2> |
4772 | - |
4773 | - |
4774 | -<p style="margin-left:11%; margin-top: 1em">nano − |
4775 | -NAno un NOuvel éditeur, un clone libre et |
4776 | -amélioré de Pico</p> |
4777 | - |
4778 | -<h2>SYNOPSIS |
4779 | +<h2>NOM</h2> |
4780 | +<!-- INDENTATION --> |
4781 | +<table width="100%" border=0 rules="none" frame="void" |
4782 | + cols="2" cellspacing="0" cellpadding="0"> |
4783 | +<tr valign="top" align="left"> |
4784 | +<td width="10%"></td> |
4785 | +<td width="89%"> |
4786 | +<p>nano − NAno un NOuvel éditeur, un clone |
4787 | +libre et amélioré de Pico</p> |
4788 | +</td> |
4789 | +</table> |
4790 | <a name="SYNOPSIS"></a> |
4791 | -</h2> |
4792 | - |
4793 | - |
4794 | -<p style="margin-left:11%; margin-top: 1em"><b>nano</b> |
4795 | -<i>[OPTIONS] [[+LIGNE,COLONNE] FICHIER]...</i></p> |
4796 | - |
4797 | -<h2>DESCRIPTION |
4798 | +<h2>SYNOPSIS</h2> |
4799 | +<!-- INDENTATION --> |
4800 | +<table width="100%" border=0 rules="none" frame="void" |
4801 | + cols="2" cellspacing="0" cellpadding="0"> |
4802 | +<tr valign="top" align="left"> |
4803 | +<td width="10%"></td> |
4804 | +<td width="89%"> |
4805 | +<p><b>nano</b> <i>[OPTIONS] [[+LIGNE,COLONNE] |
4806 | +FICHIER]...</i></p> |
4807 | +</td> |
4808 | +</table> |
4809 | <a name="DESCRIPTION"></a> |
4810 | -</h2> |
4811 | - |
4812 | - |
4813 | -<p style="margin-left:11%; margin-top: 1em">Cette page de |
4814 | -manuel décrit brièvement la commande |
4815 | -<b>nano</b>.</p> |
4816 | - |
4817 | -<p style="margin-left:11%; margin-top: 1em"><b>nano</b> est |
4818 | -un éditeur petit, sympathique et libre, qui vise |
4819 | -à remplacer Pico, l’éditeur par |
4820 | -défaut du logiciel non libre Pine. <b>nano</b> ne se |
4821 | -contentant pas de copier l’interface et |
4822 | -l’ergonomie de Pico, il offre également |
4823 | -certaines fonctions manquantes (ou désactivées |
4824 | -par défaut) dans Pico. Ces fonctionnalités |
4825 | -sont, par exemple, les fonctions de recherche et de |
4826 | -remplacement, et la possibilité de sauter directement |
4827 | -à une ligne et à une colonne |
4828 | -précise.</p> |
4829 | - |
4830 | -<h2>OPTIONS |
4831 | +<h2>DESCRIPTION</h2> |
4832 | +<!-- INDENTATION --> |
4833 | +<table width="100%" border=0 rules="none" frame="void" |
4834 | + cols="2" cellspacing="0" cellpadding="0"> |
4835 | +<tr valign="top" align="left"> |
4836 | +<td width="10%"></td> |
4837 | +<td width="89%"> |
4838 | +<p>Cette page de manuel décrit brièvement la |
4839 | +commande <b>nano</b>.</p> |
4840 | +<!-- INDENTATION --> |
4841 | +<p><b>nano</b> est un éditeur petit, sympathique et |
4842 | +libre, qui vise à remplacer Pico, |
4843 | +l’éditeur par défaut du logiciel non |
4844 | +libre Pine. <b>nano</b> ne se contentant pas de copier |
4845 | +l’interface et l’ergonomie de Pico, il offre |
4846 | +également certaines fonctions manquantes (ou |
4847 | +désactivées par défaut) dans Pico. Ces |
4848 | +fonctionnalités sont, par exemple, les fonctions de |
4849 | +recherche et de remplacement, et la possibilité de |
4850 | +sauter directement à une ligne et à une |
4851 | +colonne précise.</p> |
4852 | +</td> |
4853 | +</table> |
4854 | <a name="OPTIONS"></a> |
4855 | -</h2> |
4856 | - |
4857 | - |
4858 | - |
4859 | -<p style="margin-left:11%; margin-top: 1em"><b>+</b><i>LIGNE</i><b>,</b><i>COLONNE</i></p> |
4860 | - |
4861 | -<p style="margin-left:22%;">Démarre avec le curseur |
4862 | -positionné à la colonne <i>COLONNE</i> de la |
4863 | -ligne <i>LIGNE</i> (l’un des deux, au moins, devant |
4864 | -être spécifié) au lieu de |
4865 | -démarrer à la colonne 1, |
4866 | -ligne 1.</p> |
4867 | - |
4868 | -<table width="100%" border="0" rules="none" frame="void" |
4869 | - cellspacing="0" cellpadding="0"> |
4870 | +<h2>OPTIONS</h2> |
4871 | +<!-- INDENTATION --> |
4872 | +<table width="100%" border=0 rules="none" frame="void" |
4873 | + cols="2" cellspacing="0" cellpadding="0"> |
4874 | +<tr valign="top" align="left"> |
4875 | +<td width="10%"></td> |
4876 | +<td width="89%"> |
4877 | +<p><b>+</b><i>LIGNE</i><b>,</b><i>COLONNE</i></p></td> |
4878 | +</table> |
4879 | +<!-- INDENTATION --> |
4880 | +<table width="100%" border=0 rules="none" frame="void" |
4881 | + cols="2" cellspacing="0" cellpadding="0"> |
4882 | +<tr valign="top" align="left"> |
4883 | +<td width="21%"></td> |
4884 | +<td width="77%"> |
4885 | +<p>Démarre avec le curseur positionné à |
4886 | +la colonne <i>COLONNE</i> de la ligne <i>LIGNE</i> |
4887 | +(l’un des deux, au moins, devant être |
4888 | +spécifié) au lieu de démarrer à |
4889 | +la colonne 1, ligne 1.</p> |
4890 | +</td> |
4891 | +</table> |
4892 | +<!-- TABS --> |
4893 | +<table width="100%" border=0 rules="none" frame="void" |
4894 | + cols="5" cellspacing="0" cellpadding="0"> |
4895 | <tr valign="top" align="left"> |
4896 | <td width="11%"></td> |
4897 | -<td width="3%"> |
4898 | - |
4899 | - |
4900 | -<p><b>−?</b></p></td> |
4901 | -<td width="8%"></td> |
4902 | +<td width="2%"> |
4903 | + |
4904 | +<p><b>−?</b></p> |
4905 | +</td> |
4906 | +<td width="13%"></td> |
4907 | +<td width="35%"> |
4908 | + |
4909 | +<p>Identique à <b>-h (−−help)</b>.</p> |
4910 | +</td> |
4911 | <td width="36%"> |
4912 | - |
4913 | - |
4914 | -<p>Identique à <b>-h (−−help)</b>.</p></td> |
4915 | -<td width="42%"> |
4916 | -</td></tr> |
4917 | -</table> |
4918 | - |
4919 | -<p style="margin-left:11%;"><b>−A |
4920 | -(−−smarthome)</b></p> |
4921 | - |
4922 | -<p style="margin-left:22%;">Rend plus malin le |
4923 | -fonctionnement de la touche |
4924 | -« Début ». Lorsque l’on |
4925 | -appuie sur cette touche à n’importe quel |
4926 | -endroit excepté au tout début du texte |
4927 | -d’une ligne (i. e. au premier caractère |
4928 | -non blanc), le curseur se positionnera au début du |
4929 | -texte de la ligne (qu’il soit en avant ou en |
4930 | -arrière). Si le curseur est déjà |
4931 | -là, il se placera au vrai début de la |
4932 | -ligne.</p> |
4933 | - |
4934 | -<p style="margin-left:11%;"><b>−B |
4935 | -(−−backup)</b></p> |
4936 | - |
4937 | -<p style="margin-left:22%;">Lors de l’écriture |
4938 | -d’un fichier, crée une copie de |
4939 | -sécurité de la version |
4940 | -précédente, en ajoutant un tilde (~) au nom du |
4941 | -fichier.</p> |
4942 | - |
4943 | -<p style="margin-left:11%;"><b>−D |
4944 | -(−−boldtext)</b></p> |
4945 | - |
4946 | -<p style="margin-left:22%;">Utilise des caractères |
4947 | -gras à la place de la vidéo inverse.</p> |
4948 | - |
4949 | -<p style="margin-left:11%;"><b>−C</b> |
4950 | -<i>répertoire</i> |
4951 | -<b>(−−backupdir=</b><i>répertoire</i><b>)</b></p> |
4952 | - |
4953 | -<p style="margin-left:22%;">Définit le |
4954 | -répertoire utilisé par <b>nano</b> pour |
4955 | -enregistrer les copies de sécurité uniques si |
4956 | -celles-ci sont activées.</p> |
4957 | - |
4958 | -<p style="margin-left:11%;"><b>−E |
4959 | -(−−tabstospaces)</b></p> |
4960 | - |
4961 | -<p style="margin-left:22%;">Convertit les tabulations |
4962 | -clavier en espaces.</p> |
4963 | - |
4964 | -<p style="margin-left:11%;"><b>−F |
4965 | -(−−multibuffer)</b></p> |
4966 | - |
4967 | -<p style="margin-left:22%;">Active le mode multi-espace, |
4968 | -autorisant l’édition simultanée de |
4969 | -plusieurs fichiers, si ce mode est disponible.</p> |
4970 | - |
4971 | -<p style="margin-left:11%;"><b>−H |
4972 | -(−−historylog)</b></p> |
4973 | - |
4974 | -<p style="margin-left:22%;">Enregistre les chaînes |
4975 | -ayant fait l’objet d’une recherche ou d’un |
4976 | -remplacement dans le fichier <i>~/.nano_history</i> afin de |
4977 | -permettre leur réutilisation. Ceci n’est |
4978 | -possible que si <b>nano</b> est configuré pour |
4979 | -utiliser les fichiers nanorc.</p> |
4980 | - |
4981 | -<p style="margin-left:11%;"><b>−I |
4982 | -(−−ignorercfiles)</b></p> |
4983 | - |
4984 | -<p style="margin-left:22%;">Ne pas utiliser pas les |
4985 | -fichiers <i>SYSCONFDIR/nanorc</i> et <i>~/.nanorc</i> (si |
4986 | -<b>nano</b> est capable de les utiliser).</p> |
4987 | - |
4988 | -<p style="margin-left:11%;"><b>−K |
4989 | -(−−rebindkeypad)</b></p> |
4990 | - |
4991 | -<p style="margin-left:22%;">Interprète les touches |
4992 | -du pavé numérique afin qu’elles |
4993 | -fonctionnent toutes correctement. Vous ne devriez utiliser |
4994 | -cette option que si ce n’est pas le cas, car nano ne |
4995 | -sera plus capable d’utiliser la souris correctement |
4996 | -lorsque cette option sera activée.</p> |
4997 | - |
4998 | -<p style="margin-left:11%;"><b>−L |
4999 | -(−−nonewlines)</b></p> |
5000 | - |
The diff has been truncated for viewing.
/me half wishes reconfigury-patches die in favour of using dh $@ --with autoreconf.
Here is a review: patches/ series (see /usr/share/ doc/quilt/ README. source & bzr bd manual/source code)
* lp:ubuntu/pkg branches are usually patches applied that means you should do
$ quilt push -a
$ bzr add .pc
before committing.
Bzr bd has options to automagically do this for you & you may wish to adjust quilt config to auto-detect & use debian/
* After above is fixed, dpkg-source fails to build the source package due to fuzz in the patch, asking to refresh applied patches.
Please fix, at least, the later issue and resubmit.