OpenWrt

Subversion Repositories:

/branches/18.06.1/scripts/bundle-libraries.sh
@@ -113,18 +113,6 @@
fi
}

_patch_glibc() {
_cp "$1" "$1.patched"
sed -i -e 's,/usr/$\(lib\\|share$/locale\),/###/\1,g' "$1.patched"

if "$1.patched" 2>&1 \| grep -q -- GNU; then
_mv "$1.patched" "$1"
else
echo "binary patched ${1##*/} not executable, using original" >&2
rm -f "$1.patched"
fi
}

for LDD in ${PATH//://ldd }/ldd; do
"$LDD" --version >/dev/null 2>/dev/null && break
LDD=""
@@ -153,20 +141,17 @@
[ -n "$LDD" ] && [ -x "$BIN" ] && file "$BIN" \| grep -sqE "ELF.*(executable\|interpreter)" && {
for token in $("$LDD" "$BIN" 2>/dev/null); do
case "$token" in /.so*)
case "$token" in
ld-.so) LDSO="${token##/}" ;;
esac

dest="$DIR/lib/${token##*/}"
ddir="${dest%/*}"

case "$token" in
/ld-.so) LDSO="${token##/}" ;;
esac

[ -f "$token" -a ! -f "$dest" ] && {
_md "$ddir"
_cp "$token" "$dest"
case "$token" in
/ld-.so*) _patch_ldso "$dest" ;;
*/libc.so.6) _patch_glibc "$dest" ;;
esac
[ -n "$LDSO" ] && _patch_ldso "$dest"
}
;; esac
done

/branches/18.06.1/scripts/clean-package.sh
@@ -14,7 +14,7 @@
[ -f "$entry" ] && rm -f $entry
done
)
sort -r "$1" \| (
cat "$1" \| (
cd "$2"
while read entry; do
[ -n "$entry" ] \|\| break

/branches/18.06.1/scripts/config/conf.c
@@ -75,9 +75,9 @@
static void check_stdin(void)
{
if (!valid_stdin) {
printf("%s",_("aborted!\n\n"));
printf("%s",_("Console input/output is redirected. "));
printf("%s",_("Run 'make oldconfig' to update configuration.\n\n"));
printf(_("aborted!\n\n"));
printf(_("Console input/output is redirected. "));
printf(_("Run 'make oldconfig' to update configuration.\n\n"));
exit(1);
}
}
@@ -87,7 +87,7 @@
enum symbol_type type = sym_get_type(sym);

if (!sym_has_value(sym))
printf("%s",_("(NEW) "));
printf(_("(NEW) "));

line[0] = '\n';
line[1] = 0;
@@ -288,7 +288,7 @@
if (child->sym->name)
printf(" (%s)", child->sym->name);
if (!sym_has_value(child->sym))
printf("%s",_(" (NEW)"));
printf(_(" (NEW)"));
printf("\n");
}
printf(_("%*schoice"), indent - 1, "");
@@ -436,7 +436,7 @@
}
} else if (input_mode != olddefconfig) {
if (!conf_cnt++)
printf("%s",_("\n Restart config...\n*\n"));
printf(_("\n Restart config...\n*\n"));
rootEntry = menu_get_parent_menu(menu);
conf(rootEntry);
}

/branches/18.06.1/scripts/config.guess
@@ -1,8 +1,8 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright 1992-2018 Free Software Foundation, Inc.
# Copyright 1992-2015 Free Software Foundation, Inc.

timestamp='2018-08-29'
timestamp='2015-07-03'

# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <https://www.gnu.org/licenses/>.
# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -27,7 +27,7 @@
# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
#
# You can get the latest version of this script from:
# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
#
# Please send patches to <config-patches@gnu.org>.

@@ -39,7 +39,7 @@

Output the configuration name of the system \`$me' is run on.

Options:
Operation modes:
-h, --help print this help, then exit
-t, --time-stamp print date of last modification, then exit
-v, --version print version number, then exit
@@ -50,7 +50,7 @@
GNU config.guess ($timestamp)

Originally written by Per Bothner.
Copyright 1992-2018 Free Software Foundation, Inc.
Copyright 1992-2015 Free Software Foundation, Inc.

This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -84,6 +84,8 @@
exit 1
fi

trap 'exit 1' 1 2 15

# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
# compiler to aid in system detection is discouraged as it requires
# temporary files to be created and, as you can see below, it is a
@@ -94,39 +96,34 @@

# Portable tmp directory creation inspired by the Autoconf team.

tmp=
# shellcheck disable=SC2172
trap 'test -z "$tmp" \|\| rm -fr "$tmp"' 1 2 13 15
trap 'exitcode=$?; test -z "$tmp" \|\| rm -fr "$tmp"; exit $exitcode' 0
set_cc_for_build='
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
: ${TMPDIR=/tmp} ;
{ tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } \|\|
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } \|\|
{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } \|\|
{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
dummy=$tmp/dummy ;
tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
case $CC_FOR_BUILD,$HOST_CC,$CC in
,,) echo "int x;" > $dummy.c ;
for c in cc gcc c89 c99 ; do
if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
CC_FOR_BUILD="$c"; break ;
fi ;
done ;
if test x"$CC_FOR_BUILD" = x ; then
CC_FOR_BUILD=no_compiler_found ;
fi
;;
,,*) CC_FOR_BUILD=$CC ;;
,,) CC_FOR_BUILD=$HOST_CC ;;
esac ; set_cc_for_build= ;'

set_cc_for_build() {
: "${TMPDIR=/tmp}"
# shellcheck disable=SC2039
{ tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } \|\|
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } \|\|
{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } \|\|
{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }
dummy=$tmp/dummy
case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
,,) echo "int x;" > "$dummy.c"
for driver in cc gcc c89 c99 ; do
if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
CC_FOR_BUILD="$driver"
break
fi
done
if test x"$CC_FOR_BUILD" = x ; then
CC_FOR_BUILD=no_compiler_found
fi
;;
,,*) CC_FOR_BUILD=$CC ;;
,,) CC_FOR_BUILD=$HOST_CC ;;
esac
}

# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
# (ghazi@noc.rutgers.edu 1994-08-24)
if test -f /.attbin/uname ; then
if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
PATH=$PATH:/.attbin ; export PATH
fi

@@ -135,14 +132,14 @@
UNAME_SYSTEM=`(uname -s) 2>/dev/null` \|\| UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` \|\| UNAME_VERSION=unknown

case "$UNAME_SYSTEM" in
case "${UNAME_SYSTEM}" in
Linux\|GNU\|GNU/*)
# If the system lacks a compiler, then just pick glibc.
# We could probably try harder.
LIBC=gnu

set_cc_for_build
cat <<-EOF > "$dummy.c"
eval $set_cc_for_build
cat <<-EOF > $dummy.c
#include <features.h>
#if defined(__UCLIBC__)
LIBC=uclibc
@@ -152,20 +149,13 @@
LIBC=gnu
#endif
EOF
eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null \| grep '^LIBC' \| sed 's, ,,g'`"

# If ldd exists, use it to detect musl libc.
if command -v ldd >/dev/null && \
ldd --version 2>&1 \| grep -q ^musl
then
LIBC=musl
fi
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null \| grep '^LIBC' \| sed 's, ,,g'`
;;
esac

# Note: order is significant - the case branches are not exclusive.

case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
:NetBSD::*)
# NetBSD (nbsd) targets should (where applicable) match one or
# more of the tuples: --netbsdelf, --netbsdaout,
@@ -179,10 +169,10 @@
# portion of the name. We always set it to "unknown".
sysctl="sysctl -n hw.machine_arch"
UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null \|\| \
"/sbin/$sysctl" 2>/dev/null \|\| \
"/usr/sbin/$sysctl" 2>/dev/null \|\| \
/sbin/$sysctl 2>/dev/null \|\| \
/usr/sbin/$sysctl 2>/dev/null \|\| \
echo unknown)`
case "$UNAME_MACHINE_ARCH" in
case "${UNAME_MACHINE_ARCH}" in
armeb) machine=armeb-unknown ;;
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
@@ -189,20 +179,17 @@
sh3eb) machine=sh-unknown ;;
sh5el) machine=sh5le-unknown ;;
earmv*)
arch=`echo "$UNAME_MACHINE_ARCH" \| sed -e 's,^e$armv[0-9]$.*$,\1,'`
endian=`echo "$UNAME_MACHINE_ARCH" \| sed -ne 's,^.*$eb$$,\1,p'`
machine="${arch}${endian}"-unknown
arch=`echo ${UNAME_MACHINE_ARCH} \| sed -e 's,^e$armv[0-9]$.*$,\1,'`
endian=`echo ${UNAME_MACHINE_ARCH} \| sed -ne 's,^.*$eb$$,\1,p'`
machine=${arch}${endian}-unknown
;;
*) machine="$UNAME_MACHINE_ARCH"-unknown ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
# to ELF recently (or will in the future) and ABI.
case "$UNAME_MACHINE_ARCH" in
earm*)
os=netbsdelf
;;
arm\|i386\|m68k\|ns32k\|sh3\|sparc\|vax)
set_cc_for_build
# to ELF recently, or will in the future.
case "${UNAME_MACHINE_ARCH}" in
arm\|earm\|i386\|m68k\|ns32k\|sh3*\|sparc\|vax)
eval $set_cc_for_build
if echo __ELF__ \| $CC_FOR_BUILD -E - 2>/dev/null \
\| grep -q __ELF__
then
@@ -218,10 +205,10 @@
;;
esac
# Determine ABI tags.
case "$UNAME_MACHINE_ARCH" in
case "${UNAME_MACHINE_ARCH}" in
earm*)
expr='s/^earmv[0-9]/-eabi/;s/eb$//'
abi=`echo "$UNAME_MACHINE_ARCH" \| sed -e "$expr"`
abi=`echo ${UNAME_MACHINE_ARCH} \| sed -e "$expr"`
;;
esac
# The OS release
@@ -229,55 +216,39 @@
# thus, need a distinct triplet. However, they do not need
# kernel version information, so it can be replaced with a
# suitable tag, in the style of linux-gnu.
case "$UNAME_VERSION" in
case "${UNAME_VERSION}" in
Debian*)
release='-gnu'
;;
*)
release=`echo "$UNAME_RELEASE" \| sed -e 's/[-_].*//' \| cut -d. -f1,2`
release=`echo ${UNAME_RELEASE} \| sed -e 's/[-_].*//' \| cut -d. -f1,2`
;;
esac
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "$machine-${os}${release}${abi-}"
echo "${machine}-${os}${release}${abi}"
exit ;;
:Bitrig::*)
UNAME_MACHINE_ARCH=`arch \| sed 's/Bitrig.//'`
echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
exit ;;
:OpenBSD::*)
UNAME_MACHINE_ARCH=`arch \| sed 's/OpenBSD.//'`
echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
exit ;;
:LibertyBSD::*)
UNAME_MACHINE_ARCH=`arch \| sed 's/^.*BSD\.//'`
echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
exit ;;
:MidnightBSD::*)
echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
exit ;;
:ekkoBSD::*)
echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
exit ;;
:SolidBSD::*)
echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
exit ;;
macppc:MirBSD::)
echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
echo powerpc-unknown-mirbsd${UNAME_RELEASE}
exit ;;
:MirBSD::*)
echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
exit ;;
:Sortix::*)
echo "$UNAME_MACHINE"-unknown-sortix
exit ;;
:Redox::*)
echo "$UNAME_MACHINE"-unknown-redox
exit ;;
mips:OSF1:.)
echo mips-dec-osf1
exit ;;
alpha:OSF1::)
case $UNAME_RELEASE in
*4.0)
@@ -294,35 +265,35 @@
ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v \| sed -n -e 's/^ The alpha $.$ processor.$/\1/p' \| head -n 1`
case "$ALPHA_CPU_TYPE" in
"EV4 (21064)")
UNAME_MACHINE=alpha ;;
UNAME_MACHINE="alpha" ;;
"EV4.5 (21064)")
UNAME_MACHINE=alpha ;;
UNAME_MACHINE="alpha" ;;
"LCA4 (21066/21068)")
UNAME_MACHINE=alpha ;;
UNAME_MACHINE="alpha" ;;
"EV5 (21164)")
UNAME_MACHINE=alphaev5 ;;
UNAME_MACHINE="alphaev5" ;;
"EV5.6 (21164A)")
UNAME_MACHINE=alphaev56 ;;
UNAME_MACHINE="alphaev56" ;;
"EV5.6 (21164PC)")
UNAME_MACHINE=alphapca56 ;;
UNAME_MACHINE="alphapca56" ;;
"EV5.7 (21164PC)")
UNAME_MACHINE=alphapca57 ;;
UNAME_MACHINE="alphapca57" ;;
"EV6 (21264)")
UNAME_MACHINE=alphaev6 ;;
UNAME_MACHINE="alphaev6" ;;
"EV6.7 (21264A)")
UNAME_MACHINE=alphaev67 ;;
UNAME_MACHINE="alphaev67" ;;
"EV6.8CB (21264C)")
UNAME_MACHINE=alphaev68 ;;
UNAME_MACHINE="alphaev68" ;;
"EV6.8AL (21264B)")
UNAME_MACHINE=alphaev68 ;;
UNAME_MACHINE="alphaev68" ;;
"EV6.8CX (21264D)")
UNAME_MACHINE=alphaev68 ;;
UNAME_MACHINE="alphaev68" ;;
"EV6.9A (21264/EV69A)")
UNAME_MACHINE=alphaev69 ;;
UNAME_MACHINE="alphaev69" ;;
"EV7 (21364)")
UNAME_MACHINE=alphaev7 ;;
UNAME_MACHINE="alphaev7" ;;
"EV7.9 (21364A)")
UNAME_MACHINE=alphaev79 ;;
UNAME_MACHINE="alphaev79" ;;
esac
# A Pn.n version is a patched version.
# A Vn.n version is a released version.
@@ -329,19 +300,28 @@
# A Tn.n version is a released field test version.
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" \| sed -e 's/^[PVTX]//' \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} \| sed -e 's/^[PVTX]//' \| tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
exitcode=$?
trap '' 0
exit $exitcode ;;
Alpha\ :Windows_NT:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# Should we change UNAME_MACHINE based on the output of uname instead
# of the specific Alpha model?
echo alpha-pc-interix
exit ;;
21064:Windows_NT:50:3)
echo alpha-dec-winnt3.5
exit ;;
Amiga:UNIX_System_V:4.0:)
echo m68k-unknown-sysv4
exit ;;
:[Aa]miga[Oo][Ss]::*)
echo "$UNAME_MACHINE"-unknown-amigaos
echo ${UNAME_MACHINE}-unknown-amigaos
exit ;;
:[Mm]orph[Oo][Ss]::*)
echo "$UNAME_MACHINE"-unknown-morphos
echo ${UNAME_MACHINE}-unknown-morphos
exit ;;
:OS/390::*)
echo i370-ibm-openedition
@@ -353,7 +333,7 @@
echo powerpc-ibm-os400
exit ;;
arm:RISC:1.[012]:\|arm:riscix:1.[012]:*)
echo arm-acorn-riscix"$UNAME_RELEASE"
echo arm-acorn-riscix${UNAME_RELEASE}
exit ;;
arm:riscos::\|arm:RISCOS::)
echo arm-unknown-riscos
@@ -380,33 +360,38 @@
sparc) echo sparc-icl-nx7; exit ;;
esac ;;
s390x:SunOS::)
echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" \| sed -e 's/[^.]*//'`"
echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}\|sed -e 's/[^.]*//'`
exit ;;
sun4H:SunOS:5.:)
echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"\|sed -e 's/[^.]*//'`"
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}\|sed -e 's/[^.]*//'`
exit ;;
sun4:SunOS:5.:* \| tadpole:SunOS:5.:*)
echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" \| sed -e 's/[^.]*//'`"
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}\|sed -e 's/[^.]*//'`
exit ;;
i86pc:AuroraUX:5.: \| i86xen:AuroraUX:5.:)
echo i386-pc-auroraux"$UNAME_RELEASE"
echo i386-pc-auroraux${UNAME_RELEASE}
exit ;;
i86pc:SunOS:5.: \| i86xen:SunOS:5.:)
UNAME_REL="`echo "$UNAME_RELEASE" \| sed -e 's/[^.]*//'`"
case `isainfo -b` in
32)
echo i386-pc-solaris2"$UNAME_REL"
;;
64)
echo x86_64-pc-solaris2"$UNAME_REL"
;;
esac
eval $set_cc_for_build
SUN_ARCH="i386"
# If there is a compiler, see if it is configured for 64-bit objects.
# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
# This test works for both compilers.
if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') \| \
(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) \| \
grep IS_64BIT_ARCH >/dev/null
then
SUN_ARCH="x86_64"
fi
fi
echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}\|sed -e 's/[^.]*//'`
exit ;;
sun4:SunOS:6:*)
# According to config.sub, this is the proper way to canonicalize
# SunOS6. Hard to guess exactly what SunOS6 will be like, but
# it's likely to be more like Solaris than SunOS4.
echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"\|sed -e 's/[^.]*//'`"
echo sparc-sun-solaris3`echo ${UNAME_RELEASE}\|sed -e 's/[^.]*//'`
exit ;;
sun4:SunOS::*)
case "`/usr/bin/arch -k`" in
@@ -415,25 +400,25 @@
;;
esac
# Japanese Language versions have a version number like `4.1.3-JL'.
echo sparc-sun-sunos"`echo "$UNAME_RELEASE"\|sed -e 's/-/_/'`"
echo sparc-sun-sunos`echo ${UNAME_RELEASE}\|sed -e 's/-/_/'`
exit ;;
sun3:SunOS::*)
echo m68k-sun-sunos"$UNAME_RELEASE"
echo m68k-sun-sunos${UNAME_RELEASE}
exit ;;
sun::4.2BSD:*)
UNAME_RELEASE=`(sed 1q /etc/motd \| awk '{print substr($5,1,3)}') 2>/dev/null`
test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
case "`/bin/arch`" in
sun3)
echo m68k-sun-sunos"$UNAME_RELEASE"
echo m68k-sun-sunos${UNAME_RELEASE}
;;
sun4)
echo sparc-sun-sunos"$UNAME_RELEASE"
echo sparc-sun-sunos${UNAME_RELEASE}
;;
esac
exit ;;
aushp:SunOS::)
echo sparc-auspex-sunos"$UNAME_RELEASE"
echo sparc-auspex-sunos${UNAME_RELEASE}
exit ;;
# The situation for MiNT is a little confusing. The machine name
# can be virtually everything (everything which is not
@@ -444,44 +429,44 @@
# MiNT. But MiNT is downward compatible to TOS, so this should
# be no problem.
atarist[e]:MiNT::* \| atarist[e]:mint::* \| atarist[e]:TOS::*)
echo m68k-atari-mint"$UNAME_RELEASE"
echo m68k-atari-mint${UNAME_RELEASE}
exit ;;
atari:MiNT:: \| atari:mint:: \| atarist[e]:TOS::*)
echo m68k-atari-mint"$UNAME_RELEASE"
echo m68k-atari-mint${UNAME_RELEASE}
exit ;;
falcon:MiNT::* \| falcon:mint::* \| falcon:TOS::*)
echo m68k-atari-mint"$UNAME_RELEASE"
echo m68k-atari-mint${UNAME_RELEASE}
exit ;;
milan:MiNT:: \| milan:mint:: \| milan:TOS::*)
echo m68k-milan-mint"$UNAME_RELEASE"
echo m68k-milan-mint${UNAME_RELEASE}
exit ;;
hades:MiNT:: \| hades:mint:: \| hades:TOS::*)
echo m68k-hades-mint"$UNAME_RELEASE"
echo m68k-hades-mint${UNAME_RELEASE}
exit ;;
:MiNT:: \| :mint:: \| :TOS::)
echo m68k-unknown-mint"$UNAME_RELEASE"
echo m68k-unknown-mint${UNAME_RELEASE}
exit ;;
m68k:machten::)
echo m68k-apple-machten"$UNAME_RELEASE"
echo m68k-apple-machten${UNAME_RELEASE}
exit ;;
powerpc:machten::)
echo powerpc-apple-machten"$UNAME_RELEASE"
echo powerpc-apple-machten${UNAME_RELEASE}
exit ;;
RISC:Mach::*)
echo mips-dec-mach_bsd4.3
exit ;;
RISC:ULTRIX::*)
echo mips-dec-ultrix"$UNAME_RELEASE"
echo mips-dec-ultrix${UNAME_RELEASE}
exit ;;
VAX:ULTRIX::)
echo vax-dec-ultrix"$UNAME_RELEASE"
echo vax-dec-ultrix${UNAME_RELEASE}
exit ;;
2020:CLIX:: \| 2430:CLIX::)
echo clipper-intergraph-clix"$UNAME_RELEASE"
echo clipper-intergraph-clix${UNAME_RELEASE}
exit ;;
mips:::UMIPS \| mips:::RISCos)
set_cc_for_build
sed 's/^ //' << EOF > "$dummy.c"
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#ifdef __cplusplus
#include <stdio.h> /* for printf() prototype */
int main (int argc, char *argv[]) {
@@ -490,23 +475,23 @@
#endif
#if defined (host_mips) && defined (MIPSEB)
#if defined (SYSTYPE_SYSV)
printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
#endif
#if defined (SYSTYPE_SVR4)
printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
#endif
#if defined (SYSTYPE_BSD43) \|\| defined(SYSTYPE_BSD)
printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
#endif
#endif
exit (-1);
}
EOF
$CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
dummyarg=`echo "$UNAME_RELEASE" \| sed -n 's/$[0-9]$./\1/p'` &&
SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
$CC_FOR_BUILD -o $dummy $dummy.c &&
dummyarg=`echo "${UNAME_RELEASE}" \| sed -n 's/$[0-9]$./\1/p'` &&
SYSTEM_NAME=`$dummy $dummyarg` &&
{ echo "$SYSTEM_NAME"; exit; }
echo mips-mips-riscos"$UNAME_RELEASE"
echo mips-mips-riscos${UNAME_RELEASE}
exit ;;
Motorola:PowerMAX_OS::)
echo powerpc-motorola-powermax
@@ -532,17 +517,17 @@
AViiON:dgux::)
# DG/UX returns AViiON for all architectures
UNAME_PROCESSOR=`/usr/bin/uname -p`
if [ "$UNAME_PROCESSOR" = mc88100 ] \|\| [ "$UNAME_PROCESSOR" = mc88110 ]
if [ $UNAME_PROCESSOR = mc88100 ] \|\| [ $UNAME_PROCESSOR = mc88110 ]
then
if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] \|\| \
[ "$TARGET_BINARY_INTERFACE"x = x ]
if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] \|\| \
[ ${TARGET_BINARY_INTERFACE}x = x ]
then
echo m88k-dg-dgux"$UNAME_RELEASE"
echo m88k-dg-dgux${UNAME_RELEASE}
else
echo m88k-dg-dguxbcs"$UNAME_RELEASE"
echo m88k-dg-dguxbcs${UNAME_RELEASE}
fi
else
echo i586-dg-dgux"$UNAME_RELEASE"
echo i586-dg-dgux${UNAME_RELEASE}
fi
exit ;;
M88:DolphinOS::*) # DolphinOS (SVR3)
@@ -559,7 +544,7 @@
echo m68k-tektronix-bsd
exit ;;
:IRIX::)
echo mips-sgi-irix"`echo "$UNAME_RELEASE"\|sed -e 's/-/_/g'`"
echo mips-sgi-irix`echo ${UNAME_RELEASE}\|sed -e 's/-/_/g'`
exit ;;
????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
@@ -571,14 +556,14 @@
if [ -x /usr/bin/oslevel ] ; then
IBM_REV=`/usr/bin/oslevel`
else
IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
exit ;;
*:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
set_cc_for_build
sed 's/^ //' << EOF > "$dummy.c"
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#include <sys/systemcfg.h>

main()
@@ -589,7 +574,7 @@
exit(0);
}
EOF
if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
then
echo "$SYSTEM_NAME"
else
@@ -603,7 +588,7 @@
exit ;;
:AIX::[4567])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available \| sed 1q \| awk '{ print $1 }'`
if /usr/sbin/lsattr -El "$IBM_CPU_ID" \| grep ' POWER' >/dev/null 2>&1; then
if /usr/sbin/lsattr -El ${IBM_CPU_ID} \| grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
else
IBM_ARCH=powerpc
@@ -612,18 +597,18 @@
IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc \|
awk -F: '{ print $3 }' \| sed s/[0-9]*$/0/`
else
IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
echo ${IBM_ARCH}-ibm-aix${IBM_REV}
exit ;;
:AIX::*)
echo rs6000-ibm-aix
exit ;;
ibmrt:4.4BSD:\|romp-ibm:4.4BSD:)
ibmrt:4.4BSD:\|romp-ibm:BSD:)
echo romp-ibm-bsd4.4
exit ;;
ibmrt:BSD:\|romp-ibm:BSD:*) # covers RT/PC BSD and
echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to
echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
exit ;; # report: romp-ibm BSD 4.3
:BOSX::*)
echo rs6000-bull-bosx
@@ -638,28 +623,28 @@
echo m68k-hp-bsd4.4
exit ;;
9000/[34678]??:HP-UX::)
HPUX_REV=`echo "$UNAME_RELEASE"\|sed -e 's/[^.].[0B]//'`
case "$UNAME_MACHINE" in
9000/31?) HP_ARCH=m68000 ;;
9000/[34]??) HP_ARCH=m68k ;;
HPUX_REV=`echo ${UNAME_RELEASE}\|sed -e 's/[^.].[0B]//'`
case "${UNAME_MACHINE}" in
9000/31? ) HP_ARCH=m68000 ;;
9000/[34]?? ) HP_ARCH=m68k ;;
9000/[678][0-9][0-9])
if [ -x /usr/bin/getconf ]; then
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
case "$sc_cpu_version" in
523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
case "${sc_cpu_version}" in
523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
532) # CPU_PA_RISC2_0
case "$sc_kernel_bits" in
32) HP_ARCH=hppa2.0n ;;
64) HP_ARCH=hppa2.0w ;;
'') HP_ARCH=hppa2.0 ;; # HP-UX 10.20
case "${sc_kernel_bits}" in
32) HP_ARCH="hppa2.0n" ;;
64) HP_ARCH="hppa2.0w" ;;
'') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
esac ;;
esac
fi
if [ "$HP_ARCH" = "" ]; then
set_cc_for_build
sed 's/^ //' << EOF > "$dummy.c"
if [ "${HP_ARCH}" = "" ]; then
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c

#define _HPUX_SOURCE
#include <stdlib.h>
@@ -692,13 +677,13 @@
exit (0);
}
EOF
(CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
(CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
test -z "$HP_ARCH" && HP_ARCH=hppa
fi ;;
esac
if [ "$HP_ARCH" = hppa2.0w ]
if [ ${HP_ARCH} = "hppa2.0w" ]
then
set_cc_for_build
eval $set_cc_for_build

# hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
# 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
@@ -709,23 +694,23 @@
# $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
# => hppa64-hp-hpux11.23

if echo __LP64__ \| (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) \|
if echo __LP64__ \| (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) \|
grep -q __LP64__
then
HP_ARCH=hppa2.0w
HP_ARCH="hppa2.0w"
else
HP_ARCH=hppa64
HP_ARCH="hppa64"
fi
fi
echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
exit ;;
ia64:HP-UX::)
HPUX_REV=`echo "$UNAME_RELEASE"\|sed -e 's/[^.].[0B]//'`
echo ia64-hp-hpux"$HPUX_REV"
HPUX_REV=`echo ${UNAME_RELEASE}\|sed -e 's/[^.].[0B]//'`
echo ia64-hp-hpux${HPUX_REV}
exit ;;
3050:HI-UX::*)
set_cc_for_build
sed 's/^ //' << EOF > "$dummy.c"
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#include <unistd.h>
int
main ()
@@ -750,11 +735,11 @@
exit (0);
}
EOF
$CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
{ echo "$SYSTEM_NAME"; exit; }
echo unknown-hitachi-hiuxwe2
exit ;;
9000/7??:4.3bsd:: \| 9000/8?[79]:4.3bsd::)
9000/7??:4.3bsd:: \| 9000/8?[79]:4.3bsd:: )
echo hppa1.1-hp-bsd
exit ;;
9000/8??:4.3bsd::)
@@ -763,7 +748,7 @@
9??:MPE/iX:: \| 3000:MPE/iX::)
echo hppa1.0-hp-mpeix
exit ;;
hp7??:OSF1:: \| hp8?[79]:OSF1::)
hp7??:OSF1:: \| hp8?[79]:OSF1:: )
echo hppa1.1-hp-osf
exit ;;
hp8??:OSF1::)
@@ -771,9 +756,9 @@
exit ;;
i86:OSF1::*)
if [ -x /usr/sbin/sysversion ] ; then
echo "$UNAME_MACHINE"-unknown-osf1mk
echo ${UNAME_MACHINE}-unknown-osf1mk
else
echo "$UNAME_MACHINE"-unknown-osf1
echo ${UNAME_MACHINE}-unknown-osf1
fi
exit ;;
parisc:Lites::)
@@ -798,120 +783,127 @@
echo c4-convex-bsd
exit ;;
CRAYY-MP:::)
echo ymp-cray-unicos"$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'
echo ymp-cray-unicos${UNAME_RELEASE} \| sed -e 's/\.[^.]*$/.X/'
exit ;;
CRAY[A-Z]90:::)
echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
\| sed -e 's/CRAY.*$[A-Z]90$/\1/' \
-e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-e 's/\.[^.]*$/.X/'
exit ;;
CRAYTS:::)
echo t90-cray-unicos"$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'
echo t90-cray-unicos${UNAME_RELEASE} \| sed -e 's/\.[^.]*$/.X/'
exit ;;
CRAYT3E:::)
echo alphaev5-cray-unicosmk"$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'
echo alphaev5-cray-unicosmk${UNAME_RELEASE} \| sed -e 's/\.[^.]*$/.X/'
exit ;;
CRAYSV1:::)
echo sv1-cray-unicos"$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'
echo sv1-cray-unicos${UNAME_RELEASE} \| sed -e 's/\.[^.]*$/.X/'
exit ;;
:UNICOS/mp::*)
echo craynv-cray-unicosmp"$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'
echo craynv-cray-unicosmp${UNAME_RELEASE} \| sed -e 's/\.[^.]*$/.X/'
exit ;;
F30[01]:UNIX_System_V:: \| F700:UNIX_System_V::)
FUJITSU_PROC=`uname -m \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
FUJITSU_SYS=`uname -p \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz \| sed -e 's/\///'`
FUJITSU_REL=`echo "$UNAME_RELEASE" \| sed -e 's/ /_/'`
FUJITSU_PROC=`uname -m \| tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
FUJITSU_SYS=`uname -p \| tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' \| sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} \| sed -e 's/ /_/'`
echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit ;;
5000:UNIX_System_V:4.:)
FUJITSU_SYS=`uname -p \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz \| sed -e 's/\///'`
FUJITSU_REL=`echo "$UNAME_RELEASE" \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz \| sed -e 's/ /_/'`
FUJITSU_SYS=`uname -p \| tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' \| sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} \| tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' \| sed -e 's/ /_/'`
echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit ;;
i86:BSD/386::* \| i86:BSD/OS::* \| :Ascend\ Embedded/OS::*)
echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
exit ;;
sparc:BSD/OS::*)
echo sparc-unknown-bsdi"$UNAME_RELEASE"
echo sparc-unknown-bsdi${UNAME_RELEASE}
exit ;;
:BSD/OS::*)
echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit ;;
arm:FreeBSD::)
UNAME_PROCESSOR=`uname -p`
set_cc_for_build
if echo __ARM_PCS_VFP \| $CC_FOR_BUILD -E - 2>/dev/null \
\| grep -q __ARM_PCS_VFP
then
echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}\|sed -e 's/[-(].*//'`"-gnueabi
else
echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}\|sed -e 's/[-(].*//'`"-gnueabihf
fi
exit ;;
:FreeBSD::*)
UNAME_PROCESSOR=`/usr/bin/uname -p`
case "$UNAME_PROCESSOR" in
case ${UNAME_PROCESSOR} in
amd64)
UNAME_PROCESSOR=x86_64 ;;
i386)
UNAME_PROCESSOR=i586 ;;
echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}\|sed -e 's/[-(].*//'` ;;
*)
echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}\|sed -e 's/[-(].*//'` ;;
esac
echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"\|sed -e 's/[-(].*//'`"
exit ;;
i:CYGWIN:*)
echo "$UNAME_MACHINE"-pc-cygwin
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
:MINGW64:*)
echo "$UNAME_MACHINE"-pc-mingw64
echo ${UNAME_MACHINE}-pc-mingw64
exit ;;
:MINGW:*)
echo "$UNAME_MACHINE"-pc-mingw32
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
:MSYS:*)
echo "$UNAME_MACHINE"-pc-msys
echo ${UNAME_MACHINE}-pc-msys
exit ;;
i:windows32:*)
# uname -m includes "-pc" on this system.
echo ${UNAME_MACHINE}-mingw32
exit ;;
i:PW:*)
echo "$UNAME_MACHINE"-pc-pw32
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
:Interix:*)
case "$UNAME_MACHINE" in
case ${UNAME_MACHINE} in
x86)
echo i586-pc-interix"$UNAME_RELEASE"
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
authenticamd \| genuineintel \| EM64T)
echo x86_64-unknown-interix"$UNAME_RELEASE"
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
IA64)
echo ia64-unknown-interix"$UNAME_RELEASE"
echo ia64-unknown-interix${UNAME_RELEASE}
exit ;;
esac ;;
[345]86:Windows_95:* \| [345]86:Windows_98:* \| [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
8664:Windows_NT:*)
echo x86_64-pc-mks
exit ;;
i:Windows_NT:* \| Pentium:Windows_NT:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
# UNAME_MACHINE based on the output of uname instead of i386?
echo i586-pc-interix
exit ;;
i:UWIN:*)
echo "$UNAME_MACHINE"-pc-uwin
echo ${UNAME_MACHINE}-pc-uwin
exit ;;
amd64:CYGWIN::* \| x86_64:CYGWIN::*)
echo x86_64-pc-cygwin
echo x86_64-unknown-cygwin
exit ;;
p:CYGWIN:*)
echo powerpcle-unknown-cygwin
exit ;;
prep:SunOS:5.:*)
echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"\|sed -e 's/[^.]*//'`"
echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}\|sed -e 's/[^.]*//'`
exit ;;
:GNU::*)
# the GNU system
echo "`echo "$UNAME_MACHINE"\|sed -e 's,[-/].$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"\|sed -e 's,/.$,,'`"
echo `echo ${UNAME_MACHINE}\|sed -e 's,[-/].$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}\|sed -e 's,/.$,,'`
exit ;;
:GNU/::)
# other systems with GNU libc and userland
echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" \| sed 's,^[^/]/,,' \| tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"\|sed -e 's/[-(].//'`-$LIBC"
echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} \| sed 's,^[^/]/,,' \| tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}\|sed -e 's/[-(].//'`-${LIBC}
exit ;;
:Minix::*)
echo "$UNAME_MACHINE"-unknown-minix
i86:Minix::*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
aarch64:Linux::)
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
aarch64_be:Linux::)
UNAME_MACHINE=aarch64_be
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
alpha:Linux::)
case `sed -n '/^cpu model/s/^.: $.$/\1/p' < /proc/cpuinfo` in
@@ -924,64 +916,61 @@
EV68*) UNAME_MACHINE=alphaev68 ;;
esac
objdump --private-headers /bin/sh \| grep -q ld.so.1
if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
arc:Linux:: \| arceb:Linux::)
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
arm:Linux::*)
set_cc_for_build
eval $set_cc_for_build
if echo __ARM_EABI__ \| $CC_FOR_BUILD -E - 2>/dev/null \
\| grep -q __ARM_EABI__
then
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
else
if echo __ARM_PCS_VFP \| $CC_FOR_BUILD -E - 2>/dev/null \
\| grep -q __ARM_PCS_VFP
then
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
else
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
fi
fi
exit ;;
avr32:Linux::*)
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
cris:Linux::)
echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
echo ${UNAME_MACHINE}-axis-linux-${LIBC}
exit ;;
crisv32:Linux::)
echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
echo ${UNAME_MACHINE}-axis-linux-${LIBC}
exit ;;
e2k:Linux::)
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
frv:Linux::)
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
hexagon:Linux::)
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
i86:Linux::*)
echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
echo ${UNAME_MACHINE}-pc-linux-${LIBC}
exit ;;
ia64:Linux::)
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
k1om:Linux::)
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
m32r:Linux::*)
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
m68:Linux::*)
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
mips:Linux:: \| mips64:Linux::)
set_cc_for_build
sed 's/^ //' << EOF > "$dummy.c"
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#undef CPU
#undef ${UNAME_MACHINE}
#undef ${UNAME_MACHINE}el
@@ -995,70 +984,64 @@
#endif
#endif
EOF
eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null \| grep '^CPU'`"
test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null \| grep '^CPU'`
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
;;
mips64el:Linux::)
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
openrisc:Linux::*)
echo or1k-unknown-linux-"$LIBC"
echo or1k-unknown-linux-${LIBC}
exit ;;
or32:Linux:: \| or1k:Linux::*)
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
padre:Linux::)
echo sparc-unknown-linux-"$LIBC"
echo sparc-unknown-linux-${LIBC}
exit ;;
parisc64:Linux:: \| hppa64:Linux::)
echo hppa64-unknown-linux-"$LIBC"
echo hppa64-unknown-linux-${LIBC}
exit ;;
parisc:Linux:: \| hppa:Linux::)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null \| cut -d' ' -f2` in
PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
*) echo hppa-unknown-linux-"$LIBC" ;;
PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
*) echo hppa-unknown-linux-${LIBC} ;;
esac
exit ;;
ppc64:Linux::)
echo powerpc64-unknown-linux-"$LIBC"
echo powerpc64-unknown-linux-${LIBC}
exit ;;
ppc:Linux::)
echo powerpc-unknown-linux-"$LIBC"
echo powerpc-unknown-linux-${LIBC}
exit ;;
ppc64le:Linux::)
echo powerpc64le-unknown-linux-"$LIBC"
echo powerpc64le-unknown-linux-${LIBC}
exit ;;
ppcle:Linux::)
echo powerpcle-unknown-linux-"$LIBC"
echo powerpcle-unknown-linux-${LIBC}
exit ;;
riscv32:Linux:: \| riscv64:Linux::)
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
s390:Linux:: \| s390x:Linux::)
echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
exit ;;
sh64:Linux::*)
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
sh:Linux::*)
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
sparc:Linux:: \| sparc64:Linux::)
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
tile:Linux::*)
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
vax:Linux::)
echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
echo ${UNAME_MACHINE}-dec-linux-${LIBC}
exit ;;
x86_64:Linux::)
echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
echo ${UNAME_MACHINE}-pc-linux-${LIBC}
exit ;;
xtensa:Linux::*)
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
i86:DYNIX/ptx:4:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1072,34 +1055,34 @@
# I am not positive that other SVR4 systems won't match this,
# I just have to hope. -- rms.
# Use sysv4.2uw... so that sysv4* matches it.
echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
exit ;;
i86:OS/2::*)
# If we were able to find `uname', then EMX Unix compatibility
# is probably installed.
echo "$UNAME_MACHINE"-pc-os2-emx
echo ${UNAME_MACHINE}-pc-os2-emx
exit ;;
i86:XTS-300::STOP)
echo "$UNAME_MACHINE"-unknown-stop
echo ${UNAME_MACHINE}-unknown-stop
exit ;;
i86:atheos::*)
echo "$UNAME_MACHINE"-unknown-atheos
echo ${UNAME_MACHINE}-unknown-atheos
exit ;;
i86:syllable::*)
echo "$UNAME_MACHINE"-pc-syllable
echo ${UNAME_MACHINE}-pc-syllable
exit ;;
i86:LynxOS:2.:* \| i86:LynxOS:3.[01]:* \| i86:LynxOS:4.[02]:*)
echo i386-unknown-lynxos"$UNAME_RELEASE"
echo i386-unknown-lynxos${UNAME_RELEASE}
exit ;;
i86:DOS::)
echo "$UNAME_MACHINE"-pc-msdosdjgpp
echo ${UNAME_MACHINE}-pc-msdosdjgpp
exit ;;
i86::4.:)
UNAME_REL=`echo "$UNAME_RELEASE" \| sed 's/\/MP$//'`
i86::4.: \| i86:SYSTEM_V:4.:*)
UNAME_REL=`echo ${UNAME_RELEASE} \| sed 's/\/MP$//'`
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
else
echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
fi
exit ;;
i86::5:[678]*)
@@ -1109,12 +1092,12 @@
*Pentium) UNAME_MACHINE=i586 ;;
Pent\|*Celeron) UNAME_MACHINE=i686 ;;
esac
echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
exit ;;
i86::3.2:*)
if test -f /usr/options/cb.name; then
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
elif /bin/uname -X 2>/dev/null >/dev/null ; then
UNAME_REL=`(/bin/uname -X\|grep Release\|sed -e 's/.*= //')`
(/bin/uname -X\|grep i80486 >/dev/null) && UNAME_MACHINE=i486
@@ -1124,9 +1107,9 @@
&& UNAME_MACHINE=i686
(/bin/uname -X\|grep '^Machine.*Pentium Pro' >/dev/null) \
&& UNAME_MACHINE=i686
echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
else
echo "$UNAME_MACHINE"-pc-sysv32
echo ${UNAME_MACHINE}-pc-sysv32
fi
exit ;;
pc:::*)
@@ -1134,7 +1117,7 @@
# uname -m prints for DJGPP always 'pc', but it prints nothing about
# the processor, so we play safe by assuming i586.
# Note: whatever this is, it MUST be the same as what config.sub
# prints for the "djgpp" host, or else GDB configure will decide that
# prints for the "djgpp" host, or else GDB configury will decide that
# this is a cross-build.
echo i586-pc-msdosdjgpp
exit ;;
@@ -1146,9 +1129,9 @@
exit ;;
i860::4.:*) # i860-SVR4
if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
else # Add other i860-SVR4 vendors below as they are discovered.
echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4
echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
fi
exit ;;
mini:CTIX:SYS5:*)
@@ -1168,9 +1151,9 @@
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`
/bin/uname -p 2>/dev/null \| grep 86 >/dev/null \
&& { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
&& { echo i486-ncr-sysv4.3${OS_REL}; exit; }
/bin/uname -p 2>/dev/null \| /bin/grep entium >/dev/null \
&& { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
&& { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
3[34]??::4.0: \| 3[34]??,::4.0:*)
/bin/uname -p 2>/dev/null \| grep 86 >/dev/null \
&& { echo i486-ncr-sysv4; exit; } ;;
@@ -1179,28 +1162,28 @@
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`
/bin/uname -p 2>/dev/null \| grep 86 >/dev/null \
&& { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
&& { echo i486-ncr-sysv4.3${OS_REL}; exit; }
/bin/uname -p 2>/dev/null \| /bin/grep entium >/dev/null \
&& { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
&& { echo i586-ncr-sysv4.3${OS_REL}; exit; }
/bin/uname -p 2>/dev/null \| /bin/grep pteron >/dev/null \
&& { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
&& { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
m68:LynxOS:2.:* \| m68:LynxOS:3.0:*)
echo m68k-unknown-lynxos"$UNAME_RELEASE"
echo m68k-unknown-lynxos${UNAME_RELEASE}
exit ;;
mc68030:UNIX_System_V:4.:)
echo m68k-atari-sysv4
exit ;;
TSUNAMI:LynxOS:2.:)
echo sparc-unknown-lynxos"$UNAME_RELEASE"
echo sparc-unknown-lynxos${UNAME_RELEASE}
exit ;;
rs6000:LynxOS:2.:)
echo rs6000-unknown-lynxos"$UNAME_RELEASE"
echo rs6000-unknown-lynxos${UNAME_RELEASE}
exit ;;
PowerPC:LynxOS:2.: \| PowerPC:LynxOS:3.[01]: \| PowerPC:LynxOS:4.[02]:)
echo powerpc-unknown-lynxos"$UNAME_RELEASE"
echo powerpc-unknown-lynxos${UNAME_RELEASE}
exit ;;
SM[BE]S:UNIX_SV::)
echo mips-dde-sysv"$UNAME_RELEASE"
echo mips-dde-sysv${UNAME_RELEASE}
exit ;;
RM:ReliantUNIX-::)
echo mips-sni-sysv4
@@ -1211,7 +1194,7 @@
:SINIX-::)
if uname -p 2>/dev/null >/dev/null ; then
UNAME_MACHINE=`(uname -p) 2>/dev/null`
echo "$UNAME_MACHINE"-sni-sysv4
echo ${UNAME_MACHINE}-sni-sysv4
else
echo ns32k-sni-sysv
fi
@@ -1231,7 +1214,7 @@
exit ;;
i86:VOS::*)
# From Paul.Green@stratus.com.
echo "$UNAME_MACHINE"-stratus-vos
echo ${UNAME_MACHINE}-stratus-vos
exit ;;
:VOS::*)
# From Paul.Green@stratus.com.
@@ -1238,7 +1221,7 @@
echo hppa1.1-stratus-vos
exit ;;
mc68:A/UX::*)
echo m68k-apple-aux"$UNAME_RELEASE"
echo m68k-apple-aux${UNAME_RELEASE}
exit ;;
news:NEWS-OS:6:*)
echo mips-sony-newsos6
@@ -1245,9 +1228,9 @@
exit ;;
R[34]000:System_V:: \| R4000:UNIX_SYSV:: \| R000:UNIX_SV::*)
if [ -d /usr/nec ]; then
echo mips-nec-sysv"$UNAME_RELEASE"
echo mips-nec-sysv${UNAME_RELEASE}
else
echo mips-unknown-sysv"$UNAME_RELEASE"
echo mips-unknown-sysv${UNAME_RELEASE}
fi
exit ;;
BeBox:BeOS::) # BeOS running on hardware made by Be, PPC only.
@@ -1266,43 +1249,40 @@
echo x86_64-unknown-haiku
exit ;;
SX-4:SUPER-UX::)
echo sx4-nec-superux"$UNAME_RELEASE"
echo sx4-nec-superux${UNAME_RELEASE}
exit ;;
SX-5:SUPER-UX::)
echo sx5-nec-superux"$UNAME_RELEASE"
echo sx5-nec-superux${UNAME_RELEASE}
exit ;;
SX-6:SUPER-UX::)
echo sx6-nec-superux"$UNAME_RELEASE"
echo sx6-nec-superux${UNAME_RELEASE}
exit ;;
SX-7:SUPER-UX::)
echo sx7-nec-superux"$UNAME_RELEASE"
echo sx7-nec-superux${UNAME_RELEASE}
exit ;;
SX-8:SUPER-UX::)
echo sx8-nec-superux"$UNAME_RELEASE"
echo sx8-nec-superux${UNAME_RELEASE}
exit ;;
SX-8R:SUPER-UX::)
echo sx8r-nec-superux"$UNAME_RELEASE"
echo sx8r-nec-superux${UNAME_RELEASE}
exit ;;
SX-ACE:SUPER-UX::)
echo sxace-nec-superux"$UNAME_RELEASE"
exit ;;
Power:Rhapsody::*)
echo powerpc-apple-rhapsody"$UNAME_RELEASE"
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit ;;
:Rhapsody::*)
echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
exit ;;
:Darwin::*)
UNAME_PROCESSOR=`uname -p` \|\| UNAME_PROCESSOR=unknown
set_cc_for_build
eval $set_cc_for_build
if test "$UNAME_PROCESSOR" = unknown ; then
UNAME_PROCESSOR=powerpc
fi
if test "`echo "$UNAME_RELEASE" \| sed -e 's/\..*//'`" -le 10 ; then
if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
if test `echo "$UNAME_RELEASE" \| sed -e 's/\..*//'` -le 10 ; then
if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') \| \
(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) \| \
grep IS_64BIT_ARCH >/dev/null
(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) \| \
grep IS_64BIT_ARCH >/dev/null
then
case $UNAME_PROCESSOR in
i386) UNAME_PROCESSOR=x86_64 ;;
@@ -1309,13 +1289,6 @@
powerpc) UNAME_PROCESSOR=powerpc64 ;;
esac
fi
# On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') \| \
(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) \| \
grep IS_PPC >/dev/null
then
UNAME_PROCESSOR=powerpc
fi
fi
elif test "$UNAME_PROCESSOR" = i386 ; then
# Avoid executing cc on OS X 10.9, as it ships with a stub
@@ -1326,34 +1299,28 @@
# that Apple uses in portable devices.
UNAME_PROCESSOR=x86_64
fi
echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit ;;
:procnto:: \| :QNX:[0123456789]:*)
UNAME_PROCESSOR=`uname -p`
if test "$UNAME_PROCESSOR" = x86; then
if test "$UNAME_PROCESSOR" = "x86"; then
UNAME_PROCESSOR=i386
UNAME_MACHINE=pc
fi
echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
exit ;;
:QNX::4*)
echo i386-pc-qnx
exit ;;
NEO-:NONSTOP_KERNEL::*)
echo neo-tandem-nsk"$UNAME_RELEASE"
NEO-?:NONSTOP_KERNEL::)
echo neo-tandem-nsk${UNAME_RELEASE}
exit ;;
NSE-:NONSTOP_KERNEL::*)
echo nse-tandem-nsk"$UNAME_RELEASE"
echo nse-tandem-nsk${UNAME_RELEASE}
exit ;;
NSR-:NONSTOP_KERNEL::*)
echo nsr-tandem-nsk"$UNAME_RELEASE"
NSR-?:NONSTOP_KERNEL::)
echo nsr-tandem-nsk${UNAME_RELEASE}
exit ;;
NSV-:NONSTOP_KERNEL::*)
echo nsv-tandem-nsk"$UNAME_RELEASE"
exit ;;
NSX-:NONSTOP_KERNEL::*)
echo nsx-tandem-nsk"$UNAME_RELEASE"
exit ;;
:NonStop-UX::*)
echo mips-compaq-nonstopux
exit ;;
@@ -1361,19 +1328,18 @@
echo bs2000-siemens-sysv
exit ;;
DS/:UNIX_System_V::*)
echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
exit ;;
:Plan9::*)
# "uname -m" is not consistent, so use $cputype instead. 386
# is converted to i386 for consistency with other x86
# operating systems.
# shellcheck disable=SC2154
if test "$cputype" = 386; then
if test "$cputype" = "386"; then
UNAME_MACHINE=i386
else
UNAME_MACHINE="$cputype"
fi
echo "$UNAME_MACHINE"-unknown-plan9
echo ${UNAME_MACHINE}-unknown-plan9
exit ;;
:TOPS-10::*)
echo pdp10-unknown-tops10
@@ -1394,14 +1360,14 @@
echo pdp10-unknown-its
exit ;;
SEI:::SEIUX)
echo mips-sei-seiux"$UNAME_RELEASE"
echo mips-sei-seiux${UNAME_RELEASE}
exit ;;
:DragonFly::*)
echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"\|sed -e 's/[-(].*//'`"
echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}\|sed -e 's/[-(].*//'`
exit ;;
:VMS::)
UNAME_MACHINE=`(uname -p) 2>/dev/null`
case "$UNAME_MACHINE" in
case "${UNAME_MACHINE}" in
A*) echo alpha-dec-vms ; exit ;;
I*) echo ia64-dec-vms ; exit ;;
V*) echo vax-dec-vms ; exit ;;
@@ -1410,48 +1376,34 @@
echo i386-pc-xenix
exit ;;
i86:skyos::*)
echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" \| sed -e 's/ .*$//'`"
echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` \| sed -e 's/ .*$//'
exit ;;
i86:rdos::*)
echo "$UNAME_MACHINE"-pc-rdos
echo ${UNAME_MACHINE}-pc-rdos
exit ;;
i86:AROS::*)
echo "$UNAME_MACHINE"-pc-aros
echo ${UNAME_MACHINE}-pc-aros
exit ;;
x86_64:VMkernel::)
echo "$UNAME_MACHINE"-unknown-esx
echo ${UNAME_MACHINE}-unknown-esx
exit ;;
amd64:Isilon\ OneFS::)
echo x86_64-unknown-onefs
exit ;;
esac

echo "$0: unable to guess system type" >&2

case "$UNAME_MACHINE:$UNAME_SYSTEM" in
mips:Linux \| mips64:Linux)
# If we got here on MIPS GNU/Linux, output extra information.
cat >&2 <<EOF

NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
the system type. Please install a C compiler and try again.
EOF
;;
esac

cat >&2 <<EOF
$0: unable to guess system type

This script (version $timestamp), has failed to recognize the
operating system you are using. If your script is old, overwrite all
copies of config.guess and config.sub with the latest versions from:
This script, last modified $timestamp, has failed to recognize
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from

https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
and
https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD

If $0 has already been updated, send the following data and any
information you think might be pertinent to config-patches@gnu.org to
provide the necessary information to handle your system.
If the version you run ($0) is already up to date, please
send the following data and any information you think might be
pertinent to <config-patches@gnu.org> in order to provide the needed
information to handle your system.

config.guess timestamp = $timestamp

@@ -1470,16 +1422,16 @@
/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`

UNAME_MACHINE = "$UNAME_MACHINE"
UNAME_RELEASE = "$UNAME_RELEASE"
UNAME_SYSTEM = "$UNAME_SYSTEM"
UNAME_VERSION = "$UNAME_VERSION"
UNAME_MACHINE = ${UNAME_MACHINE}
UNAME_RELEASE = ${UNAME_RELEASE}
UNAME_SYSTEM = ${UNAME_SYSTEM}
UNAME_VERSION = ${UNAME_VERSION}
EOF

exit 1

# Local variables:
# eval: (add-hook 'before-save-hook 'time-stamp)
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"

 /branches/18.06.1/scripts/config.sub
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2018 Free Software Foundation, Inc.
+#   Copyright 1992-2015 Free Software Foundation, Inc.
-timestamp='2018-08-29'
+timestamp='2015-07-28'
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see <https://www.gnu.org/licenses/>.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -33,7 +33,7 @@
 # Otherwise, we print the canonical config type on stdout and succeed.
 # You can get the latest version of this script from:
-# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
@@ -53,11 +53,12 @@
 me=`echo "$0" | sed -e 's,.*/,,'`
 usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
 Canonicalize a configuration name.
-Options:
+Operation modes:
   -h, --help         print this help, then exit
   -t, --time-stamp   print date of last modification, then exit
   -v, --version      print version number, then exit
@@ -67,7 +68,7 @@
 version="\
 GNU config.sub ($timestamp)
-Copyright 1992-2018 Free Software Foundation, Inc.
+Copyright 1992-2015 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -89,12 +90,12 @@
     - ) # Use stdin as input.
        break ;;
     -* )
-       echo "$me: invalid option $1$help" >&2
+       echo "$me: invalid option $1$help"
        exit 1 ;;
     *local*)
        # First pass through any local machine types.
-       echo "$1"
+       echo $1
        exit ;;
     * )
@@ -110,1159 +111,1234 @@
     exit 1;;
 esac
-# Split fields of configuration type
-IFS="-" read -r field1 field2 field3 field4 <<EOF
-$1
-EOF
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
+  kopensolaris*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
-# Separate into logical components for further validation
-case $1 in
-        *-*-*-*-*)
-                echo Invalid configuration \`"$1"\': more than four components >&2
-                exit 1
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+        -sun*os*)
+                # Prevent following clause from handling this invalid input.
                 ;;
-        *-*-*-*)
-                basic_machine=$field1-$field2
-                os=$field3-$field4
+        -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+        -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+        -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+        -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+        -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+        -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+        -apple | -axis | -knuth | -cray | -microblaze*)
+                os=
+                basic_machine=$1
                 ;;
-        *-*-*)
-                # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
-                # parts
-                maybe_os=$field2-$field3
-                case $maybe_os in
-                        nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \
-                        | linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \
-                        | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
-                        | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
-                        | storm-chaos* | os2-emx* | rtmk-nova*)
-                                basic_machine=$field1
-                                os=$maybe_os
-                                ;;
-                        android-linux)
-                                basic_machine=$field1-unknown
-                                os=linux-android
-                                ;;
-                        *)
-                                basic_machine=$field1-$field2
-                                os=$field3
-                                ;;
-                esac
+        -bluegene*)
+                os=-cnk
                 ;;
-        *-*)
-                # A lone config we happen to match not fitting any pattern
-                case $field1-$field2 in
-                        decstation-3100)
-                                basic_machine=mips-dec
-                                os=
-                                ;;
-                        *-*)
-                                # Second component is usually, but not always the OS
-                                case $field2 in
-                                        # Prevent following clause from handling this valid os
-                                        sun*os*)
-                                                basic_machine=$field1
-                                                os=$field2
-                                                ;;
-                                        # Manufacturers
-                                        dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \
-                                        | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \
-                                        | unicom* | ibm* | next | hp | isi* | apollo | altos* \
-                                        | convergent* | ncr* | news | 32* | 3600* | 3100* \
-                                        | hitachi* | c[123]* | convex* | sun | crds | omron* | dg \
-                                        | ultra | tti* | harris | dolphin | highlevel | gould \
-                                        | cbm | ns | masscomp | apple | axis | knuth | cray \
-                                        | microblaze* | sim | cisco \
-                                        | oki | wec | wrs | winbond)
-                                                basic_machine=$field1-$field2
-                                                os=
-                                                ;;
-                                        *)
-                                                basic_machine=$field1
-                                                os=$field2
-                                                ;;
-                                esac
-                        ;;
-                esac
+        -sim | -cisco | -oki | -wec | -winbond)
+                os=
+                basic_machine=$1
                 ;;
-        *)
-                # Convert single-component short-hands not valid as part of
-                # multi-component configurations.
-                case $field1 in
-bsd)
-                                basic_machine=i386-pc
-                                os=bsd
-                                ;;
-                        a29khif)
-                                basic_machine=a29k-amd
-                                os=udi
-                                ;;
-                        adobe68k)
-                                basic_machine=m68010-adobe
-                                os=scout
-                                ;;
-                        alliant)
-                                basic_machine=fx80-alliant
-                                os=
-                                ;;
-                        altos | altos3068)
-                                basic_machine=m68k-altos
-                                os=
-                                ;;
-                        am29k)
-                                basic_machine=a29k-none
-                                os=bsd
-                                ;;
-                        amdahl)
-                                basic_machine=580-amdahl
-                                os=sysv
-                                ;;
-                        amiga)
-                                basic_machine=m68k-unknown
-                                os=
-                                ;;
-                        amigaos | amigados)
-                                basic_machine=m68k-unknown
-                                os=amigaos
-                                ;;
-                        amigaunix | amix)
-                                basic_machine=m68k-unknown
-                                os=sysv4
-                                ;;
-                        apollo68)
-                                basic_machine=m68k-apollo
-                                os=sysv
-                                ;;
-                        apollo68bsd)
-                                basic_machine=m68k-apollo
-                                os=bsd
-                                ;;
-                        aros)
-                                basic_machine=i386-pc
-                                os=aros
-                                ;;
-                        aux)
-                                basic_machine=m68k-apple
-                                os=aux
-                                ;;
-                        balance)
-                                basic_machine=ns32k-sequent
-                                os=dynix
-                                ;;
-                        blackfin)
-                                basic_machine=bfin-unknown
-                                os=linux
-                                ;;
-                        cegcc)
-                                basic_machine=arm-unknown
-                                os=cegcc
-                                ;;
-                        convex-c1)
-                                basic_machine=c1-convex
-                                os=bsd
-                                ;;
-                        convex-c2)
-                                basic_machine=c2-convex
-                                os=bsd
-                                ;;
-                        convex-c32)
-                                basic_machine=c32-convex
-                                os=bsd
-                                ;;
-                        convex-c34)
-                                basic_machine=c34-convex
-                                os=bsd
-                                ;;
-                        convex-c38)
-                                basic_machine=c38-convex
-                                os=bsd
-                                ;;
-                        cray)
-                                basic_machine=j90-cray
-                                os=unicos
-                                ;;
-                        crds | unos)
-                                basic_machine=m68k-crds
-                                os=
-                                ;;
-                        da30)
-                                basic_machine=m68k-da30
-                                os=
-                                ;;
-                        decstation | pmax | pmin | dec3100 | decstatn)
-                                basic_machine=mips-dec
-                                os=
-                                ;;
-                        delta88)
-                                basic_machine=m88k-motorola
-                                os=sysv3
-                                ;;
-                        dicos)
-                                basic_machine=i686-pc
-                                os=dicos
-                                ;;
-                        djgpp)
-                                basic_machine=i586-pc
-                                os=msdosdjgpp
-                                ;;
-                        ebmon29k)
-                                basic_machine=a29k-amd
-                                os=ebmon
-                                ;;
-                        es1800 | OSE68k | ose68k | ose | OSE)
-                                basic_machine=m68k-ericsson
-                                os=ose
-                                ;;
-                        gmicro)
-                                basic_machine=tron-gmicro
-                                os=sysv
-                                ;;
-                        go32)
-                                basic_machine=i386-pc
-                                os=go32
-                                ;;
-                        h8300hms)
-                                basic_machine=h8300-hitachi
-                                os=hms
-                                ;;
-                        h8300xray)
-                                basic_machine=h8300-hitachi
-                                os=xray
-                                ;;
-                        h8500hms)
-                                basic_machine=h8500-hitachi
-                                os=hms
-                                ;;
-                        harris)
-                                basic_machine=m88k-harris
-                                os=sysv3
-                                ;;
-                        hp300)
-                                basic_machine=m68k-hp
-                                ;;
-                        hp300bsd)
-                                basic_machine=m68k-hp
-                                os=bsd
-                                ;;
-                        hp300hpux)
-                                basic_machine=m68k-hp
-                                os=hpux
-                                ;;
-                        hppaosf)
-                                basic_machine=hppa1.1-hp
-                                os=osf
-                                ;;
-                        hppro)
-                                basic_machine=hppa1.1-hp
-                                os=proelf
-                                ;;
-                        i386mach)
-                                basic_machine=i386-mach
-                                os=mach
-                                ;;
-                        vsta)
-                                basic_machine=i386-pc
-                                os=vsta
-                                ;;
-                        isi68 | isi)
-                                basic_machine=m68k-isi
-                                os=sysv
-                                ;;
-                        m68knommu)
-                                basic_machine=m68k-unknown
-                                os=linux
-                                ;;
-                        magnum | m3230)
-                                basic_machine=mips-mips
-                                os=sysv
-                                ;;
-                        merlin)
-                                basic_machine=ns32k-utek
-                                os=sysv
-                                ;;
-                        mingw64)
-                                basic_machine=x86_64-pc
-                                os=mingw64
-                                ;;
-                        mingw32)
-                                basic_machine=i686-pc
-                                os=mingw32
-                                ;;
-                        mingw32ce)
-                                basic_machine=arm-unknown
-                                os=mingw32ce
-                                ;;
-                        monitor)
-                                basic_machine=m68k-rom68k
-                                os=coff
-                                ;;
-                        morphos)
-                                basic_machine=powerpc-unknown
-                                os=morphos
-                                ;;
-                        moxiebox)
-                                basic_machine=moxie-unknown
-                                os=moxiebox
-                                ;;
-                        msdos)
-                                basic_machine=i386-pc
-                                os=msdos
-                                ;;
-                        msys)
-                                basic_machine=i686-pc
-                                os=msys
-                                ;;
-                        mvs)
-                                basic_machine=i370-ibm
-                                os=mvs
-                                ;;
-                        nacl)
-                                basic_machine=le32-unknown
-                                os=nacl
-                                ;;
-                        ncr3000)
-                                basic_machine=i486-ncr
-                                os=sysv4
-                                ;;
-                        netbsd386)
-                                basic_machine=i386-pc
-                                os=netbsd
-                                ;;
-                        netwinder)
-                                basic_machine=armv4l-rebel
-                                os=linux
-                                ;;
-                        news | news700 | news800 | news900)
-                                basic_machine=m68k-sony
-                                os=newsos
-                                ;;
-                        news1000)
-                                basic_machine=m68030-sony
-                                os=newsos
-                                ;;
-                        necv70)
-                                basic_machine=v70-nec
-                                os=sysv
-                                ;;
-                        nh3000)
-                                basic_machine=m68k-harris
-                                os=cxux
-                                ;;
-                        nh[45]000)
-                                basic_machine=m88k-harris
-                                os=cxux
-                                ;;
-                        nindy960)
-                                basic_machine=i960-intel
-                                os=nindy
-                                ;;
-                        mon960)
-                                basic_machine=i960-intel
-                                os=mon960
-                                ;;
-                        nonstopux)
-                                basic_machine=mips-compaq
-                                os=nonstopux
-                                ;;
-                        os400)
-                                basic_machine=powerpc-ibm
-                                os=os400
-                                ;;
-                        OSE68000 | ose68000)
-                                basic_machine=m68000-ericsson
-                                os=ose
-                                ;;
-                        os68k)
-                                basic_machine=m68k-none
-                                os=os68k
-                                ;;
-                        paragon)
-                                basic_machine=i860-intel
-                                os=osf
-                                ;;
-                        parisc)
-                                basic_machine=hppa-unknown
-                                os=linux
-                                ;;
-                        pw32)
-                                basic_machine=i586-unknown
-                                os=pw32
-                                ;;
-                        rdos | rdos64)
-                                basic_machine=x86_64-pc
-                                os=rdos
-                                ;;
-                        rdos32)
-                                basic_machine=i386-pc
-                                os=rdos
-                                ;;
-                        rom68k)
-                                basic_machine=m68k-rom68k
-                                os=coff
-                                ;;
-                        sa29200)
-                                basic_machine=a29k-amd
-                                os=udi
-                                ;;
-                        sei)
-                                basic_machine=mips-sei
-                                os=seiux
-                                ;;
-                        sequent)
-                                basic_machine=i386-sequent
-                                os=
-                                ;;
-                        sps7)
-                                basic_machine=m68k-bull
-                                os=sysv2
-                                ;;
-                        st2000)
-                                basic_machine=m68k-tandem
-                                os=
-                                ;;
-                        stratus)
-                                basic_machine=i860-stratus
-                                os=sysv4
-                                ;;
-                        sun2)
-                                basic_machine=m68000-sun
-                                os=
-                                ;;
-                        sun2os3)
-                                basic_machine=m68000-sun
-                                os=sunos3
-                                ;;
-                        sun2os4)
-                                basic_machine=m68000-sun
-                                os=sunos4
-                                ;;
-                        sun3)
-                                basic_machine=m68k-sun
-                                os=
-                                ;;
-                        sun3os3)
-                                basic_machine=m68k-sun
-                                os=sunos3
-                                ;;
-                        sun3os4)
-                                basic_machine=m68k-sun
-                                os=sunos4
-                                ;;
-                        sun4)
-                                basic_machine=sparc-sun
-                                os=
-                                ;;
-                        sun4os3)
-                                basic_machine=sparc-sun
-                                os=sunos3
-                                ;;
-                        sun4os4)
-                                basic_machine=sparc-sun
-                                os=sunos4
-                                ;;
-                        sun4sol2)
-                                basic_machine=sparc-sun
-                                os=solaris2
-                                ;;
-                        sun386 | sun386i | roadrunner)
-                                basic_machine=i386-sun
-                                os=
-                                ;;
-                        sv1)
-                                basic_machine=sv1-cray
-                                os=unicos
-                                ;;
-                        symmetry)
-                                basic_machine=i386-sequent
-                                os=dynix
-                                ;;
-                        t3e)
-                                basic_machine=alphaev5-cray
-                                os=unicos
-                                ;;
-                        t90)
-                                basic_machine=t90-cray
-                                os=unicos
-                                ;;
-                        toad1)
-                                basic_machine=pdp10-xkl
-                                os=tops20
-                                ;;
-                        tpf)
-                                basic_machine=s390x-ibm
-                                os=tpf
-                                ;;
-                        udi29k)
-                                basic_machine=a29k-amd
-                                os=udi
-                                ;;
-                        ultra3)
-                                basic_machine=a29k-nyu
-                                os=sym1
-                                ;;
-                        v810 | necv810)
-                                basic_machine=v810-nec
-                                os=none
-                                ;;
-                        vaxv)
-                                basic_machine=vax-dec
-                                os=sysv
-                                ;;
-                        vms)
-                                basic_machine=vax-dec
-                                os=vms
-                                ;;
-                        vxworks960)
-                                basic_machine=i960-wrs
-                                os=vxworks
-                                ;;
-                        vxworks68)
-                                basic_machine=m68k-wrs
-                                os=vxworks
-                                ;;
-                        vxworks29k)
-                                basic_machine=a29k-wrs
-                                os=vxworks
-                                ;;
-                        xbox)
-                                basic_machine=i686-pc
-                                os=mingw32
-                                ;;
-                        ymp)
-                                basic_machine=ymp-cray
-                                os=unicos
-                                ;;
-                        *)
-                                basic_machine=$1
-                                os=
-                                ;;
-                esac
+        -scout)
                 ;;
+        -wrs)
+                os=-vxworks
+                basic_machine=$1
+                ;;
+        -chorusos*)
+                os=-chorusos
+                basic_machine=$1
+                ;;
+        -chorusrdb)
+                os=-chorusrdb
+                basic_machine=$1
+                ;;
+        -hiux*)
+                os=-hiuxwe2
+                ;;
+        -sco6)
+                os=-sco5v6
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                ;;
+        -sco5)
+                os=-sco3.2v5
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                ;;
+        -sco4)
+                os=-sco3.2v4
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                ;;
+        -sco3.2.[4-9]*)
+                os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                ;;
+        -sco3.2v[4-9]*)
+                # Don't forget version if it is 3.2v4 or newer.
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                ;;
+        -sco5v6*)
+                # Don't forget version if it is 3.2v4 or newer.
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                ;;
+        -sco*)
+                os=-sco3.2v2
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                ;;
+        -udk*)
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                ;;
+        -isc)
+                os=-isc2.2
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                ;;
+        -clix*)
+                basic_machine=clipper-intergraph
+                ;;
+        -isc*)
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                ;;
+        -lynx*178)
+                os=-lynxos178
+                ;;
+        -lynx*5)
+                os=-lynxos5
+                ;;
+        -lynx*)
+                os=-lynxos
+                ;;
+        -ptx*)
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+                ;;
+        -windowsnt*)
+                os=`echo $os | sed -e 's/windowsnt/winnt/'`
+                ;;
+        -psos*)
+                os=-psos
+                ;;
+        -mint | -mint[0-9]*)
+                basic_machine=m68k-atari
+                os=-mint
+                ;;
 esac
-# Decode 1-component or ad-hoc basic machines
+# Decode aliases for certain CPU-COMPANY combinations.
 case $basic_machine in
-        # Here we handle the default manufacturer of certain CPU types.  It is in
-        # some cases the only manufacturer, in others, it is the most popular.
-        w89k)
-                cpu=hppa1.1
-                vendor=winbond
+        # Recognize the basic CPU types without company name.
+        # Some are omitted here because they have special meanings below.
+a | 580 \
+        | a29k \
+        | aarch64 | aarch64_be \
+        | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+        | am33_2.0 \
+        | arc | arceb \
+        | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+        | avr | avr32 \
+        | ba \
+        | be32 | be64 \
+        | bfin \
+        | c4x | c8051 | clipper \
+        | d10v | d30v | dlx | dsp16xx \
+        | e2k | epiphany \
+        | fido | fr30 | frv | ft32 \
+        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+        | hexagon \
+        | i370 | i860 | i960 | ia64 \
+        | ip2k | iq2000 \
+        | k1om \
+        | le32 | le64 \
+        | lm32 \
+        | m32c | m32r | m32rle | m68000 | m68k | m88k \
+        | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
+        | mips | mipsbe | mipseb | mipsel | mipsle \
+        | mips16 \
+        | mips64 | mips64el \
+        | mips64octeon | mips64octeonel \
+        | mips64orion | mips64orionel \
+        | mips64r5900 | mips64r5900el \
+        | mips64vr | mips64vrel \
+        | mips64vr4100 | mips64vr4100el \
+        | mips64vr4300 | mips64vr4300el \
+        | mips64vr5000 | mips64vr5000el \
+        | mips64vr5900 | mips64vr5900el \
+        | mipsisa32 | mipsisa32el \
+        | mipsisa32r2 | mipsisa32r2el \
+        | mipsisa32r6 | mipsisa32r6el \
+        | mipsisa64 | mipsisa64el \
+        | mipsisa64r2 | mipsisa64r2el \
+        | mipsisa64r6 | mipsisa64r6el \
+        | mipsisa64sb1 | mipsisa64sb1el \
+        | mipsisa64sr71k | mipsisa64sr71kel \
+        | mipsr5900 | mipsr5900el \
+        | mipstx39 | mipstx39el \
+        | mn10200 | mn10300 \
+        | moxie \
+        | mt \
+        | msp430 \
+        | nds32 | nds32le | nds32be \
+        | nios | nios2 | nios2eb | nios2el \
+        | ns16k | ns32k \
+        | open8 | or1k | or1knd | or32 \
+        | pdp10 | pdp11 | pj | pjl \
+        | powerpc | powerpc64 | powerpc64le | powerpcle \
+        | pyramid \
+        | riscv32 | riscv64 \
+        | rl78 | rx \
+        | score \
+        | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+        | sh64 | sh64le \
+        | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+        | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+        | spu \
+        | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+        | ubicom32 \
+        | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+        | visium \
+        | we32k \
+        | x86 | xc16x | xstormy16 | xtensa \
+        | z8k | z80)
+                basic_machine=$basic_machine-unknown
                 ;;
-        op50n)
-                cpu=hppa1.1
-                vendor=oki
+        c54x)
+                basic_machine=tic54x-unknown
                 ;;
-        op60c)
-                cpu=hppa1.1
-                vendor=oki
+        c55x)
+                basic_machine=tic55x-unknown
                 ;;
-        ibm*)
-                cpu=i370
-                vendor=ibm
+        c6x)
+                basic_machine=tic6x-unknown
                 ;;
-        orion105)
-                cpu=clipper
-                vendor=highlevel
+        leon|leon[3-9])
+                basic_machine=sparc-$basic_machine
                 ;;
-        mac | mpw | mac-mpw)
-                cpu=m68k
-                vendor=apple
+        m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
+                basic_machine=$basic_machine-unknown
+                os=-none
                 ;;
-        pmac | pmac-mpw)
-                cpu=powerpc
-                vendor=apple
+        m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
                 ;;
+        ms1)
+                basic_machine=mt-unknown
+                ;;
+        strongarm | thumb | xscale)
+                basic_machine=arm-unknown
+                ;;
+        xgate)
+                basic_machine=$basic_machine-unknown
+                os=-none
+                ;;
+        xscaleeb)
+                basic_machine=armeb-unknown
+                ;;
+        xscaleel)
+                basic_machine=armel-unknown
+                ;;
+        # We use `pc' rather than `unknown'
+        # because (1) that's what they normally are, and
+        # (2) the word "unknown" tends to confuse beginning users.
+        i*86 | x86_64)
+          basic_machine=$basic_machine-pc
+          ;;
+        # Object if more than one company name word.
+        *-*-*)
+                echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+                exit 1
+                ;;
+        # Recognize the basic CPU types with company name.
+-* \
+        | a29k-* \
+        | aarch64-* | aarch64_be-* \
+        | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+        | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+        | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+        | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+        | avr-* | avr32-* \
+        | ba-* \
+        | be32-* | be64-* \
+        | bfin-* | bs2000-* \
+        | c[123]* | c30-* | [cjt]90-* | c4x-* \
+        | c8051-* | clipper-* | craynv-* | cydra-* \
+        | d10v-* | d30v-* | dlx-* \
+        | e2k-* | elxsi-* \
+        | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+        | h8300-* | h8500-* \
+        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+        | hexagon-* \
+        | i*86-* | i860-* | i960-* | ia64-* \
+        | ip2k-* | iq2000-* \
+        | k1om-* \
+        | le32-* | le64-* \
+        | lm32-* \
+        | m32c-* | m32r-* | m32rle-* \
+        | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+        | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+        | microblaze-* | microblazeel-* \
+        | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+        | mips16-* \
+        | mips64-* | mips64el-* \
+        | mips64octeon-* | mips64octeonel-* \
+        | mips64orion-* | mips64orionel-* \
+        | mips64r5900-* | mips64r5900el-* \
+        | mips64vr-* | mips64vrel-* \
+        | mips64vr4100-* | mips64vr4100el-* \
+        | mips64vr4300-* | mips64vr4300el-* \
+        | mips64vr5000-* | mips64vr5000el-* \
+        | mips64vr5900-* | mips64vr5900el-* \
+        | mipsisa32-* | mipsisa32el-* \
+        | mipsisa32r2-* | mipsisa32r2el-* \
+        | mipsisa32r6-* | mipsisa32r6el-* \
+        | mipsisa64-* | mipsisa64el-* \
+        | mipsisa64r2-* | mipsisa64r2el-* \
+        | mipsisa64r6-* | mipsisa64r6el-* \
+        | mipsisa64sb1-* | mipsisa64sb1el-* \
+        | mipsisa64sr71k-* | mipsisa64sr71kel-* \
+        | mipsr5900-* | mipsr5900el-* \
+        | mipstx39-* | mipstx39el-* \
+        | mmix-* \
+        | mt-* \
+        | msp430-* \
+        | nds32-* | nds32le-* | nds32be-* \
+        | nios-* | nios2-* | nios2eb-* | nios2el-* \
+        | none-* | np1-* | ns16k-* | ns32k-* \
+        | open8-* \
+        | or1k*-* \
+        | orion-* \
+        | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+        | pyramid-* \
+        | riscv32-* | riscv64-* \
+        | rl78-* | romp-* | rs6000-* | rx-* \
+        | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+        | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+        | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+        | sparclite-* \
+        | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
+        | tahoe-* \
+        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+        | tile*-* \
+        | tron-* \
+        | ubicom32-* \
+        | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+        | vax-* \
+        | visium-* \
+        | we32k-* \
+        | x86-* | x86_64-* | xc16x-* | xps100-* \
+        | xstormy16-* | xtensa*-* \
+        | ymp-* \
+        | z8k-* | z80-*)
+                ;;
+        # Recognize the basic CPU types without company name, with glob match.
+        xtensa*)
+                basic_machine=$basic_machine-unknown
+                ;;
         # Recognize the various machine names and aliases which stand
         # for a CPU type and a company and sometimes even an OS.
+bsd)
+                basic_machine=i386-unknown
+                os=-bsd
+                ;;
 b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-                cpu=m68000
-                vendor=att
+                basic_machine=m68000-att
                 ;;
 b*)
-                cpu=we32k
-                vendor=att
+                basic_machine=we32k-att
                 ;;
+        a29khif)
+                basic_machine=a29k-amd
+                os=-udi
+                ;;
+        abacus)
+                basic_machine=abacus-unknown
+                ;;
+        adobe68k)
+                basic_machine=m68010-adobe
+                os=-scout
+                ;;
+        alliant | fx80)
+                basic_machine=fx80-alliant
+                ;;
+        altos | altos3068)
+                basic_machine=m68k-altos
+                ;;
+        am29k)
+                basic_machine=a29k-none
+                os=-bsd
+                ;;
+        amd64)
+                basic_machine=x86_64-pc
+                ;;
+        amd64-*)
+                basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
+        amdahl)
+                basic_machine=580-amdahl
+                os=-sysv
+                ;;
+        amiga | amiga-*)
+                basic_machine=m68k-unknown
+                ;;
+        amigaos | amigados)
+                basic_machine=m68k-unknown
+                os=-amigaos
+                ;;
+        amigaunix | amix)
+                basic_machine=m68k-unknown
+                os=-sysv4
+                ;;
+        apollo68)
+                basic_machine=m68k-apollo
+                os=-sysv
+                ;;
+        apollo68bsd)
+                basic_machine=m68k-apollo
+                os=-bsd
+                ;;
+        aros)
+                basic_machine=i386-pc
+                os=-aros
+                ;;
+        asmjs)
+                basic_machine=asmjs-unknown
+                ;;
+        aux)
+                basic_machine=m68k-apple
+                os=-aux
+                ;;
+        balance)
+                basic_machine=ns32k-sequent
+                os=-dynix
+                ;;
+        blackfin)
+                basic_machine=bfin-unknown
+                os=-linux
+                ;;
+        blackfin-*)
+                basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+                os=-linux
+                ;;
         bluegene*)
-                cpu=powerpc
-                vendor=ibm
-                os=cnk
+                basic_machine=powerpc-ibm
+                os=-cnk
                 ;;
+        c54x-*)
+                basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
+        c55x-*)
+                basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
+        c6x-*)
+                basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
+        c90)
+                basic_machine=c90-cray
+                os=-unicos
+                ;;
+        cegcc)
+                basic_machine=arm-unknown
+                os=-cegcc
+                ;;
+        convex-c1)
+                basic_machine=c1-convex
+                os=-bsd
+                ;;
+        convex-c2)
+                basic_machine=c2-convex
+                os=-bsd
+                ;;
+        convex-c32)
+                basic_machine=c32-convex
+                os=-bsd
+                ;;
+        convex-c34)
+                basic_machine=c34-convex
+                os=-bsd
+                ;;
+        convex-c38)
+                basic_machine=c38-convex
+                os=-bsd
+                ;;
+        cray | j90)
+                basic_machine=j90-cray
+                os=-unicos
+                ;;
+        craynv)
+                basic_machine=craynv-cray
+                os=-unicosmp
+                ;;
+        cr16 | cr16-*)
+                basic_machine=cr16-unknown
+                os=-elf
+                ;;
+        crds | unos)
+                basic_machine=m68k-crds
+                ;;
+        crisv32 | crisv32-* | etraxfs*)
+                basic_machine=crisv32-axis
+                ;;
+        cris | cris-* | etrax*)
+                basic_machine=cris-axis
+                ;;
+        crx)
+                basic_machine=crx-unknown
+                os=-elf
+                ;;
+        da30 | da30-*)
+                basic_machine=m68k-da30
+                ;;
+        decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+                basic_machine=mips-dec
+                ;;
         decsystem10* | dec10*)
-                cpu=pdp10
-                vendor=dec
-                os=tops10
+                basic_machine=pdp10-dec
+                os=-tops10
                 ;;
         decsystem20* | dec20*)
-                cpu=pdp10
-                vendor=dec
-                os=tops20
+                basic_machine=pdp10-dec
+                os=-tops20
                 ;;
         delta | 3300 | motorola-3300 | motorola-delta \
               | 3300-motorola | delta-motorola)
-                cpu=m68k
-                vendor=motorola
+                basic_machine=m68k-motorola
                 ;;
-        dpx2*)
-                cpu=m68k
-                vendor=bull
-                os=sysv3
+        delta88)
+                basic_machine=m88k-motorola
+                os=-sysv3
                 ;;
-        encore | umax | mmax)
-                cpu=ns32k
-                vendor=encore
+        dicos)
+                basic_machine=i686-pc
+                os=-dicos
                 ;;
+        djgpp)
+                basic_machine=i586-pc
+                os=-msdosdjgpp
+                ;;
+        dpx20 | dpx20-*)
+                basic_machine=rs6000-bull
+                os=-bosx
+                ;;
+        dpx2* | dpx2*-bull)
+                basic_machine=m68k-bull
+                os=-sysv3
+                ;;
+        ebmon29k)
+                basic_machine=a29k-amd
+                os=-ebmon
+                ;;
         elxsi)
-                cpu=elxsi
-                vendor=elxsi
-                os=${os:-bsd}
+                basic_machine=elxsi-elxsi
+                os=-bsd
                 ;;
+        encore | umax | mmax)
+                basic_machine=ns32k-encore
+                ;;
+        es1800 | OSE68k | ose68k | ose | OSE)
+                basic_machine=m68k-ericsson
+                os=-ose
+                ;;
         fx2800)
-                cpu=i860
-                vendor=alliant
+                basic_machine=i860-alliant
                 ;;
         genix)
-                cpu=ns32k
-                vendor=ns
+                basic_machine=ns32k-ns
                 ;;
+        gmicro)
+                basic_machine=tron-gmicro
+                os=-sysv
+                ;;
+        go32)
+                basic_machine=i386-pc
+                os=-go32
+                ;;
         h3050r* | hiux*)
-                cpu=hppa1.1
-                vendor=hitachi
-                os=hiuxwe2
+                basic_machine=hppa1.1-hitachi
+                os=-hiuxwe2
                 ;;
+        h8300hms)
+                basic_machine=h8300-hitachi
+                os=-hms
+                ;;
+        h8300xray)
+                basic_machine=h8300-hitachi
+                os=-xray
+                ;;
+        h8500hms)
+                basic_machine=h8500-hitachi
+                os=-hms
+                ;;
+        harris)
+                basic_machine=m88k-harris
+                os=-sysv3
+                ;;
+        hp300-*)
+                basic_machine=m68k-hp
+                ;;
+        hp300bsd)
+                basic_machine=m68k-hp
+                os=-bsd
+                ;;
+        hp300hpux)
+                basic_machine=m68k-hp
+                os=-hpux
+                ;;
         hp3k9[0-9][0-9] | hp9[0-9][0-9])
-                cpu=hppa1.0
-                vendor=hp
+                basic_machine=hppa1.0-hp
                 ;;
         hp9k2[0-9][0-9] | hp9k31[0-9])
-                cpu=m68000
-                vendor=hp
+                basic_machine=m68000-hp
                 ;;
         hp9k3[2-9][0-9])
-                cpu=m68k
-                vendor=hp
+                basic_machine=m68k-hp
                 ;;
         hp9k6[0-9][0-9] | hp6[0-9][0-9])
-                cpu=hppa1.0
-                vendor=hp
+                basic_machine=hppa1.0-hp
                 ;;
         hp9k7[0-79][0-9] | hp7[0-79][0-9])
-                cpu=hppa1.1
-                vendor=hp
+                basic_machine=hppa1.1-hp
                 ;;
         hp9k78[0-9] | hp78[0-9])
                 # FIXME: really hppa2.0-hp
-                cpu=hppa1.1
-                vendor=hp
+                basic_machine=hppa1.1-hp
                 ;;
         hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
                 # FIXME: really hppa2.0-hp
-                cpu=hppa1.1
-                vendor=hp
+                basic_machine=hppa1.1-hp
                 ;;
         hp9k8[0-9][13679] | hp8[0-9][13679])
-                cpu=hppa1.1
-                vendor=hp
+                basic_machine=hppa1.1-hp
                 ;;
         hp9k8[0-9][0-9] | hp8[0-9][0-9])
-                cpu=hppa1.0
-                vendor=hp
+                basic_machine=hppa1.0-hp
                 ;;
+        hppa-next)
+                os=-nextstep3
+                ;;
+        hppaosf)
+                basic_machine=hppa1.1-hp
+                os=-osf
+                ;;
+        hppro)
+                basic_machine=hppa1.1-hp
+                os=-proelf
+                ;;
+        i370-ibm* | ibm*)
+                basic_machine=i370-ibm
+                ;;
         i*86v32)
-                cpu=`echo "$1" | sed -e 's/86.*/86/'`
-                vendor=pc
-                os=sysv32
+                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+                os=-sysv32
                 ;;
         i*86v4*)
-                cpu=`echo "$1" | sed -e 's/86.*/86/'`
-                vendor=pc
-                os=sysv4
+                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+                os=-sysv4
                 ;;
         i*86v)
-                cpu=`echo "$1" | sed -e 's/86.*/86/'`
-                vendor=pc
-                os=sysv
+                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+                os=-sysv
                 ;;
         i*86sol2)
-                cpu=`echo "$1" | sed -e 's/86.*/86/'`
-                vendor=pc
-                os=solaris2
+                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+                os=-solaris2
                 ;;
-        j90 | j90-cray)
-                cpu=j90
-                vendor=cray
-                os=${os:-unicos}
+        i386mach)
+                basic_machine=i386-mach
+                os=-mach
                 ;;
+        i386-vsta | vsta)
+                basic_machine=i386-unknown
+                os=-vsta
+                ;;
         iris | iris4d)
-                cpu=mips
-                vendor=sgi
+                basic_machine=mips-sgi
                 case $os in
-                    irix*)
+                    -irix*)
                         ;;
                     *)
-                        os=irix4
+                        os=-irix4
                         ;;
                 esac
                 ;;
+        isi68 | isi)
+                basic_machine=m68k-isi
+                os=-sysv
+                ;;
+        leon-*|leon[3-9]-*)
+                basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+                ;;
+        m68knommu)
+                basic_machine=m68k-unknown
+                os=-linux
+                ;;
+        m68knommu-*)
+                basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+                os=-linux
+                ;;
+        m88k-omron*)
+                basic_machine=m88k-omron
+                ;;
+        magnum | m3230)
+                basic_machine=mips-mips
+                os=-sysv
+                ;;
+        merlin)
+                basic_machine=ns32k-utek
+                os=-sysv
+                ;;
+        microblaze*)
+                basic_machine=microblaze-xilinx
+                ;;
+        mingw64)
+                basic_machine=x86_64-pc
+                os=-mingw64
+                ;;
+        mingw32)
+                basic_machine=i686-pc
+                os=-mingw32
+                ;;
+        mingw32ce)
+                basic_machine=arm-unknown
+                os=-mingw32ce
+                ;;
         miniframe)
-                cpu=m68000
-                vendor=convergent
+                basic_machine=m68000-convergent
                 ;;
-        *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*)
-                cpu=m68k
-                vendor=atari
-                os=mint
+        *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+                basic_machine=m68k-atari
+                os=-mint
                 ;;
+        mips3*-*)
+                basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+                ;;
+        mips3*)
+                basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+                ;;
+        monitor)
+                basic_machine=m68k-rom68k
+                os=-coff
+                ;;
+        morphos)
+                basic_machine=powerpc-unknown
+                os=-morphos
+                ;;
+        moxiebox)
+                basic_machine=moxie-unknown
+                os=-moxiebox
+                ;;
+        msdos)
+                basic_machine=i386-pc
+                os=-msdos
+                ;;
+        ms1-*)
+                basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+                ;;
+        msys)
+                basic_machine=i686-pc
+                os=-msys
+                ;;
+        mvs)
+                basic_machine=i370-ibm
+                os=-mvs
+                ;;
+        nacl)
+                basic_machine=le32-unknown
+                os=-nacl
+                ;;
+        ncr3000)
+                basic_machine=i486-ncr
+                os=-sysv4
+                ;;
+        netbsd386)
+                basic_machine=i386-unknown
+                os=-netbsd
+                ;;
+        netwinder)
+                basic_machine=armv4l-rebel
+                os=-linux
+                ;;
+        news | news700 | news800 | news900)
+                basic_machine=m68k-sony
+                os=-newsos
+                ;;
+        news1000)
+                basic_machine=m68030-sony
+                os=-newsos
+                ;;
         news-3600 | risc-news)
-                cpu=mips
-                vendor=sony
-                os=newsos
+                basic_machine=mips-sony
+                os=-newsos
                 ;;
-        next | m*-next)
-                cpu=m68k
-                vendor=next
+        necv70)
+                basic_machine=v70-nec
+                os=-sysv
+                ;;
+        next | m*-next )
+                basic_machine=m68k-next
                 case $os in
-                    nextstep* )
+                    -nextstep* )
                         ;;
-                    ns2*)
-                      os=nextstep2
+                    -ns2*)
+                      os=-nextstep2
                         ;;
                     *)
-                      os=nextstep3
+                      os=-nextstep3
                         ;;
                 esac
                 ;;
+        nh3000)
+                basic_machine=m68k-harris
+                os=-cxux
+                ;;
+        nh[45]000)
+                basic_machine=m88k-harris
+                os=-cxux
+                ;;
+        nindy960)
+                basic_machine=i960-intel
+                os=-nindy
+                ;;
+        mon960)
+                basic_machine=i960-intel
+                os=-mon960
+                ;;
+        nonstopux)
+                basic_machine=mips-compaq
+                os=-nonstopux
+                ;;
         np1)
-                cpu=np1
-                vendor=gould
+                basic_machine=np1-gould
                 ;;
+        neo-tandem)
+                basic_machine=neo-tandem
+                ;;
+        nse-tandem)
+                basic_machine=nse-tandem
+                ;;
+        nsr-tandem)
+                basic_machine=nsr-tandem
+                ;;
         op50n-* | op60c-*)
-                cpu=hppa1.1
-                vendor=oki
-                os=proelf
+                basic_machine=hppa1.1-oki
+                os=-proelf
                 ;;
+        openrisc | openrisc-*)
+                basic_machine=or32-unknown
+                ;;
+        os400)
+                basic_machine=powerpc-ibm
+                os=-os400
+                ;;
+        OSE68000 | ose68000)
+                basic_machine=m68000-ericsson
+                os=-ose
+                ;;
+        os68k)
+                basic_machine=m68k-none
+                os=-os68k
+                ;;
         pa-hitachi)
-                cpu=hppa1.1
-                vendor=hitachi
-                os=hiuxwe2
+                basic_machine=hppa1.1-hitachi
+                os=-hiuxwe2
                 ;;
+        paragon)
+                basic_machine=i860-intel
+                os=-osf
+                ;;
+        parisc)
+                basic_machine=hppa-unknown
+                os=-linux
+                ;;
+        parisc-*)
+                basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+                os=-linux
+                ;;
         pbd)
-                cpu=sparc
-                vendor=tti
+                basic_machine=sparc-tti
                 ;;
         pbb)
-                cpu=m68k
-                vendor=tti
+                basic_machine=m68k-tti
                 ;;
-        pc532)
-                cpu=ns32k
-                vendor=pc532
+        pc532 | pc532-*)
+                basic_machine=ns32k-pc532
                 ;;
+        pc98)
+                basic_machine=i386-pc
+                ;;
+        pc98-*)
+                basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
+        pentium | p5 | k5 | k6 | nexgen | viac3)
+                basic_machine=i586-pc
+                ;;
+        pentiumpro | p6 | 6x86 | athlon | athlon_*)
+                basic_machine=i686-pc
+                ;;
+        pentiumii | pentium2 | pentiumiii | pentium3)
+                basic_machine=i686-pc
+                ;;
+        pentium4)
+                basic_machine=i786-pc
+                ;;
+        pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+                basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
+        pentiumpro-* | p6-* | 6x86-* | athlon-*)
+                basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
+        pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+                basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
+        pentium4-*)
+                basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
         pn)
-                cpu=pn
-                vendor=gould
+                basic_machine=pn-gould
                 ;;
-        power)
-                cpu=power
-                vendor=ibm
+        power)  basic_machine=power-ibm
                 ;;
+        ppc | ppcbe)    basic_machine=powerpc-unknown
+                ;;
+        ppc-* | ppcbe-*)
+                basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
+        ppcle | powerpclittle | ppc-le | powerpc-little)
+                basic_machine=powerpcle-unknown
+                ;;
+        ppcle-* | powerpclittle-*)
+                basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
+        ppc64)  basic_machine=powerpc64-unknown
+                ;;
+        ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
+        ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+                basic_machine=powerpc64le-unknown
+                ;;
+        ppc64le-* | powerpc64little-*)
+                basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
         ps2)
-                cpu=i386
-                vendor=ibm
+                basic_machine=i386-ibm
                 ;;
+        pw32)
+                basic_machine=i586-unknown
+                os=-pw32
+                ;;
+        rdos | rdos64)
+                basic_machine=x86_64-pc
+                os=-rdos
+                ;;
+        rdos32)
+                basic_machine=i386-pc
+                os=-rdos
+                ;;
+        rom68k)
+                basic_machine=m68k-rom68k
+                os=-coff
+                ;;
         rm[46]00)
-                cpu=mips
-                vendor=siemens
+                basic_machine=mips-siemens
                 ;;
         rtpc | rtpc-*)
-                cpu=romp
-                vendor=ibm
+                basic_machine=romp-ibm
                 ;;
-        sde)
-                cpu=mipsisa32
-                vendor=sde
-                os=${os:-elf}
+        s390 | s390-*)
+                basic_machine=s390-ibm
                 ;;
-        simso-wrs)
-                cpu=sparclite
-                vendor=wrs
-                os=vxworks
+        s390x | s390x-*)
+                basic_machine=s390x-ibm
                 ;;
-        tower | tower-32)
-                cpu=m68k
-                vendor=ncr
+        sa29200)
+                basic_machine=a29k-amd
+                os=-udi
                 ;;
-        vpp*|vx|vx-*)
-                cpu=f301
-                vendor=fujitsu
+        sb1)
+                basic_machine=mipsisa64sb1-unknown
                 ;;
-        w65)
-                cpu=w65
-                vendor=wdc
+        sb1el)
+                basic_machine=mipsisa64sb1el-unknown
                 ;;
-        w89k-*)
-                cpu=hppa1.1
-                vendor=winbond
-                os=proelf
+        sde)
+                basic_machine=mipsisa32-sde
+                os=-elf
                 ;;
-        none)
-                cpu=none
-                vendor=none
+        sei)
+                basic_machine=mips-sei
+                os=-seiux
                 ;;
-        leon|leon[3-9])
-                cpu=sparc
-                vendor=$basic_machine
+        sequent)
+                basic_machine=i386-sequent
                 ;;
-        leon-*|leon[3-9]-*)
-                cpu=sparc
-                vendor=`echo "$basic_machine" | sed 's/-.*//'`
+        sh)
+                basic_machine=sh-hitachi
+                os=-hms
                 ;;
-        *-*)
-                IFS="-" read -r cpu vendor <<EOF
-$basic_machine
-EOF
+        sh5el)
+                basic_machine=sh5le-unknown
                 ;;
-        # We use `pc' rather than `unknown'
-        # because (1) that's what they normally are, and
-        # (2) the word "unknown" tends to confuse beginning users.
-        i*86 | x86_64)
-                cpu=$basic_machine
-                vendor=pc
+        sh64)
+                basic_machine=sh64-unknown
                 ;;
-        # These rules are duplicated from below for sake of the special case above;
-        # i.e. things that normalized to x86 arches should also default to "pc"
-        pc98)
-                cpu=i386
-                vendor=pc
+        sparclite-wrs | simso-wrs)
+                basic_machine=sparclite-wrs
+                os=-vxworks
                 ;;
-        x64 | amd64)
-                cpu=x86_64
-                vendor=pc
+        sps7)
+                basic_machine=m68k-bull
+                os=-sysv2
                 ;;
-        # Recognize the basic CPU types without company name.
-        *)
-                cpu=$basic_machine
-                vendor=unknown
+        spur)
+                basic_machine=spur-unknown
                 ;;
-esac
-unset -v basic_machine
-# Decode basic machines in the full and proper CPU-Company form.
-case $cpu-$vendor in
-        # Here we handle the default manufacturer of certain CPU types in canonical form. It is in
-        # some cases the only manufacturer, in others, it is the most popular.
-        craynv-unknown)
-                vendor=cray
-                os=${os:-unicosmp}
+        st2000)
+                basic_machine=m68k-tandem
                 ;;
-        c90-unknown | c90-cray)
-                vendor=cray
-                os=${os:-unicos}
+        stratus)
+                basic_machine=i860-stratus
+                os=-sysv4
                 ;;
-        fx80-unknown)
-                vendor=alliant
+        strongarm-* | thumb-*)
+                basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
-        romp-unknown)
-                vendor=ibm
+        sun2)
+                basic_machine=m68000-sun
                 ;;
-        mmix-unknown)
-                vendor=knuth
+        sun2os3)
+                basic_machine=m68000-sun
+                os=-sunos3
                 ;;
-        microblaze-unknown | microblazeel-unknown)
-                vendor=xilinx
+        sun2os4)
+                basic_machine=m68000-sun
+                os=-sunos4
                 ;;
-        rs6000-unknown)
-                vendor=ibm
+        sun3os3)
+                basic_machine=m68k-sun
+                os=-sunos3
                 ;;
-        vax-unknown)
-                vendor=dec
+        sun3os4)
+                basic_machine=m68k-sun
+                os=-sunos4
                 ;;
-        pdp11-unknown)
-                vendor=dec
+        sun4os3)
+                basic_machine=sparc-sun
+                os=-sunos3
                 ;;
-        we32k-unknown)
-                vendor=att
+        sun4os4)
+                basic_machine=sparc-sun
+                os=-sunos4
                 ;;
-        cydra-unknown)
-                vendor=cydrome
+        sun4sol2)
+                basic_machine=sparc-sun
+                os=-solaris2
                 ;;
-        i370-ibm*)
-                vendor=ibm
+        sun3 | sun3-*)
+                basic_machine=m68k-sun
                 ;;
-        orion-unknown)
-                vendor=highlevel
+        sun4)
+                basic_machine=sparc-sun
                 ;;
-        xps-unknown | xps100-unknown)
-                cpu=xps100
-                vendor=honeywell
+        sun386 | sun386i | roadrunner)
+                basic_machine=i386-sun
                 ;;
-        # Here we normalize CPU types with a missing or matching vendor
-        dpx20-unknown | dpx20-bull)
-                cpu=rs6000
-                vendor=bull
-                os=${os:-bosx}
+        sv1)
+                basic_machine=sv1-cray
+                os=-unicos
                 ;;
-        # Here we normalize CPU types irrespective of the vendor
-        amd64-*)
-                cpu=x86_64
+        symmetry)
+                basic_machine=i386-sequent
+                os=-dynix
                 ;;
-        blackfin-*)
-                cpu=bfin
-                os=linux
+        t3e)
+                basic_machine=alphaev5-cray
+                os=-unicos
                 ;;
-        c54x-*)
-                cpu=tic54x
+        t90)
+                basic_machine=t90-cray
+                os=-unicos
                 ;;
-        c55x-*)
-                cpu=tic55x
+        tile*)
+                basic_machine=$basic_machine-unknown
+                os=-linux-gnu
                 ;;
-        c6x-*)
-                cpu=tic6x
+        tx39)
+                basic_machine=mipstx39-unknown
                 ;;
-        e500v[12]-*)
-                cpu=powerpc
-                os=$os"spe"
+        tx39el)
+                basic_machine=mipstx39el-unknown
                 ;;
-        mips3*-*)
-                cpu=mips64
+        toad1)
+                basic_machine=pdp10-xkl
+                os=-tops20
                 ;;
-        ms1-*)
-                cpu=mt
+        tower | tower-32)
+                basic_machine=m68k-ncr
                 ;;
-        m68knommu-*)
-                cpu=m68k
-                os=linux
+        tpf)
+                basic_machine=s390x-ibm
+                os=-tpf
                 ;;
-        m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
-                cpu=s12z
+        udi29k)
+                basic_machine=a29k-amd
+                os=-udi
                 ;;
-        openrisc-*)
-                cpu=or32
+        ultra3)
+                basic_machine=a29k-nyu
+                os=-sym1
                 ;;
-        parisc-*)
-                cpu=hppa
-                os=linux
+        v810 | necv810)
+                basic_machine=v810-nec
+                os=-none
                 ;;
-        pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-                cpu=i586
+        vaxv)
+                basic_machine=vax-dec
+                os=-sysv
                 ;;
-        pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*)
-                cpu=i686
+        vms)
+                basic_machine=vax-dec
+                os=-vms
                 ;;
-        pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-                cpu=i686
+        vpp*|vx|vx-*)
+                basic_machine=f301-fujitsu
                 ;;
-        pentium4-*)
-                cpu=i786
+        vxworks960)
+                basic_machine=i960-wrs
+                os=-vxworks
                 ;;
-        pc98-*)
-                cpu=i386
+        vxworks68)
+                basic_machine=m68k-wrs
+                os=-vxworks
                 ;;
-        ppc-* | ppcbe-*)
-                cpu=powerpc
+        vxworks29k)
+                basic_machine=a29k-wrs
+                os=-vxworks
                 ;;
-        ppcle-* | powerpclittle-*)
-                cpu=powerpcle
+        w65*)
+                basic_machine=w65-wdc
+                os=-none
                 ;;
-        ppc64-*)
-                cpu=powerpc64
+        w89k-*)
+                basic_machine=hppa1.1-winbond
+                os=-proelf
                 ;;
-        ppc64le-* | powerpc64little-*)
-                cpu=powerpc64le
+        xbox)
+                basic_machine=i686-pc
+                os=-mingw32
                 ;;
-        sb1-*)
-                cpu=mipsisa64sb1
+        xps | xps100)
+                basic_machine=xps100-honeywell
                 ;;
-        sb1el-*)
-                cpu=mipsisa64sb1el
+        xscale-* | xscalee[bl]-*)
+                basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
                 ;;
-        sh5e[lb]-*)
-                cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'`
+        ymp)
+                basic_machine=ymp-cray
+                os=-unicos
                 ;;
-        spur-*)
-                cpu=spur
+        z8k-*-coff)
+                basic_machine=z8k-unknown
+                os=-sim
                 ;;
-        strongarm-* | thumb-*)
-                cpu=arm
+        z80-*-coff)
+                basic_machine=z80-unknown
+                os=-sim
                 ;;
-        tx39-*)
-                cpu=mipstx39
+        none)
+                basic_machine=none-none
+                os=-none
                 ;;
-        tx39el-*)
-                cpu=mipstx39el
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+        w89k)
+                basic_machine=hppa1.1-winbond
                 ;;
-        x64-*)
-                cpu=x86_64
+        op50n)
+                basic_machine=hppa1.1-oki
                 ;;
-        xscale-* | xscalee[bl]-*)
-                cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
+        op60c)
+                basic_machine=hppa1.1-oki
                 ;;
-        # Recognize the canonical CPU Types that limit and/or modify the
-        # company names they are paired with.
-        cr16-*)
-                os=${os:-elf}
+        romp)
+                basic_machine=romp-ibm
                 ;;
-        crisv32-* | etraxfs*-*)
-                cpu=crisv32
-                vendor=axis
+        mmix)
+                basic_machine=mmix-knuth
                 ;;
-        cris-* | etrax*-*)
-                cpu=cris
-                vendor=axis
+        rs6000)
+                basic_machine=rs6000-ibm
                 ;;
-        crx-*)
-                os=${os:-elf}
+        vax)
+                basic_machine=vax-dec
                 ;;
-        neo-tandem)
-                cpu=neo
-                vendor=tandem
+        pdp10)
+                # there are many clones, so DEC is not a safe bet
+                basic_machine=pdp10-unknown
                 ;;
-        nse-tandem)
-                cpu=nse
-                vendor=tandem
+        pdp11)
+                basic_machine=pdp11-dec
                 ;;
-        nsr-tandem)
-                cpu=nsr
-                vendor=tandem
+        we32k)
+                basic_machine=we32k-att
                 ;;
-        nsv-tandem)
-                cpu=nsv
-                vendor=tandem
+        sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+                basic_machine=sh-unknown
                 ;;
-        nsx-tandem)
-                cpu=nsx
-                vendor=tandem
+        sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+                basic_machine=sparc-sun
                 ;;
-        s390-*)
-                cpu=s390
-                vendor=ibm
+        cydra)
+                basic_machine=cydra-cydrome
                 ;;
-        s390x-*)
-                cpu=s390x
-                vendor=ibm
+        orion)
+                basic_machine=orion-highlevel
                 ;;
-        tile*-*)
-                os=${os:-linux-gnu}
+        orion105)
+                basic_machine=clipper-highlevel
                 ;;
+        mac | mpw | mac-mpw)
+                basic_machine=m68k-apple
+                ;;
+        pmac | pmac-mpw)
+                basic_machine=powerpc-apple
+                ;;
+        *-unknown)
+                # Make sure to match an already-canonicalized machine name.
+                ;;
         *)
-                # Recognize the canonical CPU types that are allowed with any
-                # company name.
-                case $cpu in
-a | 580 \
-                        | a29k \
-                        | aarch64 | aarch64_be \
-                        | abacus \
-                        | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
-                        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
-                        | alphapca5[67] | alpha64pca5[67] \
-                        | am33_2.0 \
-                        | arc | arceb \
-                        | arm  | arm[lb]e | arme[lb] | armv* \
-                        | avr | avr32 \
-                        | asmjs \
-                        | ba \
-                        | be32 | be64 \
-                        | bfin | bs2000 \
-                        | c[123]* | c30 | [cjt]90 | c4x \
-                        | c8051 | clipper | craynv | csky | cydra \
-                        | d10v | d30v | dlx | dsp16xx \
-                        | e2k | elxsi | epiphany \
-                        | f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
-                        | h8300 | h8500 \
-                        | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-                        | hexagon \
-                        | i370 | i*86 | i860 | i960 | ia16 | ia64 \
-                        | ip2k | iq2000 \
-                        | k1om \
-                        | le32 | le64 \
-                        | lm32 \
-                        | m32c | m32r | m32rle \
-                        | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k | v70 | w65 \
-                        | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip \
-                        | m88110 | m88k | maxq | mb | mcore | mep | metag \
-                        | microblaze | microblazeel \
-                        | mips | mipsbe | mipseb | mipsel | mipsle \
-                        | mips16 \
-                        | mips64 | mips64el \
-                        | mips64octeon | mips64octeonel \
-                        | mips64orion | mips64orionel \
-                        | mips64r5900 | mips64r5900el \
-                        | mips64vr | mips64vrel \
-                        | mips64vr4100 | mips64vr4100el \
-                        | mips64vr4300 | mips64vr4300el \
-                        | mips64vr5000 | mips64vr5000el \
-                        | mips64vr5900 | mips64vr5900el \
-                        | mipsisa32 | mipsisa32el \
-                        | mipsisa32r2 | mipsisa32r2el \
-                        | mipsisa32r6 | mipsisa32r6el \
-                        | mipsisa64 | mipsisa64el \
-                        | mipsisa64r2 | mipsisa64r2el \
-                        | mipsisa64r6 | mipsisa64r6el \
-                        | mipsisa64sb1 | mipsisa64sb1el \
-                        | mipsisa64sr71k | mipsisa64sr71kel \
-                        | mipsr5900 | mipsr5900el \
-                        | mipstx39 | mipstx39el \
-                        | mmix \
-                        | mn10200 | mn10300 \
-                        | moxie \
-                        | mt \
-                        | msp430 \
-                        | nds32 | nds32le | nds32be \
-                        | nfp \
-                        | nios | nios2 | nios2eb | nios2el \
-                        | none | np1 | ns16k | ns32k \
-                        | open8 \
-                        | or1k* \
-                        | or32 \
-                        | orion \
-                        | pdp10 | pdp11 | pj | pjl | pn | power \
-                        | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
-                        | pru \
-                        | pyramid \
-                        | riscv | riscv32 | riscv64 \
-                        | rl78 | romp | rs6000 | rx \
-                        | score \
-                        | sh | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \
-                        | sh[1234]e[lb] |  sh[12345][lb]e | sh[23]ele | sh64 | sh64le \
-                        | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \
-                        | sparclite \
-                        | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
-                        | spu \
-                        | tahoe \
-                        | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
-                        | tron \
-                        | ubicom32 \
-                        | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
-                        | vax \
-                        | visium \
-                        | wasm32 \
-                        | we32k \
-                        | x86 | x86_64 | xc16x | xgate | xps100 \
-                        | xstormy16 | xtensa* \
-                        | ymp \
-                        | z8k | z80)
-                                ;;
-                        *)
-                                echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
-                                exit 1
-                                ;;
-                esac
+                echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+                exit 1
                 ;;
 esac
 # Here we canonicalize certain aliases for manufacturers.
-case $vendor in
-        digital*)
-                vendor=dec
+case $basic_machine in
+        *-digital*)
+                basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
                 ;;
-        commodore*)
-                vendor=cbm
+        *-commodore*)
+                basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
                 ;;
         *)
                 ;;
@@ -1270,246 +1346,197 @@
 # Decode manufacturer-specific aliases for certain operating systems.
-if [ x$os != x ]
+if [ x"$os" != x"" ]
 then
 case $os in
-        # First match some system type aliases that might get confused
-        # with valid system types.
-        # solaris* is a basic system type, with this one exception.
-        auroraux)
-                os=auroraux
+        # First match some system type aliases
+        # that might get confused with valid system types.
+        # -solaris* is a basic system type, with this one exception.
+        -auroraux)
+                os=-auroraux
                 ;;
-        bluegene*)
-                os=cnk
-                ;;
-        solaris1 | solaris1.*)
+        -solaris1 | -solaris1.*)
                 os=`echo $os | sed -e 's|solaris1|sunos4|'`
                 ;;
-        solaris)
-                os=solaris2
+        -solaris)
+                os=-solaris2
                 ;;
-        unixware*)
-                os=sysv4.2uw
+        -svr4*)
+                os=-sysv4
                 ;;
-        gnu/linux*)
+        -unixware*)
+                os=-sysv4.2uw
+                ;;
+        -gnu/linux*)
                 os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
                 ;;
-        # es1800 is here to avoid being matched by es* (a different OS)
-        es1800*)
-                os=ose
-                ;;
-        # Some version numbers need modification
-        chorusos*)
-                os=chorusos
-                ;;
-        isc)
-                os=isc2.2
-                ;;
-        sco6)
-                os=sco5v6
-                ;;
-        sco5)
-                os=sco3.2v5
-                ;;
-        sco4)
-                os=sco3.2v4
-                ;;
-        sco3.2.[4-9]*)
-                os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-                ;;
-        sco3.2v[4-9]* | sco5v6*)
-                # Don't forget version if it is 3.2v4 or newer.
-                ;;
-        scout)
-                # Don't match below
-                ;;
-        sco*)
-                os=sco3.2v2
-                ;;
-        psos*)
-                os=psos
-                ;;
-        # Now accept the basic system types.
+        # First accept the basic system types.
         # The portable systems comes first.
-        # Each alternative MUST end in a * to match a version number.
-        # sysv* is not here because it comes later, after sysvr4.
-        gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
-             | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\
-             | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
-             | sym* | kopensolaris* | plan9* \
-             | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
-             | aos* | aros* | cloudabi* | sortix* \
-             | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
-             | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
-             | knetbsd* | mirbsd* | netbsd* \
-             | bitrig* | openbsd* | solidbsd* | libertybsd* \
-             | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \
-             | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
-             | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
-             | udi* | eabi* | lites* | ieee* | go32* | aux* | hcos* \
-             | chorusrdb* | cegcc* | glidix* \
-             | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
-             | midipix* | mingw32* | mingw64* | linux-gnu* | linux-android* \
-             | linux-newlib* | linux-musl* | linux-uclibc* \
-             | uxpv* | beos* | mpeix* | udk* | moxiebox* \
-             | interix* | uwin* | mks* | rhapsody* | darwin* \
-             | openstep* | oskit* | conix* | pw32* | nonstopux* \
-             | storm-chaos* | tops10* | tenex* | tops20* | its* \
-             | os2* | vos* | palmos* | uclinux* | nucleus* \
-             | morphos* | superux* | rtmk* | windiss* \
-             | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
-             | skyos* | haiku* | rdos* | toppers* | drops* | es* \
-             | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
-             | midnightbsd*)
+        # Each alternative MUST END IN A *, to match a version number.
+        # -sysv* is not here because it comes later, after sysvr4.
+        -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+              | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+              | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+              | -sym* | -kopensolaris* | -plan9* \
+              | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+              | -aos* | -aros* | -cloudabi* \
+              | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+              | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+              | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+              | -bitrig* | -openbsd* | -solidbsd* \
+              | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+              | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+              | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+              | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+              | -chorusos* | -chorusrdb* | -cegcc* \
+              | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+              | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+              | -linux-newlib* | -linux-musl* | -linux-uclibc* \
+              | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
+              | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+              | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+              | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+              | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+              | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+              | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+              | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
         # Remember, each alternative MUST END IN *, to match a version number.
                 ;;
-        qnx*)
-                case $cpu in
-                    x86 | i*86)
+        -qnx*)
+                case $basic_machine in
+                    x86-* | i*86-*)
                         ;;
                     *)
-                        os=nto-$os
+                        os=-nto$os
                         ;;
                 esac
                 ;;
-        hiux*)
-                os=hiuxwe2
+        -nto-qnx*)
                 ;;
-        nto-qnx*)
-                ;;
-        nto*)
+        -nto*)
                 os=`echo $os | sed -e 's|nto|nto-qnx|'`
                 ;;
-        sim | xray | os68k* | v88r* \
-            | windows* | osx | abug | netware* | os9* \
-            | macos* | mpw* | magic* | mmixware* | mon960* | lnews*)
+        -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+              | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+              | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
                 ;;
-        linux-dietlibc)
-                os=linux-dietlibc
+        -mac*)
+                os=`echo $os | sed -e 's|mac|macos|'`
                 ;;
-        linux*)
+        -linux-dietlibc)
+                os=-linux-dietlibc
+                ;;
+        -linux*)
                 os=`echo $os | sed -e 's|linux|linux-gnu|'`
                 ;;
-        lynx*178)
-                os=lynxos178
+        -sunos5*)
+                os=`echo $os | sed -e 's|sunos5|solaris2|'`
                 ;;
-        lynx*5)
-                os=lynxos5
+        -sunos6*)
+                os=`echo $os | sed -e 's|sunos6|solaris3|'`
                 ;;
-        lynx*)
-                os=lynxos
+        -opened*)
+                os=-openedition
                 ;;
-        mac*)
-                os=`echo "$os" | sed -e 's|mac|macos|'`
+        -os400*)
+                os=-os400
                 ;;
-        opened*)
-                os=openedition
+        -wince*)
+                os=-wince
                 ;;
-        os400*)
-                os=os400
+        -osfrose*)
+                os=-osfrose
                 ;;
-        sunos5*)
-                os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
+        -osf*)
+                os=-osf
                 ;;
-        sunos6*)
-                os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
+        -utek*)
+                os=-bsd
                 ;;
-        wince*)
-                os=wince
+        -dynix*)
+                os=-bsd
                 ;;
-        utek*)
-                os=bsd
+        -acis*)
+                os=-aos
                 ;;
-        dynix*)
-                os=bsd
+        -atheos*)
+                os=-atheos
                 ;;
-        acis*)
-                os=aos
+        -syllable*)
+                os=-syllable
                 ;;
-        atheos*)
-                os=atheos
+        -386bsd)
+                os=-bsd
                 ;;
-        syllable*)
-                os=syllable
+        -ctix* | -uts*)
+                os=-sysv
                 ;;
-bsd)
-                os=bsd
+        -nova*)
+                os=-rtmk-nova
                 ;;
-        ctix* | uts*)
-                os=sysv
+        -ns2 )
+                os=-nextstep2
                 ;;
-        nova*)
-                os=rtmk-nova
+        -nsk*)
+                os=-nsk
                 ;;
-        ns2)
-                os=nextstep2
-                ;;
-        nsk*)
-                os=nsk
-                ;;
         # Preserve the version number of sinix5.
-        sinix5.*)
+        -sinix5.*)
                 os=`echo $os | sed -e 's|sinix|sysv|'`
                 ;;
-        sinix*)
-                os=sysv4
+        -sinix*)
+                os=-sysv4
                 ;;
-        tpf*)
-                os=tpf
+        -tpf*)
+                os=-tpf
                 ;;
-        triton*)
-                os=sysv3
+        -triton*)
+                os=-sysv3
                 ;;
-        oss*)
-                os=sysv3
+        -oss*)
+                os=-sysv3
                 ;;
-        svr4*)
-                os=sysv4
+        -svr4)
+                os=-sysv4
                 ;;
-        svr3)
-                os=sysv3
+        -svr3)
+                os=-sysv3
                 ;;
-        sysvr4)
-                os=sysv4
+        -sysvr4)
+                os=-sysv4
                 ;;
-        # This must come after sysvr4.
-        sysv*)
+        # This must come after -sysvr4.
+        -sysv*)
                 ;;
-        ose*)
-                os=ose
+        -ose*)
+                os=-ose
                 ;;
-        *mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
-                os=mint
+        -es1800*)
+                os=-ose
                 ;;
-        zvmoe)
-                os=zvmoe
+        -xenix)
+                os=-xenix
                 ;;
-        dicos*)
-                os=dicos
+        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+                os=-mint
                 ;;
-        pikeos*)
-                # Until real need of OS specific support for
-                # particular features comes up, bare metal
-                # configurations are quite functional.
-                case $cpu in
-                    arm*)
-                        os=eabi
-                        ;;
-                    *)
-                        os=elf
-                        ;;
-                esac
+        -aros*)
+                os=-aros
                 ;;
-        nacl*)
+        -zvmoe)
+                os=-zvmoe
                 ;;
-        ios)
+        -dicos*)
+                os=-dicos
                 ;;
-        none)
+        -nacl*)
                 ;;
-        *-eabi)
+        -none)
                 ;;
         *)
-                echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
+                # Get rid of the `-' at the beginning of $os.
+                os=`echo $os | sed 's/[^-]*-//'`
+                echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
                 exit 1
                 ;;
 esac
@@ -1525,181 +1552,178 @@
 # will signal an error saying that MANUFACTURER isn't an operating
 # system, and we'll never get to this point.
-case $cpu-$vendor in
+case $basic_machine in
         score-*)
-                os=elf
+                os=-elf
                 ;;
         spu-*)
-                os=elf
+                os=-elf
                 ;;
         *-acorn)
-                os=riscix1.2
+                os=-riscix1.2
                 ;;
         arm*-rebel)
-                os=linux
+                os=-linux
                 ;;
         arm*-semi)
-                os=aout
+                os=-aout
                 ;;
         c4x-* | tic4x-*)
-                os=coff
+                os=-coff
                 ;;
         c8051-*)
-                os=elf
+                os=-elf
                 ;;
-        clipper-intergraph)
-                os=clix
-                ;;
         hexagon-*)
-                os=elf
+                os=-elf
                 ;;
         tic54x-*)
-                os=coff
+                os=-coff
                 ;;
         tic55x-*)
-                os=coff
+                os=-coff
                 ;;
         tic6x-*)
-                os=coff
+                os=-coff
                 ;;
         # This must come before the *-dec entry.
         pdp10-*)
-                os=tops20
+                os=-tops20
                 ;;
         pdp11-*)
-                os=none
+                os=-none
                 ;;
         *-dec | vax-*)
-                os=ultrix4.2
+                os=-ultrix4.2
                 ;;
         m68*-apollo)
-                os=domain
+                os=-domain
                 ;;
         i386-sun)
-                os=sunos4.0.2
+                os=-sunos4.0.2
                 ;;
         m68000-sun)
-                os=sunos3
+                os=-sunos3
                 ;;
         m68*-cisco)
-                os=aout
+                os=-aout
                 ;;
         mep-*)
-                os=elf
+                os=-elf
                 ;;
         mips*-cisco)
-                os=elf
+                os=-elf
                 ;;
         mips*-*)
-                os=elf
+                os=-elf
                 ;;
         or32-*)
-                os=coff
+                os=-coff
                 ;;
         *-tti)  # must be before sparc entry or we get the wrong os.
-                os=sysv3
+                os=-sysv3
                 ;;
         sparc-* | *-sun)
-                os=sunos4.1.1
+                os=-sunos4.1.1
                 ;;
-        pru-*)
-                os=elf
-                ;;
         *-be)
-                os=beos
+                os=-beos
                 ;;
+        *-haiku)
+                os=-haiku
+                ;;
         *-ibm)
-                os=aix
+                os=-aix
                 ;;
         *-knuth)
-                os=mmixware
+                os=-mmixware
                 ;;
         *-wec)
-                os=proelf
+                os=-proelf
                 ;;
         *-winbond)
-                os=proelf
+                os=-proelf
                 ;;
         *-oki)
-                os=proelf
+                os=-proelf
                 ;;
         *-hp)
-                os=hpux
+                os=-hpux
                 ;;
         *-hitachi)
-                os=hiux
+                os=-hiux
                 ;;
         i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-                os=sysv
+                os=-sysv
                 ;;
         *-cbm)
-                os=amigaos
+                os=-amigaos
                 ;;
         *-dg)
-                os=dgux
+                os=-dgux
                 ;;
         *-dolphin)
-                os=sysv3
+                os=-sysv3
                 ;;
         m68k-ccur)
-                os=rtu
+                os=-rtu
                 ;;
         m88k-omron*)
-                os=luna
+                os=-luna
                 ;;
-        *-next)
-                os=nextstep
+        *-next )
+                os=-nextstep
                 ;;
         *-sequent)
-                os=ptx
+                os=-ptx
                 ;;
         *-crds)
-                os=unos
+                os=-unos
                 ;;
         *-ns)
-                os=genix
+                os=-genix
                 ;;
         i370-*)
-                os=mvs
+                os=-mvs
                 ;;
+        *-next)
+                os=-nextstep3
+                ;;
         *-gould)
-                os=sysv
+                os=-sysv
                 ;;
         *-highlevel)
-                os=bsd
+                os=-bsd
                 ;;
         *-encore)
-                os=bsd
+                os=-bsd
                 ;;
         *-sgi)
-                os=irix
+                os=-irix
                 ;;
         *-siemens)
-                os=sysv4
+                os=-sysv4
                 ;;
         *-masscomp)
-                os=rtu
+                os=-rtu
                 ;;
         f30[01]-fujitsu | f700-fujitsu)
-                os=uxpv
+                os=-uxpv
                 ;;
         *-rom68k)
-                os=coff
+                os=-coff
                 ;;
         *-*bug)
-                os=coff
+                os=-coff
                 ;;
         *-apple)
-                os=macos
+                os=-macos
                 ;;
         *-atari*)
-                os=mint
+                os=-mint
                 ;;
-        *-wrs)
-                os=vxworks
-                ;;
         *)
-                os=none
+                os=-none
                 ;;
 esac
 fi
@@ -1706,84 +1730,83 @@
 # Here we handle the case where we know the os, and the CPU type, but not the
 # manufacturer.  We pick the logical manufacturer.
-case $vendor in
-        unknown)
+vendor=unknown
+case $basic_machine in
+        *-unknown)
                 case $os in
-                        riscix*)
+                        -riscix*)
                                 vendor=acorn
                                 ;;
-                        sunos*)
+                        -sunos*)
                                 vendor=sun
                                 ;;
-                        cnk*|-aix*)
+                        -cnk*|-aix*)
                                 vendor=ibm
                                 ;;
-                        beos*)
+                        -beos*)
                                 vendor=be
                                 ;;
-                        hpux*)
+                        -hpux*)
                                 vendor=hp
                                 ;;
-                        mpeix*)
+                        -mpeix*)
                                 vendor=hp
                                 ;;
-                        hiux*)
+                        -hiux*)
                                 vendor=hitachi
                                 ;;
-                        unos*)
+                        -unos*)
                                 vendor=crds
                                 ;;
-                        dgux*)
+                        -dgux*)
                                 vendor=dg
                                 ;;
-                        luna*)
+                        -luna*)
                                 vendor=omron
                                 ;;
-                        genix*)
+                        -genix*)
                                 vendor=ns
                                 ;;
-                        clix*)
-                                vendor=intergraph
-                                ;;
-                        mvs* | opened*)
+                        -mvs* | -opened*)
                                 vendor=ibm
                                 ;;
-                        os400*)
+                        -os400*)
                                 vendor=ibm
                                 ;;
-                        ptx*)
+                        -ptx*)
                                 vendor=sequent
                                 ;;
-                        tpf*)
+                        -tpf*)
                                 vendor=ibm
                                 ;;
-                        vxsim* | vxworks* | windiss*)
+                        -vxsim* | -vxworks* | -windiss*)
                                 vendor=wrs
                                 ;;
-                        aux*)
+                        -aux*)
                                 vendor=apple
                                 ;;
-                        hms*)
+                        -hms*)
                                 vendor=hitachi
                                 ;;
-                        mpw* | macos*)
+                        -mpw* | -macos*)
                                 vendor=apple
                                 ;;
-                        *mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
+                        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
                                 vendor=atari
                                 ;;
-                        vos*)
+                        -vos*)
                                 vendor=stratus
                                 ;;
                 esac
+                basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
                 ;;
 esac
-echo "$cpu-$vendor-$os"
+echo $basic_machine$os
 exit
 # Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"

/branches/18.06.1/scripts/fixup-makefile.pl
@@ -26,7 +26,7 @@
$state{related_var} = "URL";
} else {
$state{context} = 1;
$state{related_var} = "PKG_SOURCE_URL";
$state{related_var} = "PKG_SOURCE";
}
}

 /branches/18.06.1/scripts/flashing/eva_ramboot.py
@@ -1,32 +1,24 @@
-#!/usr/bin/env python3
+#!/usr/bin/python
-import argparse
 from ftplib import FTP
 from sys import argv
 from os import stat
-parser = argparse.ArgumentParser(description='Tool to boot AVM EVA ramdisk images.')
-parser.add_argument('ip', type=str, help='IP-address to transfer the image to')
-parser.add_argument('image', type=str, help='Location of the ramdisk image')
-parser.add_argument('--offset', type=lambda x: int(x,0), help='Offset to load the image to in hex format with leading 0x. Only needed for non-lantiq devices.')
-args = parser.parse_args()
+assert len(argv) == 3
+ip = argv[1]
+image = argv[2]
-size = stat(args.image).st_size
+size = stat(image).st_size
 # arbitrary size limit, to prevent the address calculations from overflows etc.
 assert size < 0x2000000
-if args.offset:
-        addr = size
-        haddr = args.offset
-else:
-        # We need to align the address.
-        # A page boundary seems to be sufficient on 7362sl and 7412
-        addr = ((0x8000000 - size) & ~0xfff)
-        haddr = 0x80000000 + addr
+# We need to align the address. A page boundary seems to be sufficient on 7362sl
+# and 7412
+addr = ((0x8000000 - size) & ~0xfff)
+haddr = 0x80000000 + addr
+img = open(image, "rb")
-img = open(args.image, "rb")
-ftp = FTP(args.ip, 'adam2', 'adam2')
+ftp = FTP(ip, 'adam2', 'adam2')
 def adam(cmd):
         print("> %s"%(cmd))

/branches/18.06.1/scripts/ipkg-build
@@ -15,12 +15,8 @@
TAR="${TAR:-$(which tar)}"
GZIP="$(which gzip)"

# try to use fixed source epoch
if [ -n "$SOURCE_DATE_EPOCH" ]; then
TIMESTAMP=$(date --date="@$SOURCE_DATE_EPOCH")

# look up date of last commit
elif [ -d "$TOPDIR/.git" ]; then
if [ -d "$TOPDIR/.git" ]; then
GIT="$(which git)"
TIMESTAMP=$(cd $TOPDIR; $GIT log -1 -s --format=%ci)
elif [ -d "$TOPDIR/.svn" ]; then
@@ -64,10 +60,8 @@
done

rm $CONTROL/conffiles
if [ -f $CONTROL/conffiles.resolved ]; then
mv $CONTROL/conffiles.resolved $CONTROL/conffiles
chmod 0644 $CONTROL/conffiles
fi
mv $CONTROL/conffiles.resolved $CONTROL/conffiles
chmod 0644 $CONTROL/conffiles
fi

cd $owd

/branches/18.06.1/scripts/ipkg-make-index.sh
@@ -17,7 +17,7 @@
[[ "$name" = "kernel" ]] && continue
[[ "$name" = "libc" ]] && continue
echo "Generating index for package $pkg" >&2
file_size=$(stat -L -c%s $pkg)
file_size=$(ls -l $pkg \| awk '{print $5}')
sha256sum=$(mkhash sha256 $pkg)
# Take pains to make variable value sed-safe
sed_safe_pkg=`echo $pkg \| sed -e 's/^\.\///g' -e 's/\\//\\\\\\//g'`

/branches/18.06.1/scripts/metadata.pm
@@ -238,7 +238,6 @@
/^Build-Types:\s(.+)\s$/ and $src->{buildtypes} = [ split /\s+/, $1 ];
next unless $pkg;
/^Version: \s(.+)\s$/ and $pkg->{version} = $1;
/^ABIVersion: \s(.+)\s$/ and $pkg->{abiversion} = $1;
/^Title: \s(.+)\s$/ and $pkg->{title} = $1;
/^Menu: \s(.+)\s$/ and $pkg->{menu} = $1;
/^Submenu: \s(.+)\s$/ and $pkg->{submenu} = $1;
@@ -251,7 +250,6 @@
my @vpkg = split /\s+/, $1;
@{$pkg->{provides}} = ($pkg->{name}, @vpkg);
foreach my $vpkg (@vpkg) {
next if ($vpkg eq $pkg->{name});
$vpackage{$vpkg} or $vpackage{$vpkg} = [];
push @{$vpackage{$vpkg}}, $pkg;
}

/branches/18.06.1/scripts/om-fwupgradecfg-gen.sh
@@ -24,7 +24,7 @@
MAX_PART_SIZE=7168
KERNEL_FLASH_ADDR=0x1c0000
FLASH_BS=262144
MD5_SKIP_BLOCKS=4
MD5_SKIP_BLOCKS=1
SIZE_FACTOR=1
SIZE_FORMAT="%d"
;;

/branches/18.06.1/scripts/package-metadata.pl
@@ -509,7 +509,7 @@
}
}

sub gen_package_auxiliary() {
sub gen_package_subdirs() {
parse_package_metadata($ARGV[0]) or exit 1;
foreach my $name (sort {uc($a) cmp uc($b)} keys %package) {
my $pkg = $package{$name};
@@ -516,21 +516,6 @@
if ($pkg->{name} && $pkg->{repository}) {
print "Package/$name/subdir = $pkg->{repository}\n";
}
if ($pkg->{name} && defined($pkg->{abiversion}) && length($pkg->{abiversion})) {
my $abiv;

if ($pkg->{abiversion} =~ m!^(\d{4})-(\d{2})-(\d{2})-[0-9a-f]{7,40}$!) {
print STDERR "WARNING: Reducing ABI version '$pkg->{abiversion}' of package '$name' to '$1$2$3'\n";
$abiv = "$1$2$3";
}
else {
$abiv = $pkg->{abiversion};
}

foreach my $n (@{$pkg->{provides}}) {
print "Package/$n/abiversion = $abiv\n";
}
}
}
}

@@ -580,7 +565,7 @@
/^config$/ and return gen_package_config();
/^kconfig/ and return gen_kconfig_overrides();
/^source$/ and return gen_package_source();
/^pkgaux$/ and return gen_package_auxiliary();
/^subdirs$/ and return gen_package_subdirs();
/^license$/ and return gen_package_license(0);
/^licensefull$/ and return gen_package_license(1);
/^usergroup$/ and return gen_usergroup_list();
@@ -592,7 +577,7 @@
$0 config [file] Package metadata in Kconfig format
$0 kconfig [file] [config] [patchver] Kernel config overrides
$0 source [file] Package source file information
$0 pkgaux [file] Package auxiliary variables in makefile format
$0 subdirs [file] Package subdir information in makefile format
$0 license [file] Package license information
$0 licensefull [file] Package license information (full list)
$0 usergroup [file] Package usergroup allocation list

/branches/18.06.1/scripts/qemustart
@@ -88,7 +88,6 @@
[<subtarget> [<extra-qemu-options>]]
[--kernel <kernel>]
[--rootfs <rootfs>]
[--machine <machine>]

<subtarget> will default to "generic" and must be specified if
<extra-qemu-options> are present
@@ -101,7 +100,7 @@
Examples

$SELF x86 64
$SELF x86 64 --machine q35,accel=kvm -device virtio-balloon-pci
$SELF x86 64 -enable-kvm -device virtio-balloon-pci
$SELF x86 64 -incoming tcp:0:4444
$SELF x86 64-glibc
$SELF malta be -m 64
@@ -108,7 +107,6 @@
$SELF malta le64
$SELF malta be-glibc
$SELF armvirt 32 \\
--machine virt,highmem=off \\
--kernel bin/targets/armvirt/32/openwrt-armvirt-32-zImage \\
--rootfs bin/targets/armvirt/32/openwrt-armvirt-32-root.ext4
EOF
@@ -115,7 +113,7 @@
}

rand_mac() {
hexdump -n 3 -e '"52:54:00" 3/1 ":%02x"' /dev/urandom
hexdump -n 3 -e '"52:54:00:" 2/1 "%02x:" 1/1 "%02x"' /dev/urandom
}

parse_args() {
@@ -124,7 +122,6 @@
case "$1" in
--kernel) o_kernel="$2"; shift 2 ;;
--rootfs) o_rootfs="$2"; shift 2 ;;
--machine\|-machine\|-M) o_mach="$2"; shift 2 ;;
--help\|-h)
usage
exit 0
@@ -155,7 +152,6 @@
start_qemu_armvirt() {
local kernel="$o_kernel"
local rootfs="$o_rootfs"
local mach="${o_mach:-virt}"
local cpu
local qemu_exe

@@ -185,7 +181,7 @@
)
}

"$qemu_exe" -machine "$mach" -cpu "$cpu" -nographic \
"$qemu_exe" -machine virt -cpu "$cpu" -nographic \
-netdev bridge,id=lan,br="$BR_LAN,helper=$HELPER" -device virtio-net-pci,id=devlan,netdev=lan,mac="$MAC_LAN" \
-netdev bridge,id=wan,br="$BR_WAN,helper=$HELPER" -device virtio-net-pci,id=devwan,netdev=wan,mac="$MAC_WAN" \
-kernel "$kernel" \
@@ -197,7 +193,6 @@
local isel
local qemu_exe
local kernel="$o_kernel"
local mach="${o_mach:-malta}"

# o_subtarget can be le, be, le64, be64, le-glibc, le64-glibc, etc..
is64="$(echo $o_subtarget \| grep -o 64)"
@@ -209,7 +204,7 @@
# NOTE: order of wan, lan -device arguments matters as it will affect which
# one will be actually used as the wan, lan network interface inside the
# guest machine
"$qemu_exe" -machine "$mach" -nographic \
"$qemu_exe" -machine malta -nographic \
-netdev bridge,id=wan,br="$BR_WAN,helper=$HELPER" -device pcnet,netdev=wan,mac="$MAC_WAN" \
-netdev bridge,id=lan,br="$BR_LAN,helper=$HELPER" -device pcnet,netdev=lan,mac="$MAC_LAN" \
-kernel "$kernel" \
@@ -218,7 +213,6 @@

start_qemu_x86() {
local rootfs="$o_rootfs"
local mach="${o_mach:-pc}"
local qemu_exe

[ -n "$rootfs" ] \|\| {
@@ -233,7 +227,7 @@
# 64: 64-bit, kvm guest, virtio
#
case "${o_subtarget%-*}" in
legacy) qemu_exe="qemu-system-i386" ;;
legacy) qemu_exe="qemu-system-i386" ;;
generic\|64) qemu_exe="qemu-system-x86_64" ;;
*)
__errmsg "target $o_target: unknown subtarget $o_subtarget"
@@ -253,7 +247,7 @@
# -drive "file=$rootfs,format=raw,id=drv0,if=none" \
#
# [1] https://dev.openwrt.org/ticket/17947
"$qemu_exe" -machine "$mach" -nographic \
"$qemu_exe" -nographic \
-netdev bridge,id=lan,br="$BR_LAN,helper=$HELPER" -device e1000,id=devlan,netdev=lan,mac="$MAC_LAN" \
-netdev bridge,id=wan,br="$BR_WAN,helper=$HELPER" -device e1000,id=devwan,netdev=wan,mac="$MAC_WAN" \
-device ide-drive,drive=drv0 \
@@ -261,7 +255,7 @@
"${o_qemu_extra[@]}"
;;
generic\|64)
"$qemu_exe" -machine "$mach" -nographic \
"$qemu_exe" -nographic \
-netdev bridge,id=lan,br="$BR_LAN,helper=$HELPER" -device virtio-net-pci,id=devlan,netdev=lan,mac="$MAC_LAN" \
-netdev bridge,id=wan,br="$BR_WAN,helper=$HELPER" -device virtio-net-pci,id=devwan,netdev=wan,mac="$MAC_WAN" \
-drive "file=$rootfs,format=raw,if=virtio" \

/branches/18.06.1/scripts/rstrip.sh
@@ -34,7 +34,7 @@
old_rpath="$($PATCHELF --print-rpath $F)"; new_rpath=""
for path in $old_rpath; do
case "$path" in
/lib/[^/]\|/usr/lib/[^/]\|\$ORIGIN/*\|\$ORIGIN) new_rpath="${new_rpath:+$new_rpath:}$path" ;;
/lib/[^/]\|/usr/lib/[^/]\|\$ORIGIN/*) new_rpath="${new_rpath:+$new_rpath:}$path" ;;
*) echo "$SELF: $F: removing rpath $path" ;;
esac
done

/branches/18.06.1/scripts/slugimage.pl
@@ -40,7 +40,7 @@
use warnings;

use Getopt::Long qw(:config no_ignore_case);
use File::Temp qw(tempfile);
use POSIX qw(tmpnam);

my($debug) = 0;
my($quiet) = 0;
@@ -993,7 +993,7 @@
# don't touch RedBoot and SysConf anyway. If no Trailer is specified,
# put in one.
if (not defined $redboot and not -e "RedBoot") {
$redboot = tempfile();
$redboot = tmpnam();
open TMP, ">$redboot" or die "Cannot open file $redboot: $!";
push @cleanup, $redboot;
# The RedBoot partition is 256 * 1024 = 262144; the trailer we add
@@ -1006,7 +1006,7 @@
close TMP;
}
if (not defined $sysconf and not -e "SysConf") {
$sysconf = tempfile();
$sysconf = tmpnam();
open TMP, ">$sysconf" or die "Cannot open file $sysconf: $!";
push @cleanup, $sysconf;
# The SysConf partition is 128 * 1024 = 131072
@@ -1014,7 +1014,7 @@
close TMP;
}
if (not defined $trailer and not -e "Trailer") {
$trailer = tempfile();
$trailer = tmpnam();
open TMP, ">$trailer" or die "Cannot open file $trailer: $!";
push @cleanup, $trailer;
for my $i (@sercomm_flash_trailer) {

/branches/18.06.1/scripts/sysupgrade-tar.sh
@@ -61,7 +61,7 @@
mtime="--mtime=@${SOURCE_DATE_EPOCH}"
fi

(cd "$tmpdir"; tar --sort=name --owner=0 --group=0 --numeric-owner -cvf sysupgrade.tar sysupgrade-${board} ${mtime})
(cd "$tmpdir"; tar cvf sysupgrade.tar sysupgrade-${board} ${mtime})
err="$?"
if [ -e "$tmpdir/sysupgrade.tar" ]; then
cp "$tmpdir/sysupgrade.tar" "$outfile"

/branches/18.06.1/scripts/target-metadata.pl
@@ -40,8 +40,6 @@
/^small_flash$/ and $ret .= "\tselect SMALL_FLASH\n";
/^nand$/ and $ret .= "\tselect NAND_SUPPORT\n";
/^virtio$/ and $ret .= "\tselect VIRTIO_SUPPORT\n";
/^rootfs-part$/ and $ret .= "\tselect USES_ROOTFS_PART\n";
/^boot-part$/ and $ret .= "\tselect USES_BOOT_PART\n";
}
return $ret;
}

Compare Path:	Rev
With Path:	Rev