• R/O
  • HTTP
  • SSH
  • HTTPS

howm: Commit

Hitori Otegaru Wiki Modoki


Commit MetaInfo

Revision42976c2dbe47b023b634799acc047bbbe272e991 (tree)
Time2017-12-27 06:19:15
AuthorHIRAOKA Kazuyuki <khi@user...>
CommiterHIRAOKA Kazuyuki

Log Message

fix: "configure: WARNING: 'missing' script is too old or missing"
(by automake -a -c -f)

Change Summary

Incremental Difference

--- a/INSTALL
+++ b/INSTALL
@@ -1,48 +1,80 @@
1+Installation Instructions
2+*************************
3+
4+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
5+Inc.
6+
7+ Copying and distribution of this file, with or without modification,
8+are permitted in any medium without royalty provided the copyright
9+notice and this notice are preserved. This file is offered as-is,
10+without warranty of any kind.
11+
112 Basic Installation
213 ==================
314
4- These are generic installation instructions.
15+ Briefly, the shell command `./configure && make && make install'
16+should configure, build, and install this package. The following
17+more-detailed instructions are generic; see the `README' file for
18+instructions specific to this package. Some packages provide this
19+`INSTALL' file but do not implement all of the features documented
20+below. The lack of an optional feature in a given package is not
21+necessarily a bug. More recommendations for GNU packages can be found
22+in *note Makefile Conventions: (standards)Makefile Conventions.
523
624 The `configure' shell script attempts to guess correct values for
725 various system-dependent variables used during compilation. It uses
826 those values to create a `Makefile' in each directory of the package.
927 It may also create one or more `.h' files containing system-dependent
1028 definitions. Finally, it creates a shell script `config.status' that
11-you can run in the future to recreate the current configuration, a file
12-`config.cache' that saves the results of its tests to speed up
13-reconfiguring, and a file `config.log' containing compiler output
14-(useful mainly for debugging `configure').
29+you can run in the future to recreate the current configuration, and a
30+file `config.log' containing compiler output (useful mainly for
31+debugging `configure').
32+
33+ It can also use an optional file (typically called `config.cache'
34+and enabled with `--cache-file=config.cache' or simply `-C') that saves
35+the results of its tests to speed up reconfiguring. Caching is
36+disabled by default to prevent problems with accidental use of stale
37+cache files.
1538
1639 If you need to do unusual things to compile the package, please try
1740 to figure out how `configure' could check whether to do them, and mail
1841 diffs or instructions to the address given in the `README' so they can
19-be considered for the next release. If at some point `config.cache'
20-contains results you don't want to keep, you may remove or edit it.
42+be considered for the next release. If you are using the cache, and at
43+some point `config.cache' contains results you don't want to keep, you
44+may remove or edit it.
2145
22- The file `configure.in' is used to create `configure' by a program
23-called `autoconf'. You only need `configure.in' if you want to change
24-it or regenerate `configure' using a newer version of `autoconf'.
46+ The file `configure.ac' (or `configure.in') is used to create
47+`configure' by a program called `autoconf'. You need `configure.ac' if
48+you want to change it or regenerate `configure' using a newer version
49+of `autoconf'.
2550
26-The simplest way to compile this package is:
51+ The simplest way to compile this package is:
2752
2853 1. `cd' to the directory containing the package's source code and type
29- `./configure' to configure the package for your system. If you're
30- using `csh' on an old version of System V, you might need to type
31- `sh ./configure' instead to prevent `csh' from trying to execute
32- `configure' itself.
54+ `./configure' to configure the package for your system.
3355
34- Running `configure' takes awhile. While running, it prints some
35- messages telling which features it is checking for.
56+ Running `configure' might take a while. While running, it prints
57+ some messages telling which features it is checking for.
3658
3759 2. Type `make' to compile the package.
3860
3961 3. Optionally, type `make check' to run any self-tests that come with
40- the package.
62+ the package, generally using the just-built uninstalled binaries.
4163
4264 4. Type `make install' to install the programs and any data files and
43- documentation.
44-
45- 5. You can remove the program binaries and object files from the
65+ documentation. When installing into a prefix owned by root, it is
66+ recommended that the package be configured and built as a regular
67+ user, and only the `make install' phase executed with root
68+ privileges.
69+
70+ 5. Optionally, type `make installcheck' to repeat any self-tests, but
71+ this time using the binaries in their final installed location.
72+ This target does not install anything. Running this target as a
73+ regular user, particularly if the prior `make install' required
74+ root privileges, verifies that the installation completed
75+ correctly.
76+
77+ 6. You can remove the program binaries and object files from the
4678 source code directory by typing `make clean'. To also remove the
4779 files that `configure' created (so you can compile the package for
4880 a different kind of computer), type `make distclean'. There is
@@ -51,62 +83,119 @@ The simplest way to compile this package is:
5183 all sorts of other programs in order to regenerate files that came
5284 with the distribution.
5385
86+ 7. Often, you can also type `make uninstall' to remove the installed
87+ files again. In practice, not all packages have tested that
88+ uninstallation works correctly, even though it is required by the
89+ GNU Coding Standards.
90+
91+ 8. Some packages, particularly those that use Automake, provide `make
92+ distcheck', which can by used by developers to test that all other
93+ targets like `make install' and `make uninstall' work correctly.
94+ This target is generally not run by end users.
95+
5496 Compilers and Options
5597 =====================
5698
5799 Some systems require unusual options for compilation or linking that
58-the `configure' script does not know about. You can give `configure'
59-initial values for variables by setting them in the environment. Using
60-a Bourne-compatible shell, you can do that on the command line like
61-this:
62- CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
100+the `configure' script does not know about. Run `./configure --help'
101+for details on some of the pertinent environment variables.
102+
103+ You can give `configure' initial values for configuration parameters
104+by setting variables in the command line or in the environment. Here
105+is an example:
63106
64-Or on systems that have the `env' program, you can do it like this:
65- env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
107+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
108+
109+ *Note Defining Variables::, for more details.
66110
67111 Compiling For Multiple Architectures
68112 ====================================
69113
70114 You can compile the package for more than one kind of computer at the
71115 same time, by placing the object files for each architecture in their
72-own directory. To do this, you must use a version of `make' that
73-supports the `VPATH' variable, such as GNU `make'. `cd' to the
116+own directory. To do this, you can use GNU `make'. `cd' to the
74117 directory where you want the object files and executables to go and run
75118 the `configure' script. `configure' automatically checks for the
76-source code in the directory that `configure' is in and in `..'.
119+source code in the directory that `configure' is in and in `..'. This
120+is known as a "VPATH" build.
121+
122+ With a non-GNU `make', it is safer to compile the package for one
123+architecture at a time in the source code directory. After you have
124+installed the package for one architecture, use `make distclean' before
125+reconfiguring for another architecture.
126+
127+ On MacOS X 10.5 and later systems, you can create libraries and
128+executables that work on multiple system types--known as "fat" or
129+"universal" binaries--by specifying multiple `-arch' options to the
130+compiler but only a single `-arch' option to the preprocessor. Like
131+this:
77132
78- If you have to use a `make' that does not supports the `VPATH'
79-variable, you have to compile the package for one architecture at a time
80-in the source code directory. After you have installed the package for
81-one architecture, use `make distclean' before reconfiguring for another
82-architecture.
133+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
134+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
135+ CPP="gcc -E" CXXCPP="g++ -E"
136+
137+ This is not guaranteed to produce working output in all cases, you
138+may have to build one architecture at a time and combine the results
139+using the `lipo' tool if you have problems.
83140
84141 Installation Names
85142 ==================
86143
87- By default, `make install' will install the package's files in
88-`/usr/local/bin', `/usr/local/man', etc. You can specify an
89-installation prefix other than `/usr/local' by giving `configure' the
90-option `--prefix=PATH'.
144+ By default, `make install' installs the package's commands under
145+`/usr/local/bin', include files under `/usr/local/include', etc. You
146+can specify an installation prefix other than `/usr/local' by giving
147+`configure' the option `--prefix=PREFIX', where PREFIX must be an
148+absolute file name.
91149
92150 You can specify separate installation prefixes for
93151 architecture-specific files and architecture-independent files. If you
94-give `configure' the option `--exec-prefix=PATH', the package will use
95-PATH as the prefix for installing programs and libraries.
96-Documentation and other data files will still use the regular prefix.
152+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
153+PREFIX as the prefix for installing programs and libraries.
154+Documentation and other data files still use the regular prefix.
97155
98156 In addition, if you use an unusual directory layout you can give
99-options like `--bindir=PATH' to specify different values for particular
157+options like `--bindir=DIR' to specify different values for particular
100158 kinds of files. Run `configure --help' for a list of the directories
101-you can set and what kinds of files go in them.
159+you can set and what kinds of files go in them. In general, the
160+default for these options is expressed in terms of `${prefix}', so that
161+specifying just `--prefix' will affect all of the other directory
162+specifications that were not explicitly provided.
163+
164+ The most portable way to affect installation locations is to pass the
165+correct locations to `configure'; however, many packages provide one or
166+both of the following shortcuts of passing variable assignments to the
167+`make install' command line to change installation locations without
168+having to reconfigure or recompile.
169+
170+ The first method involves providing an override variable for each
171+affected directory. For example, `make install
172+prefix=/alternate/directory' will choose an alternate location for all
173+directory configuration variables that were expressed in terms of
174+`${prefix}'. Any directories that were specified during `configure',
175+but not in terms of `${prefix}', must each be overridden at install
176+time for the entire installation to be relocated. The approach of
177+makefile variable overrides for each directory variable is required by
178+the GNU Coding Standards, and ideally causes no recompilation.
179+However, some platforms have known limitations with the semantics of
180+shared libraries that end up requiring recompilation when using this
181+method, particularly noticeable in packages that use GNU Libtool.
182+
183+ The second method involves providing the `DESTDIR' variable. For
184+example, `make install DESTDIR=/alternate/directory' will prepend
185+`/alternate/directory' before all installation names. The approach of
186+`DESTDIR' overrides is not required by the GNU Coding Standards, and
187+does not work on platforms that have drive letters. On the other hand,
188+it does better at avoiding recompilation issues, and works well even
189+when some directory options were not specified in terms of `${prefix}'
190+at `configure' time.
191+
192+Optional Features
193+=================
102194
103195 If the package supports it, you can cause programs to be installed
104196 with an extra prefix or suffix on their names by giving `configure' the
105197 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
106198
107-Optional Features
108-=================
109-
110199 Some packages pay attention to `--enable-FEATURE' options to
111200 `configure', where FEATURE indicates an optional part of the package.
112201 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
@@ -119,25 +208,80 @@ find the X include and library files automatically, but if it doesn't,
119208 you can use the `configure' options `--x-includes=DIR' and
120209 `--x-libraries=DIR' to specify their locations.
121210
211+ Some packages offer the ability to configure how verbose the
212+execution of `make' will be. For these packages, running `./configure
213+--enable-silent-rules' sets the default to minimal output, which can be
214+overridden with `make V=1'; while running `./configure
215+--disable-silent-rules' sets the default to verbose, which can be
216+overridden with `make V=0'.
217+
218+Particular systems
219+==================
220+
221+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
222+CC is not installed, it is recommended to use the following options in
223+order to use an ANSI C compiler:
224+
225+ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
226+
227+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
228+
229+ HP-UX `make' updates targets which have the same time stamps as
230+their prerequisites, which makes it generally unusable when shipped
231+generated files such as `configure' are involved. Use GNU `make'
232+instead.
233+
234+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
235+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
236+a workaround. If GNU CC is not installed, it is therefore recommended
237+to try
238+
239+ ./configure CC="cc"
240+
241+and if that doesn't work, try
242+
243+ ./configure CC="cc -nodtk"
244+
245+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
246+directory contains several dysfunctional programs; working variants of
247+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
248+in your `PATH', put it _after_ `/usr/bin'.
249+
250+ On Haiku, software installed for all users goes in `/boot/common',
251+not `/usr/local'. It is recommended to use the following options:
252+
253+ ./configure --prefix=/boot/common
254+
122255 Specifying the System Type
123256 ==========================
124257
125- There may be some features `configure' can not figure out
126-automatically, but needs to determine by the type of host the package
127-will run on. Usually `configure' can figure that out, but if it prints
128-a message saying it can not guess the host type, give it the
129-`--host=TYPE' option. TYPE can either be a short name for the system
130-type, such as `sun4', or a canonical name with three fields:
258+ There may be some features `configure' cannot figure out
259+automatically, but needs to determine by the type of machine the package
260+will run on. Usually, assuming the package is built to be run on the
261+_same_ architectures, `configure' can figure that out, but if it prints
262+a message saying it cannot guess the machine type, give it the
263+`--build=TYPE' option. TYPE can either be a short name for the system
264+type, such as `sun4', or a canonical name which has the form:
265+
131266 CPU-COMPANY-SYSTEM
132267
133-See the file `config.sub' for the possible values of each field. If
268+where SYSTEM can have one of these forms:
269+
270+ OS
271+ KERNEL-OS
272+
273+ See the file `config.sub' for the possible values of each field. If
134274 `config.sub' isn't included in this package, then this package doesn't
135-need to know the host type.
275+need to know the machine type.
276+
277+ If you are _building_ compiler tools for cross-compiling, you should
278+use the option `--target=TYPE' to select the type of system they will
279+produce code for.
136280
137- If you are building compiler tools for cross-compiling, you can also
138-use the `--target=TYPE' option to select the type of system they will
139-produce code for and the `--build=TYPE' option to select the type of
140-system on which you are compiling the package.
281+ If you want to _use_ a cross compiler, that generates code for a
282+platform different from the build platform, you should specify the
283+"host" platform (i.e., that on which the generated programs will
284+eventually be run) with `--host=TYPE'.
141285
142286 Sharing Defaults
143287 ================
@@ -150,19 +294,56 @@ default values for variables like `CC', `cache_file', and `prefix'.
150294 `CONFIG_SITE' environment variable to the location of the site script.
151295 A warning: not all `configure' scripts look for a site script.
152296
153-Operation Controls
297+Defining Variables
154298 ==================
155299
300+ Variables not defined in a site shell script can be set in the
301+environment passed to `configure'. However, some packages may run
302+configure again during the build, and the customized values of these
303+variables may be lost. In order to avoid this problem, you should set
304+them in the `configure' command line, using `VAR=value'. For example:
305+
306+ ./configure CC=/usr/local2/bin/gcc
307+
308+causes the specified `gcc' to be used as the C compiler (unless it is
309+overridden in the site shell script).
310+
311+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
312+an Autoconf limitation. Until the limitation is lifted, you can use
313+this workaround:
314+
315+ CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
316+
317+`configure' Invocation
318+======================
319+
156320 `configure' recognizes the following options to control how it
157321 operates.
158322
323+`--help'
324+`-h'
325+ Print a summary of all of the options to `configure', and exit.
326+
327+`--help=short'
328+`--help=recursive'
329+ Print a summary of the options unique to this package's
330+ `configure', and exit. The `short' variant lists options used
331+ only in the top level, while the `recursive' variant lists options
332+ also present in any nested packages.
333+
334+`--version'
335+`-V'
336+ Print the version of Autoconf used to generate the `configure'
337+ script, and exit.
338+
159339 `--cache-file=FILE'
160- Use and save the results of the tests in FILE instead of
161- `./config.cache'. Set FILE to `/dev/null' to disable caching, for
162- debugging `configure'.
340+ Enable the cache: use and save the results of the tests in FILE,
341+ traditionally `config.cache'. FILE defaults to `/dev/null' to
342+ disable caching.
163343
164-`--help'
165- Print a summary of the options to `configure', and exit.
344+`--config-cache'
345+`-C'
346+ Alias for `--cache-file=config.cache'.
166347
167348 `--quiet'
168349 `--silent'
@@ -175,8 +356,15 @@ operates.
175356 Look for the package's source code in directory DIR. Usually
176357 `configure' can determine that directory automatically.
177358
178-`--version'
179- Print the version of Autoconf used to generate the `configure'
180- script, and exit.
359+`--prefix=DIR'
360+ Use DIR as the installation prefix. *note Installation Names::
361+ for more details, including other options available for fine-tuning
362+ the installation locations.
363+
364+`--no-create'
365+`-n'
366+ Run the configure checks, but stop before creating any output
367+ files.
181368
182-`configure' also accepts some other, not widely useful, options.
369+`configure' also accepts some other, not widely useful, options. Run
370+`configure --help' for more details.
--- a/config.guess
+++ b/config.guess
@@ -1,14 +1,12 @@
11 #! /bin/sh
22 # Attempt to guess a canonical system name.
3-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
5-# Inc.
3+# Copyright 1992-2014 Free Software Foundation, Inc.
64
7-timestamp='2006-07-02'
5+timestamp='2014-03-23'
86
97 # This file is free software; you can redistribute it and/or modify it
108 # under the terms of the GNU General Public License as published by
11-# the Free Software Foundation; either version 2 of the License, or
9+# the Free Software Foundation; either version 3 of the License, or
1210 # (at your option) any later version.
1311 #
1412 # This program is distributed in the hope that it will be useful, but
@@ -17,26 +15,22 @@ timestamp='2006-07-02'
1715 # General Public License for more details.
1816 #
1917 # You should have received a copy of the GNU General Public License
20-# along with this program; if not, write to the Free Software
21-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
22-# 02110-1301, USA.
18+# along with this program; if not, see <http://www.gnu.org/licenses/>.
2319 #
2420 # As a special exception to the GNU General Public License, if you
2521 # distribute this file as part of a program that contains a
2622 # configuration script generated by Autoconf, you may include it under
27-# the same distribution terms that you use for the rest of that program.
28-
29-
30-# Originally written by Per Bothner <per@bothner.com>.
31-# Please send patches to <config-patches@gnu.org>. Submit a context
32-# diff and a properly formatted ChangeLog entry.
23+# the same distribution terms that you use for the rest of that
24+# program. This Exception is an additional permission under section 7
25+# of the GNU General Public License, version 3 ("GPLv3").
3326 #
34-# This script attempts to guess a canonical system name similar to
35-# config.sub. If it succeeds, it prints the system name on stdout, and
36-# exits with 0. Otherwise, it exits with 1.
27+# Originally written by Per Bothner.
3728 #
38-# The plan is that this can be called by configure scripts if you
39-# don't specify an explicit build system type.
29+# You can get the latest version of this script from:
30+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
31+#
32+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
33+
4034
4135 me=`echo "$0" | sed -e 's,.*/,,'`
4236
@@ -56,8 +50,7 @@ version="\
5650 GNU config.guess ($timestamp)
5751
5852 Originally written by Per Bothner.
59-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
60-Free Software Foundation, Inc.
53+Copyright 1992-2014 Free Software Foundation, Inc.
6154
6255 This is free software; see the source for copying conditions. There is NO
6356 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -139,12 +132,33 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
139132 UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
140133 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
141134
135+case "${UNAME_SYSTEM}" in
136+Linux|GNU|GNU/*)
137+ # If the system lacks a compiler, then just pick glibc.
138+ # We could probably try harder.
139+ LIBC=gnu
140+
141+ eval $set_cc_for_build
142+ cat <<-EOF > $dummy.c
143+ #include <features.h>
144+ #if defined(__UCLIBC__)
145+ LIBC=uclibc
146+ #elif defined(__dietlibc__)
147+ LIBC=dietlibc
148+ #else
149+ LIBC=gnu
150+ #endif
151+ EOF
152+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
153+ ;;
154+esac
155+
142156 # Note: order is significant - the case branches are not exclusive.
143157
144158 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
145159 *:NetBSD:*:*)
146160 # NetBSD (nbsd) targets should (where applicable) match one or
147- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
161+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
148162 # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
149163 # switched to ELF, *-*-netbsd* would select the old
150164 # object file format. This provides both forward
@@ -161,6 +175,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
161175 arm*) machine=arm-unknown ;;
162176 sh3el) machine=shl-unknown ;;
163177 sh3eb) machine=sh-unknown ;;
178+ sh5el) machine=sh5le-unknown ;;
164179 *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
165180 esac
166181 # The Operating System including object format, if it has switched
@@ -169,7 +184,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
169184 arm*|i386|m68k|ns32k|sh3*|sparc|vax)
170185 eval $set_cc_for_build
171186 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
172- | grep __ELF__ >/dev/null
187+ | grep -q __ELF__
173188 then
174189 # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
175190 # Return netbsd for either. FIX?
@@ -179,7 +194,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
179194 fi
180195 ;;
181196 *)
182- os=netbsd
197+ os=netbsd
183198 ;;
184199 esac
185200 # The OS release
@@ -200,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
200215 # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
201216 echo "${machine}-${os}${release}"
202217 exit ;;
218+ *:Bitrig:*:*)
219+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
220+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
221+ exit ;;
203222 *:OpenBSD:*:*)
204223 UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
205224 echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -222,7 +241,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
222241 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
223242 ;;
224243 *5.*)
225- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
244+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
226245 ;;
227246 esac
228247 # According to Compaq, /usr/sbin/psrinfo has been available on
@@ -268,7 +287,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
268287 # A Xn.n version is an unreleased experimental baselevel.
269288 # 1.2 uses "1.2" for uname -r.
270289 echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
271- exit ;;
290+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
291+ exitcode=$?
292+ trap '' 0
293+ exit $exitcode ;;
272294 Alpha\ *:Windows_NT*:*)
273295 # How do we know it's Interix rather than the generic POSIX subsystem?
274296 # Should we change UNAME_MACHINE based on the output of uname instead
@@ -294,12 +316,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
294316 echo s390-ibm-zvmoe
295317 exit ;;
296318 *:OS400:*:*)
297- echo powerpc-ibm-os400
319+ echo powerpc-ibm-os400
298320 exit ;;
299321 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
300322 echo arm-acorn-riscix${UNAME_RELEASE}
301323 exit ;;
302- arm:riscos:*:*|arm:RISCOS:*:*)
324+ arm*:riscos:*:*|arm*:RISCOS:*:*)
303325 echo arm-unknown-riscos
304326 exit ;;
305327 SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -323,14 +345,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
323345 case `/usr/bin/uname -p` in
324346 sparc) echo sparc-icl-nx7; exit ;;
325347 esac ;;
348+ s390x:SunOS:*:*)
349+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
350+ exit ;;
326351 sun4H:SunOS:5.*:*)
327352 echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
328353 exit ;;
329354 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
330355 echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
331356 exit ;;
332- i86pc:SunOS:5.*:*)
333- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
357+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
358+ echo i386-pc-auroraux${UNAME_RELEASE}
359+ exit ;;
360+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
361+ eval $set_cc_for_build
362+ SUN_ARCH="i386"
363+ # If there is a compiler, see if it is configured for 64-bit objects.
364+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
365+ # This test works for both compilers.
366+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
367+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
368+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
369+ grep IS_64BIT_ARCH >/dev/null
370+ then
371+ SUN_ARCH="x86_64"
372+ fi
373+ fi
374+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
334375 exit ;;
335376 sun4*:SunOS:6*:*)
336377 # According to config.sub, this is the proper way to canonicalize
@@ -374,23 +415,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
374415 # MiNT. But MiNT is downward compatible to TOS, so this should
375416 # be no problem.
376417 atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
377- echo m68k-atari-mint${UNAME_RELEASE}
418+ echo m68k-atari-mint${UNAME_RELEASE}
378419 exit ;;
379420 atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
380421 echo m68k-atari-mint${UNAME_RELEASE}
381- exit ;;
422+ exit ;;
382423 *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
383- echo m68k-atari-mint${UNAME_RELEASE}
424+ echo m68k-atari-mint${UNAME_RELEASE}
384425 exit ;;
385426 milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
386- echo m68k-milan-mint${UNAME_RELEASE}
387- exit ;;
427+ echo m68k-milan-mint${UNAME_RELEASE}
428+ exit ;;
388429 hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
389- echo m68k-hades-mint${UNAME_RELEASE}
390- exit ;;
430+ echo m68k-hades-mint${UNAME_RELEASE}
431+ exit ;;
391432 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
392- echo m68k-unknown-mint${UNAME_RELEASE}
393- exit ;;
433+ echo m68k-unknown-mint${UNAME_RELEASE}
434+ exit ;;
394435 m68k:machten:*:*)
395436 echo m68k-apple-machten${UNAME_RELEASE}
396437 exit ;;
@@ -460,8 +501,8 @@ EOF
460501 echo m88k-motorola-sysv3
461502 exit ;;
462503 AViiON:dgux:*:*)
463- # DG/UX returns AViiON for all architectures
464- UNAME_PROCESSOR=`/usr/bin/uname -p`
504+ # DG/UX returns AViiON for all architectures
505+ UNAME_PROCESSOR=`/usr/bin/uname -p`
465506 if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
466507 then
467508 if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -474,7 +515,7 @@ EOF
474515 else
475516 echo i586-dg-dgux${UNAME_RELEASE}
476517 fi
477- exit ;;
518+ exit ;;
478519 M88*:DolphinOS:*:*) # DolphinOS (SVR3)
479520 echo m88k-dolphin-sysv3
480521 exit ;;
@@ -531,7 +572,7 @@ EOF
531572 echo rs6000-ibm-aix3.2
532573 fi
533574 exit ;;
534- *:AIX:*:[45])
575+ *:AIX:*:[4567])
535576 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
536577 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
537578 IBM_ARCH=rs6000
@@ -574,52 +615,52 @@ EOF
574615 9000/[678][0-9][0-9])
575616 if [ -x /usr/bin/getconf ]; then
576617 sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
577- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
578- case "${sc_cpu_version}" in
579- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
580- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
581- 532) # CPU_PA_RISC2_0
582- case "${sc_kernel_bits}" in
583- 32) HP_ARCH="hppa2.0n" ;;
584- 64) HP_ARCH="hppa2.0w" ;;
618+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
619+ case "${sc_cpu_version}" in
620+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
621+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
622+ 532) # CPU_PA_RISC2_0
623+ case "${sc_kernel_bits}" in
624+ 32) HP_ARCH="hppa2.0n" ;;
625+ 64) HP_ARCH="hppa2.0w" ;;
585626 '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
586- esac ;;
587- esac
627+ esac ;;
628+ esac
588629 fi
589630 if [ "${HP_ARCH}" = "" ]; then
590631 eval $set_cc_for_build
591- sed 's/^ //' << EOF >$dummy.c
632+ sed 's/^ //' << EOF >$dummy.c
592633
593- #define _HPUX_SOURCE
594- #include <stdlib.h>
595- #include <unistd.h>
634+ #define _HPUX_SOURCE
635+ #include <stdlib.h>
636+ #include <unistd.h>
596637
597- int main ()
598- {
599- #if defined(_SC_KERNEL_BITS)
600- long bits = sysconf(_SC_KERNEL_BITS);
601- #endif
602- long cpu = sysconf (_SC_CPU_VERSION);
638+ int main ()
639+ {
640+ #if defined(_SC_KERNEL_BITS)
641+ long bits = sysconf(_SC_KERNEL_BITS);
642+ #endif
643+ long cpu = sysconf (_SC_CPU_VERSION);
603644
604- switch (cpu)
605- {
606- case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
607- case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
608- case CPU_PA_RISC2_0:
609- #if defined(_SC_KERNEL_BITS)
610- switch (bits)
611- {
612- case 64: puts ("hppa2.0w"); break;
613- case 32: puts ("hppa2.0n"); break;
614- default: puts ("hppa2.0"); break;
615- } break;
616- #else /* !defined(_SC_KERNEL_BITS) */
617- puts ("hppa2.0"); break;
618- #endif
619- default: puts ("hppa1.0"); break;
620- }
621- exit (0);
622- }
645+ switch (cpu)
646+ {
647+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
648+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
649+ case CPU_PA_RISC2_0:
650+ #if defined(_SC_KERNEL_BITS)
651+ switch (bits)
652+ {
653+ case 64: puts ("hppa2.0w"); break;
654+ case 32: puts ("hppa2.0n"); break;
655+ default: puts ("hppa2.0"); break;
656+ } break;
657+ #else /* !defined(_SC_KERNEL_BITS) */
658+ puts ("hppa2.0"); break;
659+ #endif
660+ default: puts ("hppa1.0"); break;
661+ }
662+ exit (0);
663+ }
623664 EOF
624665 (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
625666 test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -639,7 +680,7 @@ EOF
639680 # => hppa64-hp-hpux11.23
640681
641682 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
642- grep __LP64__ >/dev/null
683+ grep -q __LP64__
643684 then
644685 HP_ARCH="hppa2.0w"
645686 else
@@ -710,22 +751,22 @@ EOF
710751 exit ;;
711752 C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
712753 echo c1-convex-bsd
713- exit ;;
754+ exit ;;
714755 C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
715756 if getsysinfo -f scalar_acc
716757 then echo c32-convex-bsd
717758 else echo c2-convex-bsd
718759 fi
719- exit ;;
760+ exit ;;
720761 C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
721762 echo c34-convex-bsd
722- exit ;;
763+ exit ;;
723764 C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
724765 echo c38-convex-bsd
725- exit ;;
766+ exit ;;
726767 C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
727768 echo c4-convex-bsd
728- exit ;;
769+ exit ;;
729770 CRAY*Y-MP:*:*:*)
730771 echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
731772 exit ;;
@@ -749,14 +790,14 @@ EOF
749790 exit ;;
750791 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
751792 FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
752- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
753- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
754- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
755- exit ;;
793+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
794+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
795+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
796+ exit ;;
756797 5000:UNIX_System_V:4.*:*)
757- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
758- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
759- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
798+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
799+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
800+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
760801 exit ;;
761802 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
762803 echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -768,37 +809,51 @@ EOF
768809 echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
769810 exit ;;
770811 *:FreeBSD:*:*)
771- case ${UNAME_MACHINE} in
772- pc98)
773- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
812+ UNAME_PROCESSOR=`/usr/bin/uname -p`
813+ case ${UNAME_PROCESSOR} in
774814 amd64)
775815 echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
776816 *)
777- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
817+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
778818 esac
779819 exit ;;
780820 i*:CYGWIN*:*)
781821 echo ${UNAME_MACHINE}-pc-cygwin
782822 exit ;;
783- i*:MINGW*:*)
823+ *:MINGW64*:*)
824+ echo ${UNAME_MACHINE}-pc-mingw64
825+ exit ;;
826+ *:MINGW*:*)
784827 echo ${UNAME_MACHINE}-pc-mingw32
785828 exit ;;
829+ *:MSYS*:*)
830+ echo ${UNAME_MACHINE}-pc-msys
831+ exit ;;
786832 i*:windows32*:*)
787- # uname -m includes "-pc" on this system.
788- echo ${UNAME_MACHINE}-mingw32
833+ # uname -m includes "-pc" on this system.
834+ echo ${UNAME_MACHINE}-mingw32
789835 exit ;;
790836 i*:PW*:*)
791837 echo ${UNAME_MACHINE}-pc-pw32
792838 exit ;;
793- x86:Interix*:[3456]*)
794- echo i586-pc-interix${UNAME_RELEASE}
795- exit ;;
796- EM64T:Interix*:[3456]*)
797- echo x86_64-unknown-interix${UNAME_RELEASE}
798- exit ;;
839+ *:Interix*:*)
840+ case ${UNAME_MACHINE} in
841+ x86)
842+ echo i586-pc-interix${UNAME_RELEASE}
843+ exit ;;
844+ authenticamd | genuineintel | EM64T)
845+ echo x86_64-unknown-interix${UNAME_RELEASE}
846+ exit ;;
847+ IA64)
848+ echo ia64-unknown-interix${UNAME_RELEASE}
849+ exit ;;
850+ esac ;;
799851 [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
800852 echo i${UNAME_MACHINE}-pc-mks
801853 exit ;;
854+ 8664:Windows_NT:*)
855+ echo x86_64-pc-mks
856+ exit ;;
802857 i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
803858 # How do we know it's Interix rather than the generic POSIX subsystem?
804859 # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -819,200 +874,157 @@ EOF
819874 exit ;;
820875 *:GNU:*:*)
821876 # the GNU system
822- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
877+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
823878 exit ;;
824879 *:GNU/*:*:*)
825880 # other systems with GNU libc and userland
826- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
881+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
827882 exit ;;
828883 i*86:Minix:*:*)
829884 echo ${UNAME_MACHINE}-pc-minix
830885 exit ;;
886+ aarch64:Linux:*:*)
887+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
888+ exit ;;
889+ aarch64_be:Linux:*:*)
890+ UNAME_MACHINE=aarch64_be
891+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
892+ exit ;;
893+ alpha:Linux:*:*)
894+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
895+ EV5) UNAME_MACHINE=alphaev5 ;;
896+ EV56) UNAME_MACHINE=alphaev56 ;;
897+ PCA56) UNAME_MACHINE=alphapca56 ;;
898+ PCA57) UNAME_MACHINE=alphapca56 ;;
899+ EV6) UNAME_MACHINE=alphaev6 ;;
900+ EV67) UNAME_MACHINE=alphaev67 ;;
901+ EV68*) UNAME_MACHINE=alphaev68 ;;
902+ esac
903+ objdump --private-headers /bin/sh | grep -q ld.so.1
904+ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
905+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
906+ exit ;;
907+ arc:Linux:*:* | arceb:Linux:*:*)
908+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
909+ exit ;;
831910 arm*:Linux:*:*)
832- echo ${UNAME_MACHINE}-unknown-linux-gnu
911+ eval $set_cc_for_build
912+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
913+ | grep -q __ARM_EABI__
914+ then
915+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
916+ else
917+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
918+ | grep -q __ARM_PCS_VFP
919+ then
920+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
921+ else
922+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
923+ fi
924+ fi
833925 exit ;;
834926 avr32*:Linux:*:*)
835- echo ${UNAME_MACHINE}-unknown-linux-gnu
927+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
836928 exit ;;
837929 cris:Linux:*:*)
838- echo cris-axis-linux-gnu
930+ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
839931 exit ;;
840932 crisv32:Linux:*:*)
841- echo crisv32-axis-linux-gnu
933+ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
842934 exit ;;
843935 frv:Linux:*:*)
844- echo frv-unknown-linux-gnu
936+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
937+ exit ;;
938+ hexagon:Linux:*:*)
939+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
940+ exit ;;
941+ i*86:Linux:*:*)
942+ echo ${UNAME_MACHINE}-pc-linux-${LIBC}
845943 exit ;;
846944 ia64:Linux:*:*)
847- echo ${UNAME_MACHINE}-unknown-linux-gnu
945+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
848946 exit ;;
849947 m32r*:Linux:*:*)
850- echo ${UNAME_MACHINE}-unknown-linux-gnu
948+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
851949 exit ;;
852950 m68*:Linux:*:*)
853- echo ${UNAME_MACHINE}-unknown-linux-gnu
951+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
854952 exit ;;
855- mips:Linux:*:*)
953+ mips:Linux:*:* | mips64:Linux:*:*)
856954 eval $set_cc_for_build
857955 sed 's/^ //' << EOF >$dummy.c
858956 #undef CPU
859- #undef mips
860- #undef mipsel
957+ #undef ${UNAME_MACHINE}
958+ #undef ${UNAME_MACHINE}el
861959 #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
862- CPU=mipsel
960+ CPU=${UNAME_MACHINE}el
863961 #else
864962 #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
865- CPU=mips
963+ CPU=${UNAME_MACHINE}
866964 #else
867965 CPU=
868966 #endif
869967 #endif
870968 EOF
871- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
872- /^CPU/{
873- s: ::g
874- p
875- }'`"
876- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
969+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
970+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
877971 ;;
878- mips64:Linux:*:*)
879- eval $set_cc_for_build
880- sed 's/^ //' << EOF >$dummy.c
881- #undef CPU
882- #undef mips64
883- #undef mips64el
884- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
885- CPU=mips64el
886- #else
887- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
888- CPU=mips64
889- #else
890- CPU=
891- #endif
892- #endif
893-EOF
894- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
895- /^CPU/{
896- s: ::g
897- p
898- }'`"
899- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
900- ;;
901- or32:Linux:*:*)
902- echo or32-unknown-linux-gnu
972+ openrisc*:Linux:*:*)
973+ echo or1k-unknown-linux-${LIBC}
903974 exit ;;
904- ppc:Linux:*:*)
905- echo powerpc-unknown-linux-gnu
975+ or32:Linux:*:* | or1k*:Linux:*:*)
976+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
906977 exit ;;
907- ppc64:Linux:*:*)
908- echo powerpc64-unknown-linux-gnu
978+ padre:Linux:*:*)
979+ echo sparc-unknown-linux-${LIBC}
909980 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 ld.so.1 >/dev/null
921- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
922- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
981+ parisc64:Linux:*:* | hppa64:Linux:*:*)
982+ echo hppa64-unknown-linux-${LIBC}
923983 exit ;;
924984 parisc:Linux:*:* | hppa:Linux:*:*)
925985 # Look for CPU level
926986 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
927- PA7*) echo hppa1.1-unknown-linux-gnu ;;
928- PA8*) echo hppa2.0-unknown-linux-gnu ;;
929- *) echo hppa-unknown-linux-gnu ;;
987+ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
988+ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
989+ *) echo hppa-unknown-linux-${LIBC} ;;
930990 esac
931991 exit ;;
932- parisc64:Linux:*:* | hppa64:Linux:*:*)
933- echo hppa64-unknown-linux-gnu
992+ ppc64:Linux:*:*)
993+ echo powerpc64-unknown-linux-${LIBC}
994+ exit ;;
995+ ppc:Linux:*:*)
996+ echo powerpc-unknown-linux-${LIBC}
997+ exit ;;
998+ ppc64le:Linux:*:*)
999+ echo powerpc64le-unknown-linux-${LIBC}
1000+ exit ;;
1001+ ppcle:Linux:*:*)
1002+ echo powerpcle-unknown-linux-${LIBC}
9341003 exit ;;
9351004 s390:Linux:*:* | s390x:Linux:*:*)
936- echo ${UNAME_MACHINE}-ibm-linux
1005+ echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
9371006 exit ;;
9381007 sh64*:Linux:*:*)
939- echo ${UNAME_MACHINE}-unknown-linux-gnu
1008+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
9401009 exit ;;
9411010 sh*:Linux:*:*)
942- echo ${UNAME_MACHINE}-unknown-linux-gnu
1011+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
9431012 exit ;;
9441013 sparc:Linux:*:* | sparc64:Linux:*:*)
945- echo ${UNAME_MACHINE}-unknown-linux-gnu
1014+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1015+ exit ;;
1016+ tile*:Linux:*:*)
1017+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
9461018 exit ;;
9471019 vax:Linux:*:*)
948- echo ${UNAME_MACHINE}-dec-linux-gnu
1020+ echo ${UNAME_MACHINE}-dec-linux-${LIBC}
9491021 exit ;;
9501022 x86_64:Linux:*:*)
951- echo x86_64-unknown-linux-gnu
1023+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1024+ exit ;;
1025+ xtensa*:Linux:*:*)
1026+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
9521027 exit ;;
953- i*86:Linux:*:*)
954- # The BFD linker knows what the default object file format is, so
955- # first see if it will tell us. cd to the root directory to prevent
956- # problems with other programs or directories called `ld' in the path.
957- # Set LC_ALL=C to ensure ld outputs messages in English.
958- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
959- | sed -ne '/supported targets:/!d
960- s/[ ][ ]*/ /g
961- s/.*supported targets: *//
962- s/ .*//
963- p'`
964- case "$ld_supported_targets" in
965- elf32-i386)
966- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
967- ;;
968- a.out-i386-linux)
969- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
970- exit ;;
971- coff-i386)
972- echo "${UNAME_MACHINE}-pc-linux-gnucoff"
973- exit ;;
974- "")
975- # Either a pre-BFD a.out linker (linux-gnuoldld) or
976- # one that does not give us useful --help.
977- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
978- exit ;;
979- esac
980- # Determine whether the default compiler is a.out or elf
981- eval $set_cc_for_build
982- sed 's/^ //' << EOF >$dummy.c
983- #include <features.h>
984- #ifdef __ELF__
985- # ifdef __GLIBC__
986- # if __GLIBC__ >= 2
987- LIBC=gnu
988- # else
989- LIBC=gnulibc1
990- # endif
991- # else
992- LIBC=gnulibc1
993- # endif
994- #else
995- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
996- LIBC=gnu
997- #else
998- LIBC=gnuaout
999- #endif
1000- #endif
1001- #ifdef __dietlibc__
1002- LIBC=dietlibc
1003- #endif
1004-EOF
1005- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
1006- /^LIBC/{
1007- s: ::g
1008- p
1009- }'`"
1010- test x"${LIBC}" != x && {
1011- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
1012- exit
1013- }
1014- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
1015- ;;
10161028 i*86:DYNIX/ptx:4*:*)
10171029 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
10181030 # earlier versions are messed up and put the nodename in both
@@ -1020,11 +1032,11 @@ EOF
10201032 echo i386-sequent-sysv4
10211033 exit ;;
10221034 i*86:UNIX_SV:4.2MP:2.*)
1023- # Unixware is an offshoot of SVR4, but it has its own version
1024- # number series starting with 2...
1025- # I am not positive that other SVR4 systems won't match this,
1035+ # Unixware is an offshoot of SVR4, but it has its own version
1036+ # number series starting with 2...
1037+ # I am not positive that other SVR4 systems won't match this,
10261038 # I just have to hope. -- rms.
1027- # Use sysv4.2uw... so that sysv4* matches it.
1039+ # Use sysv4.2uw... so that sysv4* matches it.
10281040 echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
10291041 exit ;;
10301042 i*86:OS/2:*:*)
@@ -1041,7 +1053,7 @@ EOF
10411053 i*86:syllable:*:*)
10421054 echo ${UNAME_MACHINE}-pc-syllable
10431055 exit ;;
1044- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
1056+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
10451057 echo i386-unknown-lynxos${UNAME_RELEASE}
10461058 exit ;;
10471059 i*86:*DOS:*:*)
@@ -1056,7 +1068,7 @@ EOF
10561068 fi
10571069 exit ;;
10581070 i*86:*:5:[678]*)
1059- # UnixWare 7.x, OpenUNIX and OpenServer 6.
1071+ # UnixWare 7.x, OpenUNIX and OpenServer 6.
10601072 case `/bin/uname -X | grep "^Machine"` in
10611073 *486*) UNAME_MACHINE=i486 ;;
10621074 *Pentium) UNAME_MACHINE=i586 ;;
@@ -1084,10 +1096,13 @@ EOF
10841096 exit ;;
10851097 pc:*:*:*)
10861098 # Left here for compatibility:
1087- # uname -m prints for DJGPP always 'pc', but it prints nothing about
1088- # the processor, so we play safe by assuming i386.
1089- echo i386-pc-msdosdjgpp
1090- exit ;;
1099+ # uname -m prints for DJGPP always 'pc', but it prints nothing about
1100+ # the processor, so we play safe by assuming i586.
1101+ # Note: whatever this is, it MUST be the same as what config.sub
1102+ # prints for the "djgpp" host, or else GDB configury will decide that
1103+ # this is a cross-build.
1104+ echo i586-pc-msdosdjgpp
1105+ exit ;;
10911106 Intel:Mach:3*:*)
10921107 echo i386-pc-mach3
10931108 exit ;;
@@ -1122,8 +1137,18 @@ EOF
11221137 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
11231138 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
11241139 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
1125- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1126- && { echo i486-ncr-sysv4; exit; } ;;
1140+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1141+ && { echo i486-ncr-sysv4; exit; } ;;
1142+ NCR*:*:4.2:* | MPRAS*:*:4.2:*)
1143+ OS_REL='.3'
1144+ test -r /etc/.relid \
1145+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
1146+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1147+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
1148+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1149+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
1150+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
1151+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
11271152 m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
11281153 echo m68k-unknown-lynxos${UNAME_RELEASE}
11291154 exit ;;
@@ -1136,7 +1161,7 @@ EOF
11361161 rs6000:LynxOS:2.*:*)
11371162 echo rs6000-unknown-lynxos${UNAME_RELEASE}
11381163 exit ;;
1139- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
1164+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
11401165 echo powerpc-unknown-lynxos${UNAME_RELEASE}
11411166 exit ;;
11421167 SM[BE]S:UNIX_SV:*:*)
@@ -1156,10 +1181,10 @@ EOF
11561181 echo ns32k-sni-sysv
11571182 fi
11581183 exit ;;
1159- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
1160- # says <Richard.M.Bartel@ccMail.Census.GOV>
1161- echo i586-unisys-sysv4
1162- exit ;;
1184+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
1185+ # says <Richard.M.Bartel@ccMail.Census.GOV>
1186+ echo i586-unisys-sysv4
1187+ exit ;;
11631188 *:UNIX_System_V:4*:FTX*)
11641189 # From Gerald Hewes <hewes@openmarket.com>.
11651190 # How about differentiating between stratus architectures? -djm
@@ -1185,11 +1210,11 @@ EOF
11851210 exit ;;
11861211 R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
11871212 if [ -d /usr/nec ]; then
1188- echo mips-nec-sysv${UNAME_RELEASE}
1213+ echo mips-nec-sysv${UNAME_RELEASE}
11891214 else
1190- echo mips-unknown-sysv${UNAME_RELEASE}
1215+ echo mips-unknown-sysv${UNAME_RELEASE}
11911216 fi
1192- exit ;;
1217+ exit ;;
11931218 BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
11941219 echo powerpc-be-beos
11951220 exit ;;
@@ -1199,6 +1224,12 @@ EOF
11991224 BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
12001225 echo i586-pc-beos
12011226 exit ;;
1227+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
1228+ echo i586-pc-haiku
1229+ exit ;;
1230+ x86_64:Haiku:*:*)
1231+ echo x86_64-unknown-haiku
1232+ exit ;;
12021233 SX-4:SUPER-UX:*:*)
12031234 echo sx4-nec-superux${UNAME_RELEASE}
12041235 exit ;;
@@ -1208,6 +1239,15 @@ EOF
12081239 SX-6:SUPER-UX:*:*)
12091240 echo sx6-nec-superux${UNAME_RELEASE}
12101241 exit ;;
1242+ SX-7:SUPER-UX:*:*)
1243+ echo sx7-nec-superux${UNAME_RELEASE}
1244+ exit ;;
1245+ SX-8:SUPER-UX:*:*)
1246+ echo sx8-nec-superux${UNAME_RELEASE}
1247+ exit ;;
1248+ SX-8R:SUPER-UX:*:*)
1249+ echo sx8r-nec-superux${UNAME_RELEASE}
1250+ exit ;;
12111251 Power*:Rhapsody:*:*)
12121252 echo powerpc-apple-rhapsody${UNAME_RELEASE}
12131253 exit ;;
@@ -1216,9 +1256,31 @@ EOF
12161256 exit ;;
12171257 *:Darwin:*:*)
12181258 UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
1219- case $UNAME_PROCESSOR in
1220- unknown) UNAME_PROCESSOR=powerpc ;;
1221- esac
1259+ eval $set_cc_for_build
1260+ if test "$UNAME_PROCESSOR" = unknown ; then
1261+ UNAME_PROCESSOR=powerpc
1262+ fi
1263+ if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
1264+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
1265+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1266+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
1267+ grep IS_64BIT_ARCH >/dev/null
1268+ then
1269+ case $UNAME_PROCESSOR in
1270+ i386) UNAME_PROCESSOR=x86_64 ;;
1271+ powerpc) UNAME_PROCESSOR=powerpc64 ;;
1272+ esac
1273+ fi
1274+ fi
1275+ elif test "$UNAME_PROCESSOR" = i386 ; then
1276+ # Avoid executing cc on OS X 10.9, as it ships with a stub
1277+ # that puts up a graphical alert prompting to install
1278+ # developer tools. Any system running Mac OS X 10.7 or
1279+ # later (Darwin 11 and later) is required to have a 64-bit
1280+ # processor. This is not true of the ARM version of Darwin
1281+ # that Apple uses in portable devices.
1282+ UNAME_PROCESSOR=x86_64
1283+ fi
12221284 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
12231285 exit ;;
12241286 *:procnto*:*:* | *:QNX:[0123456789]*:*)
@@ -1232,7 +1294,10 @@ EOF
12321294 *:QNX:*:4*)
12331295 echo i386-pc-qnx
12341296 exit ;;
1235- NSE-?:NONSTOP_KERNEL:*:*)
1297+ NEO-?:NONSTOP_KERNEL:*:*)
1298+ echo neo-tandem-nsk${UNAME_RELEASE}
1299+ exit ;;
1300+ NSE-*:NONSTOP_KERNEL:*:*)
12361301 echo nse-tandem-nsk${UNAME_RELEASE}
12371302 exit ;;
12381303 NSR-?:NONSTOP_KERNEL:*:*)
@@ -1277,13 +1342,13 @@ EOF
12771342 echo pdp10-unknown-its
12781343 exit ;;
12791344 SEI:*:*:SEIUX)
1280- echo mips-sei-seiux${UNAME_RELEASE}
1345+ echo mips-sei-seiux${UNAME_RELEASE}
12811346 exit ;;
12821347 *:DragonFly:*:*)
12831348 echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
12841349 exit ;;
12851350 *:*VMS:*:*)
1286- UNAME_MACHINE=`(uname -p) 2>/dev/null`
1351+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
12871352 case "${UNAME_MACHINE}" in
12881353 A*) echo alpha-dec-vms ; exit ;;
12891354 I*) echo ia64-dec-vms ; exit ;;
@@ -1298,158 +1363,13 @@ EOF
12981363 i*86:rdos:*:*)
12991364 echo ${UNAME_MACHINE}-pc-rdos
13001365 exit ;;
1301-esac
1302-
1303-#echo '(No uname command or uname output not recognized.)' 1>&2
1304-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
1305-
1306-eval $set_cc_for_build
1307-cat >$dummy.c <<EOF
1308-#ifdef _SEQUENT_
1309-# include <sys/types.h>
1310-# include <sys/utsname.h>
1311-#endif
1312-main ()
1313-{
1314-#if defined (sony)
1315-#if defined (MIPSEB)
1316- /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
1317- I don't know.... */
1318- printf ("mips-sony-bsd\n"); exit (0);
1319-#else
1320-#include <sys/param.h>
1321- printf ("m68k-sony-newsos%s\n",
1322-#ifdef NEWSOS4
1323- "4"
1324-#else
1325- ""
1326-#endif
1327- ); exit (0);
1328-#endif
1329-#endif
1330-
1331-#if defined (__arm) && defined (__acorn) && defined (__unix)
1332- printf ("arm-acorn-riscix\n"); exit (0);
1333-#endif
1334-
1335-#if defined (hp300) && !defined (hpux)
1336- printf ("m68k-hp-bsd\n"); exit (0);
1337-#endif
1338-
1339-#if defined (NeXT)
1340-#if !defined (__ARCHITECTURE__)
1341-#define __ARCHITECTURE__ "m68k"
1342-#endif
1343- int version;
1344- version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
1345- if (version < 4)
1346- printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
1347- else
1348- printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
1349- exit (0);
1350-#endif
1351-
1352-#if defined (MULTIMAX) || defined (n16)
1353-#if defined (UMAXV)
1354- printf ("ns32k-encore-sysv\n"); exit (0);
1355-#else
1356-#if defined (CMU)
1357- printf ("ns32k-encore-mach\n"); exit (0);
1358-#else
1359- printf ("ns32k-encore-bsd\n"); exit (0);
1360-#endif
1361-#endif
1362-#endif
1363-
1364-#if defined (__386BSD__)
1365- printf ("i386-pc-bsd\n"); exit (0);
1366-#endif
1367-
1368-#if defined (sequent)
1369-#if defined (i386)
1370- printf ("i386-sequent-dynix\n"); exit (0);
1371-#endif
1372-#if defined (ns32000)
1373- printf ("ns32k-sequent-dynix\n"); exit (0);
1374-#endif
1375-#endif
1376-
1377-#if defined (_SEQUENT_)
1378- struct utsname un;
1379-
1380- uname(&un);
1381-
1382- if (strncmp(un.version, "V2", 2) == 0) {
1383- printf ("i386-sequent-ptx2\n"); exit (0);
1384- }
1385- if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
1386- printf ("i386-sequent-ptx1\n"); exit (0);
1387- }
1388- printf ("i386-sequent-ptx\n"); exit (0);
1389-
1390-#endif
1391-
1392-#if defined (vax)
1393-# if !defined (ultrix)
1394-# include <sys/param.h>
1395-# if defined (BSD)
1396-# if BSD == 43
1397- printf ("vax-dec-bsd4.3\n"); exit (0);
1398-# else
1399-# if BSD == 199006
1400- printf ("vax-dec-bsd4.3reno\n"); exit (0);
1401-# else
1402- printf ("vax-dec-bsd\n"); exit (0);
1403-# endif
1404-# endif
1405-# else
1406- printf ("vax-dec-bsd\n"); exit (0);
1407-# endif
1408-# else
1409- printf ("vax-dec-ultrix\n"); exit (0);
1410-# endif
1411-#endif
1412-
1413-#if defined (alliant) && defined (i860)
1414- printf ("i860-alliant-bsd\n"); exit (0);
1415-#endif
1416-
1417- exit (1);
1418-}
1419-EOF
1420-
1421-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
1422- { echo "$SYSTEM_NAME"; exit; }
1423-
1424-# Apollos put the system type in the environment.
1425-
1426-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
1427-
1428-# Convex versions that predate uname can use getsysinfo(1)
1429-
1430-if [ -x /usr/convex/getsysinfo ]
1431-then
1432- case `getsysinfo -f cpu_type` in
1433- c1*)
1434- echo c1-convex-bsd
1435- exit ;;
1436- c2*)
1437- if getsysinfo -f scalar_acc
1438- then echo c32-convex-bsd
1439- else echo c2-convex-bsd
1440- fi
1441- exit ;;
1442- c34*)
1443- echo c34-convex-bsd
1444- exit ;;
1445- c38*)
1446- echo c38-convex-bsd
1366+ i*86:AROS:*:*)
1367+ echo ${UNAME_MACHINE}-pc-aros
14471368 exit ;;
1448- c4*)
1449- echo c4-convex-bsd
1369+ x86_64:VMkernel:*:*)
1370+ echo ${UNAME_MACHINE}-unknown-esx
14501371 exit ;;
1451- esac
1452-fi
1372+esac
14531373
14541374 cat >&2 <<EOF
14551375 $0: unable to guess system type
@@ -1458,9 +1378,9 @@ This script, last modified $timestamp, has failed to recognize
14581378 the operating system you are using. It is advised that you
14591379 download the most up to date version of the config scripts from
14601380
1461- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
1381+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
14621382 and
1463- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
1383+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
14641384
14651385 If the version you run ($0) is already up to date, please
14661386 send the following data and any information you think might be
--- a/config.sub
+++ b/config.sub
@@ -1,44 +1,40 @@
11 #! /bin/sh
22 # Configuration validation subroutine script.
3-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
5-# Inc.
3+# Copyright 1992-2014 Free Software Foundation, Inc.
64
7-timestamp='2006-07-02'
5+timestamp='2014-09-11'
86
9-# This file is (in principle) common to ALL GNU software.
10-# The presence of a machine in this file suggests that SOME GNU software
11-# can handle that machine. It does not imply ALL GNU software can.
12-#
13-# This file is free software; you can redistribute it and/or modify
14-# it under the terms of the GNU General Public License as published by
15-# the Free Software Foundation; either version 2 of the License, or
7+# This file is free software; you can redistribute it and/or modify it
8+# under the terms of the GNU General Public License as published by
9+# the Free Software Foundation; either version 3 of the License, or
1610 # (at your option) any later version.
1711 #
18-# This program is distributed in the hope that it will be useful,
19-# but WITHOUT ANY WARRANTY; without even the implied warranty of
20-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21-# GNU General Public License for more details.
12+# This program is distributed in the hope that it will be useful, but
13+# WITHOUT ANY WARRANTY; without even the implied warranty of
14+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15+# General Public License for more details.
2216 #
2317 # You should have received a copy of the GNU General Public License
24-# along with this program; if not, write to the Free Software
25-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
26-# 02110-1301, USA.
18+# along with this program; if not, see <http://www.gnu.org/licenses/>.
2719 #
2820 # As a special exception to the GNU General Public License, if you
2921 # distribute this file as part of a program that contains a
3022 # configuration script generated by Autoconf, you may include it under
31-# the same distribution terms that you use for the rest of that program.
23+# the same distribution terms that you use for the rest of that
24+# program. This Exception is an additional permission under section 7
25+# of the GNU General Public License, version 3 ("GPLv3").
3226
3327
34-# Please send patches to <config-patches@gnu.org>. Submit a context
35-# diff and a properly formatted ChangeLog entry.
28+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
3629 #
3730 # Configuration subroutine to validate and canonicalize a configuration type.
3831 # Supply the specified configuration type as an argument.
3932 # If it is invalid, we print an error message on stderr and exit with code 1.
4033 # Otherwise, we print the canonical config type on stdout and succeed.
4134
35+# You can get the latest version of this script from:
36+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
37+
4238 # This file is supposed to be the same for all GNU packages
4339 # and recognize all the CPU types, system types and aliases
4440 # that are meaningful with *any* GNU software.
@@ -72,8 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
7268 version="\
7369 GNU config.sub ($timestamp)
7470
75-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
76-Free Software Foundation, Inc.
71+Copyright 1992-2014 Free Software Foundation, Inc.
7772
7873 This is free software; see the source for copying conditions. There is NO
7974 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -120,12 +115,18 @@ esac
120115 # Here we must recognize all the valid KERNEL-OS combinations.
121116 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
122117 case $maybe_os in
123- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
124- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
118+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
119+ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
120+ knetbsd*-gnu* | netbsd*-gnu* | \
121+ kopensolaris*-gnu* | \
125122 storm-chaos* | os2-emx* | rtmk-nova*)
126123 os=-$maybe_os
127124 basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
128125 ;;
126+ android-linux)
127+ os=-linux-android
128+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
129+ ;;
129130 *)
130131 basic_machine=`echo $1 | sed 's/-[^-]*$//'`
131132 if [ $basic_machine != $1 ]
@@ -148,10 +149,13 @@ case $os in
148149 -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
149150 -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
150151 -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
151- -apple | -axis | -knuth | -cray)
152+ -apple | -axis | -knuth | -cray | -microblaze*)
152153 os=
153154 basic_machine=$1
154155 ;;
156+ -bluegene*)
157+ os=-cnk
158+ ;;
155159 -sim | -cisco | -oki | -wec | -winbond)
156160 os=
157161 basic_machine=$1
@@ -166,10 +170,10 @@ case $os in
166170 os=-chorusos
167171 basic_machine=$1
168172 ;;
169- -chorusrdb)
170- os=-chorusrdb
173+ -chorusrdb)
174+ os=-chorusrdb
171175 basic_machine=$1
172- ;;
176+ ;;
173177 -hiux*)
174178 os=-hiuxwe2
175179 ;;
@@ -214,6 +218,12 @@ case $os in
214218 -isc*)
215219 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
216220 ;;
221+ -lynx*178)
222+ os=-lynxos178
223+ ;;
224+ -lynx*5)
225+ os=-lynxos5
226+ ;;
217227 -lynx*)
218228 os=-lynxos
219229 ;;
@@ -238,58 +248,86 @@ case $basic_machine in
238248 # Some are omitted here because they have special meanings below.
239249 1750a | 580 \
240250 | a29k \
251+ | aarch64 | aarch64_be \
241252 | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
242253 | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
243254 | am33_2.0 \
244- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
255+ | arc | arceb \
256+ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
257+ | avr | avr32 \
258+ | be32 | be64 \
245259 | bfin \
246- | c4x | clipper \
260+ | c4x | c8051 | clipper \
247261 | d10v | d30v | dlx | dsp16xx \
248- | fr30 | frv \
262+ | epiphany \
263+ | fido | fr30 | frv \
249264 | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
265+ | hexagon \
250266 | i370 | i860 | i960 | ia64 \
251267 | ip2k | iq2000 \
268+ | k1om \
269+ | le32 | le64 \
270+ | lm32 \
252271 | m32c | m32r | m32rle | m68000 | m68k | m88k \
253- | maxq | mb | microblaze | mcore \
272+ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
254273 | mips | mipsbe | mipseb | mipsel | mipsle \
255274 | mips16 \
256275 | mips64 | mips64el \
257- | mips64vr | mips64vrel \
276+ | mips64octeon | mips64octeonel \
258277 | mips64orion | mips64orionel \
278+ | mips64r5900 | mips64r5900el \
279+ | mips64vr | mips64vrel \
259280 | mips64vr4100 | mips64vr4100el \
260281 | mips64vr4300 | mips64vr4300el \
261282 | mips64vr5000 | mips64vr5000el \
262283 | mips64vr5900 | mips64vr5900el \
263284 | mipsisa32 | mipsisa32el \
264285 | mipsisa32r2 | mipsisa32r2el \
286+ | mipsisa32r6 | mipsisa32r6el \
265287 | mipsisa64 | mipsisa64el \
266288 | mipsisa64r2 | mipsisa64r2el \
289+ | mipsisa64r6 | mipsisa64r6el \
267290 | mipsisa64sb1 | mipsisa64sb1el \
268291 | mipsisa64sr71k | mipsisa64sr71kel \
292+ | mipsr5900 | mipsr5900el \
269293 | mipstx39 | mipstx39el \
270294 | mn10200 | mn10300 \
295+ | moxie \
271296 | mt \
272297 | msp430 \
273- | nios | nios2 \
298+ | nds32 | nds32le | nds32be \
299+ | nios | nios2 | nios2eb | nios2el \
274300 | ns16k | ns32k \
275- | or32 \
301+ | open8 | or1k | or1knd | or32 \
276302 | pdp10 | pdp11 | pj | pjl \
277- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
303+ | powerpc | powerpc64 | powerpc64le | powerpcle \
278304 | pyramid \
279- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
305+ | riscv32 | riscv64 \
306+ | rl78 | rx \
307+ | score \
308+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
280309 | sh64 | sh64le \
281310 | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
282311 | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
283- | spu | strongarm \
284- | tahoe | thumb | tic4x | tic80 | tron \
285- | v850 | v850e \
312+ | spu \
313+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
314+ | ubicom32 \
315+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
286316 | we32k \
287- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
288- | z8k)
317+ | x86 | xc16x | xstormy16 | xtensa \
318+ | z8k | z80)
289319 basic_machine=$basic_machine-unknown
290320 ;;
291- m6811 | m68hc11 | m6812 | m68hc12)
292- # Motorola 68HC11/12.
321+ c54x)
322+ basic_machine=tic54x-unknown
323+ ;;
324+ c55x)
325+ basic_machine=tic55x-unknown
326+ ;;
327+ c6x)
328+ basic_machine=tic6x-unknown
329+ ;;
330+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
293331 basic_machine=$basic_machine-unknown
294332 os=-none
295333 ;;
@@ -299,6 +337,21 @@ case $basic_machine in
299337 basic_machine=mt-unknown
300338 ;;
301339
340+ strongarm | thumb | xscale)
341+ basic_machine=arm-unknown
342+ ;;
343+ xgate)
344+ basic_machine=$basic_machine-unknown
345+ os=-none
346+ ;;
347+ xscaleeb)
348+ basic_machine=armeb-unknown
349+ ;;
350+
351+ xscaleel)
352+ basic_machine=armel-unknown
353+ ;;
354+
302355 # We use `pc' rather than `unknown'
303356 # because (1) that's what they normally are, and
304357 # (2) the word "unknown" tends to confuse beginning users.
@@ -313,64 +366,86 @@ case $basic_machine in
313366 # Recognize the basic CPU types with company name.
314367 580-* \
315368 | a29k-* \
369+ | aarch64-* | aarch64_be-* \
316370 | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
317371 | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
318- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
372+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
319373 | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
320374 | avr-* | avr32-* \
375+ | be32-* | be64-* \
321376 | bfin-* | bs2000-* \
322- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
323- | clipper-* | craynv-* | cydra-* \
377+ | c[123]* | c30-* | [cjt]90-* | c4x-* \
378+ | c8051-* | clipper-* | craynv-* | cydra-* \
324379 | d10v-* | d30v-* | dlx-* \
325380 | elxsi-* \
326- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
381+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
327382 | h8300-* | h8500-* \
328383 | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
384+ | hexagon-* \
329385 | i*86-* | i860-* | i960-* | ia64-* \
330386 | ip2k-* | iq2000-* \
387+ | k1om-* \
388+ | le32-* | le64-* \
389+ | lm32-* \
331390 | m32c-* | m32r-* | m32rle-* \
332391 | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
333- | m88110-* | m88k-* | maxq-* | mcore-* \
392+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
393+ | microblaze-* | microblazeel-* \
334394 | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
335395 | mips16-* \
336396 | mips64-* | mips64el-* \
337- | mips64vr-* | mips64vrel-* \
397+ | mips64octeon-* | mips64octeonel-* \
338398 | mips64orion-* | mips64orionel-* \
399+ | mips64r5900-* | mips64r5900el-* \
400+ | mips64vr-* | mips64vrel-* \
339401 | mips64vr4100-* | mips64vr4100el-* \
340402 | mips64vr4300-* | mips64vr4300el-* \
341403 | mips64vr5000-* | mips64vr5000el-* \
342404 | mips64vr5900-* | mips64vr5900el-* \
343405 | mipsisa32-* | mipsisa32el-* \
344406 | mipsisa32r2-* | mipsisa32r2el-* \
407+ | mipsisa32r6-* | mipsisa32r6el-* \
345408 | mipsisa64-* | mipsisa64el-* \
346409 | mipsisa64r2-* | mipsisa64r2el-* \
410+ | mipsisa64r6-* | mipsisa64r6el-* \
347411 | mipsisa64sb1-* | mipsisa64sb1el-* \
348412 | mipsisa64sr71k-* | mipsisa64sr71kel-* \
413+ | mipsr5900-* | mipsr5900el-* \
349414 | mipstx39-* | mipstx39el-* \
350415 | mmix-* \
351416 | mt-* \
352417 | msp430-* \
353- | nios-* | nios2-* \
418+ | nds32-* | nds32le-* | nds32be-* \
419+ | nios-* | nios2-* | nios2eb-* | nios2el-* \
354420 | none-* | np1-* | ns16k-* | ns32k-* \
421+ | open8-* \
422+ | or1k*-* \
355423 | orion-* \
356424 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
357- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
425+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
358426 | pyramid-* \
359- | romp-* | rs6000-* \
360- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
427+ | rl78-* | romp-* | rs6000-* | rx-* \
428+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
361429 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
362430 | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
363431 | sparclite-* \
364- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
365- | tahoe-* | thumb-* \
432+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
433+ | tahoe-* \
366434 | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
435+ | tile*-* \
367436 | tron-* \
368- | v850-* | v850e-* | vax-* \
437+ | ubicom32-* \
438+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
439+ | vax-* \
369440 | we32k-* \
370- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
371- | xstormy16-* | xtensa-* \
441+ | x86-* | x86_64-* | xc16x-* | xps100-* \
442+ | xstormy16-* | xtensa*-* \
372443 | ymp-* \
373- | z8k-*)
444+ | z8k-* | z80-*)
445+ ;;
446+ # Recognize the basic CPU types without company name, with glob match.
447+ xtensa*)
448+ basic_machine=$basic_machine-unknown
374449 ;;
375450 # Recognize the various machine names and aliases which stand
376451 # for a CPU type and a company and sometimes even an OS.
@@ -388,7 +463,7 @@ case $basic_machine in
388463 basic_machine=a29k-amd
389464 os=-udi
390465 ;;
391- abacus)
466+ abacus)
392467 basic_machine=abacus-unknown
393468 ;;
394469 adobe68k)
@@ -434,6 +509,10 @@ case $basic_machine in
434509 basic_machine=m68k-apollo
435510 os=-bsd
436511 ;;
512+ aros)
513+ basic_machine=i386-pc
514+ os=-aros
515+ ;;
437516 aux)
438517 basic_machine=m68k-apple
439518 os=-aux
@@ -442,10 +521,35 @@ case $basic_machine in
442521 basic_machine=ns32k-sequent
443522 os=-dynix
444523 ;;
524+ blackfin)
525+ basic_machine=bfin-unknown
526+ os=-linux
527+ ;;
528+ blackfin-*)
529+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
530+ os=-linux
531+ ;;
532+ bluegene*)
533+ basic_machine=powerpc-ibm
534+ os=-cnk
535+ ;;
536+ c54x-*)
537+ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
538+ ;;
539+ c55x-*)
540+ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
541+ ;;
542+ c6x-*)
543+ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
544+ ;;
445545 c90)
446546 basic_machine=c90-cray
447547 os=-unicos
448548 ;;
549+ cegcc)
550+ basic_machine=arm-unknown
551+ os=-cegcc
552+ ;;
449553 convex-c1)
450554 basic_machine=c1-convex
451555 os=-bsd
@@ -474,8 +578,8 @@ case $basic_machine in
474578 basic_machine=craynv-cray
475579 os=-unicosmp
476580 ;;
477- cr16c)
478- basic_machine=cr16c-unknown
581+ cr16 | cr16-*)
582+ basic_machine=cr16-unknown
479583 os=-elf
480584 ;;
481585 crds | unos)
@@ -513,6 +617,10 @@ case $basic_machine in
513617 basic_machine=m88k-motorola
514618 os=-sysv3
515619 ;;
620+ dicos)
621+ basic_machine=i686-pc
622+ os=-dicos
623+ ;;
516624 djgpp)
517625 basic_machine=i586-pc
518626 os=-msdosdjgpp
@@ -628,7 +736,6 @@ case $basic_machine in
628736 i370-ibm* | ibm*)
629737 basic_machine=i370-ibm
630738 ;;
631-# I'm not sure what "Sysv32" means. Should this be sysv3.2?
632739 i*86v32)
633740 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
634741 os=-sysv32
@@ -667,6 +774,14 @@ case $basic_machine in
667774 basic_machine=m68k-isi
668775 os=-sysv
669776 ;;
777+ m68knommu)
778+ basic_machine=m68k-unknown
779+ os=-linux
780+ ;;
781+ m68knommu-*)
782+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
783+ os=-linux
784+ ;;
670785 m88k-omron*)
671786 basic_machine=m88k-omron
672787 ;;
@@ -678,10 +793,21 @@ case $basic_machine in
678793 basic_machine=ns32k-utek
679794 os=-sysv
680795 ;;
796+ microblaze*)
797+ basic_machine=microblaze-xilinx
798+ ;;
799+ mingw64)
800+ basic_machine=x86_64-pc
801+ os=-mingw64
802+ ;;
681803 mingw32)
682- basic_machine=i386-pc
804+ basic_machine=i686-pc
683805 os=-mingw32
684806 ;;
807+ mingw32ce)
808+ basic_machine=arm-unknown
809+ os=-mingw32ce
810+ ;;
685811 miniframe)
686812 basic_machine=m68000-convergent
687813 ;;
@@ -703,6 +829,10 @@ case $basic_machine in
703829 basic_machine=powerpc-unknown
704830 os=-morphos
705831 ;;
832+ moxiebox)
833+ basic_machine=moxie-unknown
834+ os=-moxiebox
835+ ;;
706836 msdos)
707837 basic_machine=i386-pc
708838 os=-msdos
@@ -710,10 +840,18 @@ case $basic_machine in
710840 ms1-*)
711841 basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
712842 ;;
843+ msys)
844+ basic_machine=i686-pc
845+ os=-msys
846+ ;;
713847 mvs)
714848 basic_machine=i370-ibm
715849 os=-mvs
716850 ;;
851+ nacl)
852+ basic_machine=le32-unknown
853+ os=-nacl
854+ ;;
717855 ncr3000)
718856 basic_machine=i486-ncr
719857 os=-sysv4
@@ -778,6 +916,12 @@ case $basic_machine in
778916 np1)
779917 basic_machine=np1-gould
780918 ;;
919+ neo-tandem)
920+ basic_machine=neo-tandem
921+ ;;
922+ nse-tandem)
923+ basic_machine=nse-tandem
924+ ;;
781925 nsr-tandem)
782926 basic_machine=nsr-tandem
783927 ;;
@@ -808,6 +952,14 @@ case $basic_machine in
808952 basic_machine=i860-intel
809953 os=-osf
810954 ;;
955+ parisc)
956+ basic_machine=hppa-unknown
957+ os=-linux
958+ ;;
959+ parisc-*)
960+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
961+ os=-linux
962+ ;;
811963 pbd)
812964 basic_machine=sparc-tti
813965 ;;
@@ -852,9 +1004,10 @@ case $basic_machine in
8521004 ;;
8531005 power) basic_machine=power-ibm
8541006 ;;
855- ppc) basic_machine=powerpc-unknown
1007+ ppc | ppcbe) basic_machine=powerpc-unknown
8561008 ;;
857- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
1009+ ppc-* | ppcbe-*)
1010+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
8581011 ;;
8591012 ppcle | powerpclittle | ppc-le | powerpc-little)
8601013 basic_machine=powerpcle-unknown
@@ -879,7 +1032,11 @@ case $basic_machine in
8791032 basic_machine=i586-unknown
8801033 os=-pw32
8811034 ;;
882- rdos)
1035+ rdos | rdos64)
1036+ basic_machine=x86_64-pc
1037+ os=-rdos
1038+ ;;
1039+ rdos32)
8831040 basic_machine=i386-pc
8841041 os=-rdos
8851042 ;;
@@ -909,6 +1066,10 @@ case $basic_machine in
9091066 sb1el)
9101067 basic_machine=mipsisa64sb1el-unknown
9111068 ;;
1069+ sde)
1070+ basic_machine=mipsisa32-sde
1071+ os=-elf
1072+ ;;
9121073 sei)
9131074 basic_machine=mips-sei
9141075 os=-seiux
@@ -920,6 +1081,9 @@ case $basic_machine in
9201081 basic_machine=sh-hitachi
9211082 os=-hms
9221083 ;;
1084+ sh5el)
1085+ basic_machine=sh5le-unknown
1086+ ;;
9231087 sh64)
9241088 basic_machine=sh64-unknown
9251089 ;;
@@ -941,6 +1105,9 @@ case $basic_machine in
9411105 basic_machine=i860-stratus
9421106 os=-sysv4
9431107 ;;
1108+ strongarm-* | thumb-*)
1109+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
1110+ ;;
9441111 sun2)
9451112 basic_machine=m68000-sun
9461113 ;;
@@ -997,17 +1164,9 @@ case $basic_machine in
9971164 basic_machine=t90-cray
9981165 os=-unicos
9991166 ;;
1000- tic54x | c54x*)
1001- basic_machine=tic54x-unknown
1002- os=-coff
1003- ;;
1004- tic55x | c55x*)
1005- basic_machine=tic55x-unknown
1006- os=-coff
1007- ;;
1008- tic6x | c6x*)
1009- basic_machine=tic6x-unknown
1010- os=-coff
1167+ tile*)
1168+ basic_machine=$basic_machine-unknown
1169+ os=-linux-gnu
10111170 ;;
10121171 tx39)
10131172 basic_machine=mipstx39-unknown
@@ -1076,6 +1235,9 @@ case $basic_machine in
10761235 xps | xps100)
10771236 basic_machine=xps100-honeywell
10781237 ;;
1238+ xscale-* | xscalee[bl]-*)
1239+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
1240+ ;;
10791241 ymp)
10801242 basic_machine=ymp-cray
10811243 os=-unicos
@@ -1084,6 +1246,10 @@ case $basic_machine in
10841246 basic_machine=z8k-unknown
10851247 os=-sim
10861248 ;;
1249+ z80-*-coff)
1250+ basic_machine=z80-unknown
1251+ os=-sim
1252+ ;;
10871253 none)
10881254 basic_machine=none-none
10891255 os=-none
@@ -1122,7 +1288,7 @@ case $basic_machine in
11221288 we32k)
11231289 basic_machine=we32k-att
11241290 ;;
1125- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
1291+ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
11261292 basic_machine=sh-unknown
11271293 ;;
11281294 sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
@@ -1169,9 +1335,12 @@ esac
11691335 if [ x"$os" != x"" ]
11701336 then
11711337 case $os in
1172- # First match some system type aliases
1173- # that might get confused with valid system types.
1338+ # First match some system type aliases
1339+ # that might get confused with valid system types.
11741340 # -solaris* is a basic system type, with this one exception.
1341+ -auroraux)
1342+ os=-auroraux
1343+ ;;
11751344 -solaris1 | -solaris1.*)
11761345 os=`echo $os | sed -e 's|solaris1|sunos4|'`
11771346 ;;
@@ -1192,29 +1361,31 @@ case $os in
11921361 # Each alternative MUST END IN A *, to match a version number.
11931362 # -sysv* is not here because it comes later, after sysvr4.
11941363 -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
1195- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
1196- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
1364+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
1365+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
1366+ | -sym* | -kopensolaris* | -plan9* \
11971367 | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
1198- | -aos* \
1368+ | -aos* | -aros* \
11991369 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
12001370 | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
12011371 | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
1202- | -openbsd* | -solidbsd* \
1372+ | -bitrig* | -openbsd* | -solidbsd* \
12031373 | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
12041374 | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
12051375 | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
12061376 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1207- | -chorusos* | -chorusrdb* \
1208- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1209- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
1210- | -uxpv* | -beos* | -mpeix* | -udk* \
1377+ | -chorusos* | -chorusrdb* | -cegcc* \
1378+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1379+ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
1380+ | -linux-newlib* | -linux-musl* | -linux-uclibc* \
1381+ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
12111382 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
12121383 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
12131384 | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
12141385 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
12151386 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
12161387 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1217- | -skyos* | -haiku* | -rdos* | -toppers*)
1388+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
12181389 # Remember, each alternative MUST END IN *, to match a version number.
12191390 ;;
12201391 -qnx*)
@@ -1253,7 +1424,7 @@ case $os in
12531424 -opened*)
12541425 os=-openedition
12551426 ;;
1256- -os400*)
1427+ -os400*)
12571428 os=-os400
12581429 ;;
12591430 -wince*)
@@ -1302,7 +1473,7 @@ case $os in
13021473 -sinix*)
13031474 os=-sysv4
13041475 ;;
1305- -tpf*)
1476+ -tpf*)
13061477 os=-tpf
13071478 ;;
13081479 -triton*)
@@ -1338,12 +1509,14 @@ case $os in
13381509 -aros*)
13391510 os=-aros
13401511 ;;
1341- -kaos*)
1342- os=-kaos
1343- ;;
13441512 -zvmoe)
13451513 os=-zvmoe
13461514 ;;
1515+ -dicos*)
1516+ os=-dicos
1517+ ;;
1518+ -nacl*)
1519+ ;;
13471520 -none)
13481521 ;;
13491522 *)
@@ -1366,7 +1539,10 @@ else
13661539 # system, and we'll never get to this point.
13671540
13681541 case $basic_machine in
1369- spu-*)
1542+ score-*)
1543+ os=-elf
1544+ ;;
1545+ spu-*)
13701546 os=-elf
13711547 ;;
13721548 *-acorn)
@@ -1378,8 +1554,23 @@ case $basic_machine in
13781554 arm*-semi)
13791555 os=-aout
13801556 ;;
1381- c4x-* | tic4x-*)
1382- os=-coff
1557+ c4x-* | tic4x-*)
1558+ os=-coff
1559+ ;;
1560+ c8051-*)
1561+ os=-elf
1562+ ;;
1563+ hexagon-*)
1564+ os=-elf
1565+ ;;
1566+ tic54x-*)
1567+ os=-coff
1568+ ;;
1569+ tic55x-*)
1570+ os=-coff
1571+ ;;
1572+ tic6x-*)
1573+ os=-coff
13831574 ;;
13841575 # This must come before the *-dec entry.
13851576 pdp10-*)
@@ -1399,13 +1590,13 @@ case $basic_machine in
13991590 ;;
14001591 m68000-sun)
14011592 os=-sunos3
1402- # This also exists in the configure program, but was not the
1403- # default.
1404- # os=-sunos4
14051593 ;;
14061594 m68*-cisco)
14071595 os=-aout
14081596 ;;
1597+ mep-*)
1598+ os=-elf
1599+ ;;
14091600 mips*-cisco)
14101601 os=-elf
14111602 ;;
@@ -1430,7 +1621,7 @@ case $basic_machine in
14301621 *-ibm)
14311622 os=-aix
14321623 ;;
1433- *-knuth)
1624+ *-knuth)
14341625 os=-mmixware
14351626 ;;
14361627 *-wec)
@@ -1535,7 +1726,7 @@ case $basic_machine in
15351726 -sunos*)
15361727 vendor=sun
15371728 ;;
1538- -aix*)
1729+ -cnk*|-aix*)
15391730 vendor=ibm
15401731 ;;
15411732 -beos*)
--- a/install-sh
+++ b/install-sh
@@ -1,7 +1,7 @@
11 #!/bin/sh
22 # install - install a program, script, or datafile
33
4-scriptversion=2006-10-14.15
4+scriptversion=2011-11-20.07; # UTC
55
66 # This originates from X11R5 (mit/util/scripts/install.sh), which was
77 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,7 +35,7 @@ scriptversion=2006-10-14.15
3535 # FSF changes to this file are in the public domain.
3636 #
3737 # Calling this script install-sh is preferred over install.sh, to prevent
38-# `make' implicit rules from creating a file called install from it
38+# 'make' implicit rules from creating a file called install from it
3939 # when there is no Makefile.
4040 #
4141 # This script is compatible with the BSD install script, but was written
@@ -48,7 +48,7 @@ IFS=" "" $nl"
4848 # set DOITPROG to echo to test this script
4949
5050 # Don't use :- since 4.3BSD and earlier shells don't like it.
51-doit="${DOITPROG-}"
51+doit=${DOITPROG-}
5252 if test -z "$doit"; then
5353 doit_exec=exec
5454 else
@@ -58,34 +58,49 @@ fi
5858 # Put in absolute file names if you don't have them in your path;
5959 # or use environment vars.
6060
61-mvprog="${MVPROG-mv}"
62-cpprog="${CPPROG-cp}"
63-chmodprog="${CHMODPROG-chmod}"
64-chownprog="${CHOWNPROG-chown}"
65-chgrpprog="${CHGRPPROG-chgrp}"
66-stripprog="${STRIPPROG-strip}"
67-rmprog="${RMPROG-rm}"
68-mkdirprog="${MKDIRPROG-mkdir}"
61+chgrpprog=${CHGRPPROG-chgrp}
62+chmodprog=${CHMODPROG-chmod}
63+chownprog=${CHOWNPROG-chown}
64+cmpprog=${CMPPROG-cmp}
65+cpprog=${CPPROG-cp}
66+mkdirprog=${MKDIRPROG-mkdir}
67+mvprog=${MVPROG-mv}
68+rmprog=${RMPROG-rm}
69+stripprog=${STRIPPROG-strip}
70+
71+posix_glob='?'
72+initialize_posix_glob='
73+ test "$posix_glob" != "?" || {
74+ if (set -f) 2>/dev/null; then
75+ posix_glob=
76+ else
77+ posix_glob=:
78+ fi
79+ }
80+'
6981
70-posix_glob=
7182 posix_mkdir=
7283
7384 # Desired mode of installed file.
7485 mode=0755
7586
87+chgrpcmd=
7688 chmodcmd=$chmodprog
7789 chowncmd=
78-chgrpcmd=
79-stripcmd=
90+mvcmd=$mvprog
8091 rmcmd="$rmprog -f"
81-mvcmd="$mvprog"
92+stripcmd=
93+
8294 src=
8395 dst=
8496 dir_arg=
85-dstarg=
97+dst_arg=
98+
99+copy_on_change=false
86100 no_target_directory=
87101
88-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
102+usage="\
103+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
89104 or: $0 [OPTION]... SRCFILES... DIRECTORY
90105 or: $0 [OPTION]... -t DIRECTORY SRCFILES...
91106 or: $0 [OPTION]... -d DIRECTORIES...
@@ -95,65 +110,59 @@ In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
95110 In the 4th, create DIRECTORIES.
96111
97112 Options:
98--c (ignored)
99--d create directories instead of installing files.
100--g GROUP $chgrpprog installed files to GROUP.
101--m MODE $chmodprog installed files to MODE.
102--o USER $chownprog installed files to USER.
103--s $stripprog installed files.
104--t DIRECTORY install into DIRECTORY.
105--T report an error if DSTFILE is a directory.
106---help display this help and exit.
107---version display version info and exit.
113+ --help display this help and exit.
114+ --version display version info and exit.
115+
116+ -c (ignored)
117+ -C install only if different (preserve the last data modification time)
118+ -d create directories instead of installing files.
119+ -g GROUP $chgrpprog installed files to GROUP.
120+ -m MODE $chmodprog installed files to MODE.
121+ -o USER $chownprog installed files to USER.
122+ -s $stripprog installed files.
123+ -t DIRECTORY install into DIRECTORY.
124+ -T report an error if DSTFILE is a directory.
108125
109126 Environment variables override the default commands:
110- CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
127+ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
128+ RMPROG STRIPPROG
111129 "
112130
113131 while test $# -ne 0; do
114132 case $1 in
115- -c) shift
116- continue;;
133+ -c) ;;
117134
118- -d) dir_arg=true
119- shift
120- continue;;
135+ -C) copy_on_change=true;;
136+
137+ -d) dir_arg=true;;
121138
122139 -g) chgrpcmd="$chgrpprog $2"
123- shift
124- shift
125- continue;;
140+ shift;;
126141
127142 --help) echo "$usage"; exit $?;;
128143
129144 -m) mode=$2
130- shift
131- shift
132145 case $mode in
133146 *' '* | *' '* | *'
134147 '* | *'*'* | *'?'* | *'['*)
135148 echo "$0: invalid mode: $mode" >&2
136149 exit 1;;
137150 esac
138- continue;;
151+ shift;;
139152
140153 -o) chowncmd="$chownprog $2"
141- shift
142- shift
143- continue;;
154+ shift;;
144155
145- -s) stripcmd=$stripprog
146- shift
147- continue;;
156+ -s) stripcmd=$stripprog;;
148157
149- -t) dstarg=$2
150- shift
151- shift
152- continue;;
158+ -t) dst_arg=$2
159+ # Protect names problematic for 'test' and other utilities.
160+ case $dst_arg in
161+ -* | [=\(\)!]) dst_arg=./$dst_arg;;
162+ esac
163+ shift;;
153164
154- -T) no_target_directory=true
155- shift
156- continue;;
165+ -T) no_target_directory=true;;
157166
158167 --version) echo "$0 $scriptversion"; exit $?;;
159168
@@ -165,21 +174,26 @@ while test $# -ne 0; do
165174
166175 *) break;;
167176 esac
177+ shift
168178 done
169179
170-if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
180+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
171181 # When -d is used, all remaining arguments are directories to create.
172182 # When -t is used, the destination is already specified.
173183 # Otherwise, the last argument is the destination. Remove it from $@.
174184 for arg
175185 do
176- if test -n "$dstarg"; then
186+ if test -n "$dst_arg"; then
177187 # $@ is not empty: it contains at least $arg.
178- set fnord "$@" "$dstarg"
188+ set fnord "$@" "$dst_arg"
179189 shift # fnord
180190 fi
181191 shift # arg
182- dstarg=$arg
192+ dst_arg=$arg
193+ # Protect names problematic for 'test' and other utilities.
194+ case $dst_arg in
195+ -* | [=\(\)!]) dst_arg=./$dst_arg;;
196+ esac
183197 done
184198 fi
185199
@@ -188,13 +202,17 @@ if test $# -eq 0; then
188202 echo "$0: no input file specified." >&2
189203 exit 1
190204 fi
191- # It's OK to call `install-sh -d' without argument.
205+ # It's OK to call 'install-sh -d' without argument.
192206 # This can happen when creating conditional directories.
193207 exit 0
194208 fi
195209
196210 if test -z "$dir_arg"; then
197- trap '(exit $?); exit' 1 2 13 15
211+ do_exit='(exit $ret); exit $ret'
212+ trap "ret=129; $do_exit" 1
213+ trap "ret=130; $do_exit" 2
214+ trap "ret=141; $do_exit" 13
215+ trap "ret=143; $do_exit" 15
198216
199217 # Set umask so as not to create temps with too-generous modes.
200218 # However, 'strip' requires both read and write access to temps.
@@ -222,9 +240,9 @@ fi
222240
223241 for src
224242 do
225- # Protect names starting with `-'.
243+ # Protect names problematic for 'test' and other utilities.
226244 case $src in
227- -*) src=./$src ;;
245+ -* | [=\(\)!]) src=./$src;;
228246 esac
229247
230248 if test -n "$dir_arg"; then
@@ -242,22 +260,17 @@ do
242260 exit 1
243261 fi
244262
245- if test -z "$dstarg"; then
263+ if test -z "$dst_arg"; then
246264 echo "$0: no destination specified." >&2
247265 exit 1
248266 fi
249-
250- dst=$dstarg
251- # Protect names starting with `-'.
252- case $dst in
253- -*) dst=./$dst ;;
254- esac
267+ dst=$dst_arg
255268
256269 # If destination is a directory, append the input filename; won't work
257270 # if double slashes aren't ignored.
258271 if test -d "$dst"; then
259272 if test -n "$no_target_directory"; then
260- echo "$0: $dstarg: Is a directory" >&2
273+ echo "$0: $dst_arg: Is a directory" >&2
261274 exit 1
262275 fi
263276 dstdir=$dst
@@ -332,34 +345,41 @@ do
332345 # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
333346 ;;
334347 *)
348+ # $RANDOM is not portable (e.g. dash); use it when possible to
349+ # lower collision chance
335350 tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
336- trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
351+ trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
337352
353+ # As "mkdir -p" follows symlinks and we work in /tmp possibly; so
354+ # create the $tmpdir first (and fail if unsuccessful) to make sure
355+ # that nobody tries to guess the $tmpdir name.
338356 if (umask $mkdir_umask &&
339- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
357+ $mkdirprog $mkdir_mode "$tmpdir" &&
358+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
340359 then
341360 if test -z "$dir_arg" || {
342361 # Check for POSIX incompatibilities with -m.
343362 # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
344- # other-writeable bit of parent directory when it shouldn't.
363+ # other-writable bit of parent directory when it shouldn't.
345364 # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
346- ls_ld_tmpdir=`ls -ld "$tmpdir"`
365+ test_tmpdir="$tmpdir/a"
366+ ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
347367 case $ls_ld_tmpdir in
348368 d????-?r-*) different_mode=700;;
349369 d????-?--*) different_mode=755;;
350370 *) false;;
351371 esac &&
352- $mkdirprog -m$different_mode -p -- "$tmpdir" && {
353- ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
372+ $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
373+ ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
354374 test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
355375 }
356376 }
357377 then posix_mkdir=:
358378 fi
359- rmdir "$tmpdir/d" "$tmpdir"
379+ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
360380 else
361381 # Remove any dirs left behind by ancient mkdir implementations.
362- rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
382+ rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
363383 fi
364384 trap '' 0;;
365385 esac;;
@@ -378,33 +398,26 @@ do
378398 # directory the slow way, step by step, checking for races as we go.
379399
380400 case $dstdir in
381- /*) prefix=/ ;;
382- -*) prefix=./ ;;
383- *) prefix= ;;
401+ /*) prefix='/';;
402+ [-=\(\)!]*) prefix='./';;
403+ *) prefix='';;
384404 esac
385405
386- case $posix_glob in
387- '')
388- if (set -f) 2>/dev/null; then
389- posix_glob=true
390- else
391- posix_glob=false
392- fi ;;
393- esac
406+ eval "$initialize_posix_glob"
394407
395408 oIFS=$IFS
396409 IFS=/
397- $posix_glob && set -f
410+ $posix_glob set -f
398411 set fnord $dstdir
399412 shift
400- $posix_glob && set +f
413+ $posix_glob set +f
401414 IFS=$oIFS
402415
403416 prefixes=
404417
405418 for d
406419 do
407- test -z "$d" && continue
420+ test X"$d" = X && continue
408421
409422 prefix=$prefix$d
410423 if test -d "$prefix"; then
@@ -459,41 +472,54 @@ do
459472 # ignore errors from any of these, just make sure not to ignore
460473 # errors from the above "$doit $cpprog $src $dsttmp" command.
461474 #
462- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
463- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
464- && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
465- && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
466-
467- # Now rename the file to the real destination.
468- { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
469- || {
470- # The rename failed, perhaps because mv can't rename something else
471- # to itself, or perhaps because mv is so ancient that it does not
472- # support -f.
473-
474- # Now remove or move aside any old file at destination location.
475- # We try this two ways since rm can't unlink itself on some
476- # systems and the destination file might be busy for other
477- # reasons. In this case, the final cleanup might fail but the new
478- # file should still install successfully.
479- {
480- if test -f "$dst"; then
481- $doit $rmcmd -f "$dst" 2>/dev/null \
482- || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
483- && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
484- || {
485- echo "$0: cannot unlink or rename $dst" >&2
486- (exit 1); exit 1
487- }
488- else
489- :
490- fi
491- } &&
492-
493- # Now rename the file to the real destination.
494- $doit $mvcmd "$dsttmp" "$dst"
495- }
496- } || exit 1
475+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
476+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
477+ { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
478+ { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
479+
480+ # If -C, don't bother to copy if it wouldn't change the file.
481+ if $copy_on_change &&
482+ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
483+ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
484+
485+ eval "$initialize_posix_glob" &&
486+ $posix_glob set -f &&
487+ set X $old && old=:$2:$4:$5:$6 &&
488+ set X $new && new=:$2:$4:$5:$6 &&
489+ $posix_glob set +f &&
490+
491+ test "$old" = "$new" &&
492+ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
493+ then
494+ rm -f "$dsttmp"
495+ else
496+ # Rename the file to the real destination.
497+ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
498+
499+ # The rename failed, perhaps because mv can't rename something else
500+ # to itself, or perhaps because mv is so ancient that it does not
501+ # support -f.
502+ {
503+ # Now remove or move aside any old file at destination location.
504+ # We try this two ways since rm can't unlink itself on some
505+ # systems and the destination file might be busy for other
506+ # reasons. In this case, the final cleanup might fail but the new
507+ # file should still install successfully.
508+ {
509+ test ! -f "$dst" ||
510+ $doit $rmcmd -f "$dst" 2>/dev/null ||
511+ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
512+ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
513+ } ||
514+ { echo "$0: cannot unlink or rename $dst" >&2
515+ (exit 1); exit 1
516+ }
517+ } &&
518+
519+ # Now rename the file to the real destination.
520+ $doit $mvcmd "$dsttmp" "$dst"
521+ }
522+ fi || exit 1
497523
498524 trap '' 0
499525 fi
@@ -503,5 +529,6 @@ done
503529 # eval: (add-hook 'write-file-hooks 'time-stamp)
504530 # time-stamp-start: "scriptversion="
505531 # time-stamp-format: "%:y-%02m-%02d.%02H"
506-# time-stamp-end: "$"
532+# time-stamp-time-zone: "UTC"
533+# time-stamp-end: "; # UTC"
507534 # End:
--- a/missing
+++ b/missing
@@ -1,11 +1,10 @@
11 #! /bin/sh
2-# Common stub for a few missing GNU programs while installing.
2+# Common wrapper for a few potentially missing GNU programs.
33
4-scriptversion=2006-05-10.23
4+scriptversion=2013-10-28.13; # UTC
55
6-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
7-# Free Software Foundation, Inc.
8-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
6+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
7+# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
98
109 # This program is free software; you can redistribute it and/or modify
1110 # it under the terms of the GNU General Public License as published by
@@ -18,9 +17,7 @@ scriptversion=2006-05-10.23
1817 # GNU General Public License for more details.
1918
2019 # You should have received a copy of the GNU General Public License
21-# along with this program; if not, write to the Free Software
22-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
23-# 02110-1301, USA.
20+# along with this program. If not, see <http://www.gnu.org/licenses/>.
2421
2522 # As a special exception to the GNU General Public License, if you
2623 # distribute this file as part of a program that contains a
@@ -28,66 +25,40 @@ scriptversion=2006-05-10.23
2825 # the same distribution terms that you use for the rest of that program.
2926
3027 if test $# -eq 0; then
31- echo 1>&2 "Try \`$0 --help' for more information"
28+ echo 1>&2 "Try '$0 --help' for more information"
3229 exit 1
3330 fi
3431
35-run=:
36-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
37-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
38-
39-# In the cases where this matters, `missing' is being run in the
40-# srcdir already.
41-if test -f configure.ac; then
42- configure_ac=configure.ac
43-else
44- configure_ac=configure.in
45-fi
32+case $1 in
4633
47-msg="missing on your system"
34+ --is-lightweight)
35+ # Used by our autoconf macros to check whether the available missing
36+ # script is modern enough.
37+ exit 0
38+ ;;
4839
49-case $1 in
50---run)
51- # Try to run requested program, and just exit if it succeeds.
52- run=
53- shift
54- "$@" && exit 0
55- # Exit code 63 means version mismatch. This often happens
56- # when the user try to use an ancient version of a tool on
57- # a file that requires a minimum version. In this case we
58- # we should proceed has if the program had been absent, or
59- # if --run hadn't been passed.
60- if test $? = 63; then
61- run=:
62- msg="probably too old"
63- fi
64- ;;
40+ --run)
41+ # Back-compat with the calling convention used by older automake.
42+ shift
43+ ;;
6544
6645 -h|--h|--he|--hel|--help)
6746 echo "\
6847 $0 [OPTION]... PROGRAM [ARGUMENT]...
6948
70-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
71-error status if there is no known handling for PROGRAM.
49+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
50+to PROGRAM being missing or too old.
7251
7352 Options:
7453 -h, --help display this help and exit
7554 -v, --version output version information and exit
76- --run try to run the given command, and emulate it if it fails
7755
7856 Supported PROGRAM values:
79- aclocal touch file \`aclocal.m4'
80- autoconf touch file \`configure'
81- autoheader touch file \`config.h.in'
82- autom4te touch the output file, or create a stub one
83- automake touch all \`Makefile.in' files
84- bison create \`y.tab.[ch]', if possible, from existing .[ch]
85- flex create \`lex.yy.c', if possible, from existing .c
86- help2man touch the output file
87- lex create \`lex.yy.c', if possible, from existing .c
88- makeinfo touch the output file
89- tar try tar, gnutar, gtar, then tar without non-portable flags
90- yacc create \`y.tab.[ch]', if possible, from existing .[ch]
57+ aclocal autoconf autoheader autom4te automake makeinfo
58+ bison yacc flex lex help2man
59+
60+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
61+'g' are ignored when checking the name.
9162
9263 Send bug reports to <bug-automake@gnu.org>."
9364 exit $?
@@ -99,269 +70,146 @@ Send bug reports to <bug-automake@gnu.org>."
9970 ;;
10071
10172 -*)
102- echo 1>&2 "$0: Unknown \`$1' option"
103- echo 1>&2 "Try \`$0 --help' for more information"
73+ echo 1>&2 "$0: unknown '$1' option"
74+ echo 1>&2 "Try '$0 --help' for more information"
10475 exit 1
10576 ;;
10677
10778 esac
10879
109-# Now exit if we have it, but it failed. Also exit now if we
110-# don't have it and --version was passed (most likely to detect
111-# the program).
112-case $1 in
113- lex|yacc)
114- # Not GNU programs, they don't have --version.
115- ;;
116-
117- tar)
118- if test -n "$run"; then
119- echo 1>&2 "ERROR: \`tar' requires --run"
120- exit 1
121- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
122- exit 1
123- fi
124- ;;
125-
126- *)
127- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
128- # We have it, but it failed.
129- exit 1
130- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
131- # Could not run --version or --help. This is probably someone
132- # running `$TOOL --version' or `$TOOL --help' to check whether
133- # $TOOL exists and not knowing $TOOL uses missing.
134- exit 1
135- fi
136- ;;
137-esac
138-
139-# If it does not exist, or fails to run (possibly an outdated version),
140-# try to emulate it.
141-case $1 in
142- aclocal*)
143- echo 1>&2 "\
144-WARNING: \`$1' is $msg. You should only need it if
145- you modified \`acinclude.m4' or \`${configure_ac}'. You might want
146- to install the \`Automake' and \`Perl' packages. Grab them from
147- any GNU archive site."
148- touch aclocal.m4
149- ;;
150-
151- autoconf)
152- echo 1>&2 "\
153-WARNING: \`$1' is $msg. You should only need it if
154- you modified \`${configure_ac}'. You might want to install the
155- \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
156- archive site."
157- touch configure
158- ;;
159-
160- autoheader)
161- echo 1>&2 "\
162-WARNING: \`$1' is $msg. You should only need it if
163- you modified \`acconfig.h' or \`${configure_ac}'. You might want
164- to install the \`Autoconf' and \`GNU m4' packages. Grab them
165- from any GNU archive site."
166- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
167- test -z "$files" && files="config.h"
168- touch_files=
169- for f in $files; do
170- case $f in
171- *:*) touch_files="$touch_files "`echo "$f" |
172- sed -e 's/^[^:]*://' -e 's/:.*//'`;;
173- *) touch_files="$touch_files $f.in";;
174- esac
175- done
176- touch $touch_files
177- ;;
178-
179- automake*)
180- echo 1>&2 "\
181-WARNING: \`$1' is $msg. You should only need it if
182- you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
183- You might want to install the \`Automake' and \`Perl' packages.
184- Grab them from any GNU archive site."
185- find . -type f -name Makefile.am -print |
186- sed 's/\.am$/.in/' |
187- while read f; do touch "$f"; done
188- ;;
189-
190- autom4te)
191- echo 1>&2 "\
192-WARNING: \`$1' is needed, but is $msg.
193- You might have modified some files without having the
194- proper tools for further handling them.
195- You can get \`$1' as part of \`Autoconf' from any GNU
196- archive site."
197-
198- file=`echo "$*" | sed -n "$sed_output"`
199- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
200- if test -f "$file"; then
201- touch $file
202- else
203- test -z "$file" || exec >$file
204- echo "#! /bin/sh"
205- echo "# Created by GNU Automake missing as a replacement of"
206- echo "# $ $@"
207- echo "exit 0"
208- chmod +x $file
209- exit 1
210- fi
211- ;;
212-
213- bison|yacc)
214- echo 1>&2 "\
215-WARNING: \`$1' $msg. You should only need it if
216- you modified a \`.y' file. You may need the \`Bison' package
217- in order for those modifications to take effect. You can get
218- \`Bison' from any GNU archive site."
219- rm -f y.tab.c y.tab.h
220- if test $# -ne 1; then
221- eval LASTARG="\${$#}"
222- case $LASTARG in
223- *.y)
224- SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
225- if test -f "$SRCFILE"; then
226- cp "$SRCFILE" y.tab.c
227- fi
228- SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
229- if test -f "$SRCFILE"; then
230- cp "$SRCFILE" y.tab.h
231- fi
232- ;;
233- esac
234- fi
235- if test ! -f y.tab.h; then
236- echo >y.tab.h
237- fi
238- if test ! -f y.tab.c; then
239- echo 'main() { return 0; }' >y.tab.c
240- fi
241- ;;
242-
243- lex|flex)
244- echo 1>&2 "\
245-WARNING: \`$1' is $msg. You should only need it if
246- you modified a \`.l' file. You may need the \`Flex' package
247- in order for those modifications to take effect. You can get
248- \`Flex' from any GNU archive site."
249- rm -f lex.yy.c
250- if test $# -ne 1; then
251- eval LASTARG="\${$#}"
252- case $LASTARG in
253- *.l)
254- SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
255- if test -f "$SRCFILE"; then
256- cp "$SRCFILE" lex.yy.c
257- fi
258- ;;
259- esac
260- fi
261- if test ! -f lex.yy.c; then
262- echo 'main() { return 0; }' >lex.yy.c
263- fi
264- ;;
265-
266- help2man)
267- echo 1>&2 "\
268-WARNING: \`$1' is $msg. You should only need it if
269- you modified a dependency of a manual page. You may need the
270- \`Help2man' package in order for those modifications to take
271- effect. You can get \`Help2man' from any GNU archive site."
272-
273- file=`echo "$*" | sed -n "$sed_output"`
274- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
275- if test -f "$file"; then
276- touch $file
277- else
278- test -z "$file" || exec >$file
279- echo ".ab help2man is required to generate this page"
280- exit 1
281- fi
282- ;;
283-
284- makeinfo)
285- echo 1>&2 "\
286-WARNING: \`$1' is $msg. You should only need it if
287- you modified a \`.texi' or \`.texinfo' file, or any other file
288- indirectly affecting the aspect of the manual. The spurious
289- call might also be the consequence of using a buggy \`make' (AIX,
290- DU, IRIX). You might want to install the \`Texinfo' package or
291- the \`GNU make' package. Grab either from any GNU archive site."
292- # The file to touch is that specified with -o ...
293- file=`echo "$*" | sed -n "$sed_output"`
294- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
295- if test -z "$file"; then
296- # ... or it is the one specified with @setfilename ...
297- infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
298- file=`sed -n '
299- /^@setfilename/{
300- s/.* \([^ ]*\) *$/\1/
301- p
302- q
303- }' $infile`
304- # ... or it is derived from the source name (dir/f.texi becomes f.info)
305- test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
306- fi
307- # If the file does not exist, the user really needs makeinfo;
308- # let's fail without touching anything.
309- test -f $file || exit 1
310- touch $file
311- ;;
312-
313- tar)
314- shift
315-
316- # We have already tried tar in the generic part.
317- # Look for gnutar/gtar before invocation to avoid ugly error
318- # messages.
319- if (gnutar --version > /dev/null 2>&1); then
320- gnutar "$@" && exit 0
321- fi
322- if (gtar --version > /dev/null 2>&1); then
323- gtar "$@" && exit 0
324- fi
325- firstarg="$1"
326- if shift; then
327- case $firstarg in
328- *o*)
329- firstarg=`echo "$firstarg" | sed s/o//`
330- tar "$firstarg" "$@" && exit 0
331- ;;
332- esac
333- case $firstarg in
334- *h*)
335- firstarg=`echo "$firstarg" | sed s/h//`
336- tar "$firstarg" "$@" && exit 0
337- ;;
338- esac
339- fi
340-
341- echo 1>&2 "\
342-WARNING: I can't seem to be able to run \`tar' with the given arguments.
343- You may want to install GNU tar or Free paxutils, or check the
344- command line arguments."
345- exit 1
346- ;;
347-
348- *)
349- echo 1>&2 "\
350-WARNING: \`$1' is needed, and is $msg.
351- You might have modified some files without having the
352- proper tools for further handling them. Check the \`README' file,
353- it often tells you about the needed prerequisites for installing
354- this package. You may also peek at any GNU archive site, in case
355- some other package would contain this missing \`$1' program."
356- exit 1
357- ;;
358-esac
80+# Run the given program, remember its exit status.
81+"$@"; st=$?
82+
83+# If it succeeded, we are done.
84+test $st -eq 0 && exit 0
85+
86+# Also exit now if we it failed (or wasn't found), and '--version' was
87+# passed; such an option is passed most likely to detect whether the
88+# program is present and works.
89+case $2 in --version|--help) exit $st;; esac
90+
91+# Exit code 63 means version mismatch. This often happens when the user
92+# tries to use an ancient version of a tool on a file that requires a
93+# minimum version.
94+if test $st -eq 63; then
95+ msg="probably too old"
96+elif test $st -eq 127; then
97+ # Program was missing.
98+ msg="missing on your system"
99+else
100+ # Program was found and executed, but failed. Give up.
101+ exit $st
102+fi
359103
360-exit 0
104+perl_URL=http://www.perl.org/
105+flex_URL=http://flex.sourceforge.net/
106+gnu_software_URL=http://www.gnu.org/software
107+
108+program_details ()
109+{
110+ case $1 in
111+ aclocal|automake)
112+ echo "The '$1' program is part of the GNU Automake package:"
113+ echo "<$gnu_software_URL/automake>"
114+ echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
115+ echo "<$gnu_software_URL/autoconf>"
116+ echo "<$gnu_software_URL/m4/>"
117+ echo "<$perl_URL>"
118+ ;;
119+ autoconf|autom4te|autoheader)
120+ echo "The '$1' program is part of the GNU Autoconf package:"
121+ echo "<$gnu_software_URL/autoconf/>"
122+ echo "It also requires GNU m4 and Perl in order to run:"
123+ echo "<$gnu_software_URL/m4/>"
124+ echo "<$perl_URL>"
125+ ;;
126+ esac
127+}
128+
129+give_advice ()
130+{
131+ # Normalize program name to check for.
132+ normalized_program=`echo "$1" | sed '
133+ s/^gnu-//; t
134+ s/^gnu//; t
135+ s/^g//; t'`
136+
137+ printf '%s\n' "'$1' is $msg."
138+
139+ configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
140+ case $normalized_program in
141+ autoconf*)
142+ echo "You should only need it if you modified 'configure.ac',"
143+ echo "or m4 files included by it."
144+ program_details 'autoconf'
145+ ;;
146+ autoheader*)
147+ echo "You should only need it if you modified 'acconfig.h' or"
148+ echo "$configure_deps."
149+ program_details 'autoheader'
150+ ;;
151+ automake*)
152+ echo "You should only need it if you modified 'Makefile.am' or"
153+ echo "$configure_deps."
154+ program_details 'automake'
155+ ;;
156+ aclocal*)
157+ echo "You should only need it if you modified 'acinclude.m4' or"
158+ echo "$configure_deps."
159+ program_details 'aclocal'
160+ ;;
161+ autom4te*)
162+ echo "You might have modified some maintainer files that require"
163+ echo "the 'autom4te' program to be rebuilt."
164+ program_details 'autom4te'
165+ ;;
166+ bison*|yacc*)
167+ echo "You should only need it if you modified a '.y' file."
168+ echo "You may want to install the GNU Bison package:"
169+ echo "<$gnu_software_URL/bison/>"
170+ ;;
171+ lex*|flex*)
172+ echo "You should only need it if you modified a '.l' file."
173+ echo "You may want to install the Fast Lexical Analyzer package:"
174+ echo "<$flex_URL>"
175+ ;;
176+ help2man*)
177+ echo "You should only need it if you modified a dependency" \
178+ "of a man page."
179+ echo "You may want to install the GNU Help2man package:"
180+ echo "<$gnu_software_URL/help2man/>"
181+ ;;
182+ makeinfo*)
183+ echo "You should only need it if you modified a '.texi' file, or"
184+ echo "any other file indirectly affecting the aspect of the manual."
185+ echo "You might want to install the Texinfo package:"
186+ echo "<$gnu_software_URL/texinfo/>"
187+ echo "The spurious makeinfo call might also be the consequence of"
188+ echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
189+ echo "want to install GNU make:"
190+ echo "<$gnu_software_URL/make/>"
191+ ;;
192+ *)
193+ echo "You might have modified some files without having the proper"
194+ echo "tools for further handling them. Check the 'README' file, it"
195+ echo "often tells you about the needed prerequisites for installing"
196+ echo "this package. You may also peek at any GNU archive site, in"
197+ echo "case some other package contains this missing '$1' program."
198+ ;;
199+ esac
200+}
201+
202+give_advice "$1" | sed -e '1s/^/WARNING: /' \
203+ -e '2,$s/^/ /' >&2
204+
205+# Propagate the correct exit status (expected to be 127 for a program
206+# not found, 63 for a program that failed due to version mismatch).
207+exit $st
361208
362209 # Local variables:
363210 # eval: (add-hook 'write-file-hooks 'time-stamp)
364211 # time-stamp-start: "scriptversion="
365212 # time-stamp-format: "%:y-%02m-%02d.%02H"
366-# time-stamp-end: "$"
213+# time-stamp-time-zone: "UTC"
214+# time-stamp-end: "; # UTC"
367215 # End:
--- a/mkinstalldirs
+++ b/mkinstalldirs
@@ -1,7 +1,7 @@
11 #! /bin/sh
22 # mkinstalldirs --- make directory hierarchy
33
4-scriptversion=2006-05-11.19
4+scriptversion=2009-04-28.21; # UTC
55
66 # Original author: Noah Friedman <friedman@prep.ai.mit.edu>
77 # Created: 1993-05-16
@@ -81,9 +81,9 @@ case $dirmode in
8181 echo "mkdir -p -- $*"
8282 exec mkdir -p -- "$@"
8383 else
84- # On NextStep and OpenStep, the `mkdir' command does not
84+ # On NextStep and OpenStep, the 'mkdir' command does not
8585 # recognize any option. It will interpret all options as
86- # directories to create, and then abort because `.' already
86+ # directories to create, and then abort because '.' already
8787 # exists.
8888 test -d ./-p && rmdir ./-p
8989 test -d ./--version && rmdir ./--version
@@ -157,5 +157,6 @@ exit $errstatus
157157 # eval: (add-hook 'write-file-hooks 'time-stamp)
158158 # time-stamp-start: "scriptversion="
159159 # time-stamp-format: "%:y-%02m-%02d.%02H"
160-# time-stamp-end: "$"
160+# time-stamp-time-zone: "UTC"
161+# time-stamp-end: "; # UTC"
161162 # End:
Show on old repository browser