Changeset 4435 for pjproject

Timestamp:

Mar 11, 2013 6:32:58 AM (12 years ago)

Author:

nanang

Message:

Re #1639: merged android branch into trunk (except sample apps, i.e: apjsua & apjloader)

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• aconfigure (modified) (3 diffs)
• aconfigure.ac (modified) (3 diffs)
• config.guess (modified) (43 diffs)
• config.sub (modified) (52 diffs)
• configure-android (copied) (copied from pjproject/branches/projects/android/configure-android)
• pjlib/include/pj/compat/socket.h (modified) (1 diff)
• pjlib/include/pj/config_site_sample.h (modified) (1 diff)
• pjmedia/build/Makefile (modified) (1 diff)
• pjmedia/include/pjmedia-audiodev/config.h (modified) (1 diff)
• pjmedia/src/pjmedia-audiodev/android_jni_dev.c (copied) (copied from pjproject/branches/projects/android/pjmedia/src/pjmedia-audiodev/android_jni_dev.c)
• pjmedia/src/pjmedia-audiodev/audiodev.c (modified) (2 diffs)
• pjmedia/src/pjmedia-audiodev/opensl_dev.c (copied) (copied from pjproject/branches/projects/android/pjmedia/src/pjmedia-audiodev/opensl_dev.c)

pjproject/trunk/aconfigure

@@ -4695 +4695 @@
 
 case $target in
+    *android*)
+        $as_echo "#define PJ_ANDROID 1" >>confdefs.h
+
+        ;;
     *mingw* | *cygw* | *win32* | *w32* )
         $as_echo "#define PJ_WIN32 1" >>confdefs.h
@@ -5673 +5677 @@
 else
  case $target in
+  *android*)
+        LIBS="$LIBS -lOpenSLES"
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... OpenSL ES" >&5
+$as_echo "Checking sound device backend... OpenSL ES" >&6; }
+        ;;
   arm-apple-darwin*)
         LIBS="$LIBS -framework CoreAudio -framework CoreFoundation -framework AudioToolbox -framework CFNetwork -framework UIKit"
@@ -5752 +5761 @@
 
 case $target in
+ *android*)
+        LIBS="$LIBS -llog -lgcc"
+        ;;
  arm-apple-darwin*)
         LIBS="$LIBS -framework UIKit"

pjproject/trunk/aconfigure.ac

@@ -158 +158 @@
 dnl
 case $target in
+    *android*)
+        AC_DEFINE(PJ_ANDROID,1)
+        ;;
     *mingw* | *cygw* | *win32* | *w32* )
         AC_DEFINE(PJ_WIN32,1)
@@ -570 +573 @@
 else
  case $target in
+  *android*)
+        LIBS="$LIBS -lOpenSLES"
+        AC_MSG_RESULT([Checking sound device backend... OpenSL ES])
+        ;;
   arm-apple-darwin*)
         LIBS="$LIBS -framework CoreAudio -framework CoreFoundation -framework AudioToolbox -framework CFNetwork -framework UIKit"
@@ -635 +642 @@
 
 case $target in
+ *android*)
+        LIBS="$LIBS -llog -lgcc"
+        ;;
  arm-apple-darwin*)
         LIBS="$LIBS -framework UIKit"

pjproject/trunk/config.guess

@@ -1 +1 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-#   Free Software Foundation, Inc.
-
-timestamp='2001-09-04'
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012 Free Software Foundation, Inc.
+
+timestamp='2012-06-17'
 
 # This file is free software; you can redistribute it and/or modify it
@@ -17 +18 @@
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
@@ -25 +25 @@
 # the same distribution terms that you use for the rest of that program.
 
-# Written by Per Bothner <bothner@cygnus.com>.
-# Please send patches to <config-patches@gnu.org>.
+
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
 #
 # This script attempts to guess a canonical system name similar to
@@ -32 +34 @@
 # exits with 0.  Otherwise, it exits with 1.
 #
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 
 me=`echo "$0" | sed -e 's,.*/,,'`
@@ -53 +55 @@
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 Free Software Foundation, Inc.
 
@@ -66 +69 @@
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
@@ -88 +91 @@
 fi
 
-
-dummy=dummy-$$
-trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script.
+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
+# headache to deal with in a portable fashion.
+
 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
 # use `HOST_CC' if defined, but it is deprecated.
 
-set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int dummy(){}" > $dummy.c ;
-        for c in cc gcc c89 ; do
-          ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
-          if test $? = 0 ; then
+# Portable tmp directory creation inspired by the Autoconf team.
+
+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 ;
-        rm -f $dummy.c $dummy.o $dummy.rel ;
         if test x"$CC_FOR_BUILD" = x ; then
           CC_FOR_BUILD=no_compiler_found ;
@@ -111 +126 @@
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac'
+esac ; set_cc_for_build= ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
@@ -128 +143 @@
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
-        # Netbsd (nbsd) targets should (where applicable) match one or
-        # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+        # NetBSD (nbsd) targets should (where applicable) match one or
+        # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
         # *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
         # switched to ELF, *-*-netbsd* would select the old
@@ -135 +150 @@
         # compatibility and a consistent mechanism for selecting the
         # object file format.
-        # Determine the machine/vendor (is the vendor relevant).
-        case "${UNAME_MACHINE}" in
-            amiga) machine=m68k-unknown ;;
-            arm32) machine=arm-unknown ;;
-            atari*) machine=m68k-atari ;;
-            sun3*) machine=m68k-sun ;;
-            mac68k) machine=m68k-apple ;;
-            macppc) machine=powerpc-apple ;;
-            hp3[0-9][05]) machine=m68k-hp ;;
-            ibmrt|romp-ibm) machine=romp-ibm ;;
-            *) machine=${UNAME_MACHINE}-unknown ;;
+        #
+        # Note: NetBSD doesn't particularly care about the vendor
+        # portion of the name.  We always set it to "unknown".
+        sysctl="sysctl -n hw.machine_arch"
+        UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+            /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+        case "${UNAME_MACHINE_ARCH}" in
+            armeb) machine=armeb-unknown ;;
+            arm*) machine=arm-unknown ;;
+            sh3el) machine=shl-unknown ;;
+            sh3eb) machine=sh-unknown ;;
+            sh5el) machine=sh5le-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.
-        case "${UNAME_MACHINE}" in
-            i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
+        case "${UNAME_MACHINE_ARCH}" in
+            arm*|i386|m68k|ns32k|sh3*|sparc|vax)
                 eval $set_cc_for_build
                 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-                        | grep __ELF__ >/dev/null
+                        | grep -q __ELF__
                 then
                     # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
@@ -163 +180 @@
                 ;;
             *)
-                os=netbsd
+                os=netbsd
                 ;;
         esac
         # The OS release
-        release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+        # Debian GNU/NetBSD machines have a different userland, and
+        # 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
+            Debian*)
+                release='-gnu'
+                ;;
+            *)
+                release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+                ;;
+        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}"
-        exit 0 ;;
+        exit ;;
+    *:Bitrig:*:*)
+        UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+        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}
+        exit ;;
+    *:ekkoBSD:*:*)
+        echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+        exit ;;
+    *:SolidBSD:*:*)
+        echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+        exit ;;
+    macppc:MirBSD:*:*)
+        echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+        exit ;;
+    *:MirBSD:*:*)
+        echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+        exit ;;
     alpha:OSF1:*:*)
-        if test $UNAME_RELEASE = "V4.0"; then
+        case $UNAME_RELEASE in
+        *4.0)
                 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-        fi
+                ;;
+        *5.*)
+                UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+                ;;
+        esac
+        # According to Compaq, /usr/sbin/psrinfo has been available on
+        # OSF/1 and Tru64 systems produced since 1995.  I hope that
+        # covers most systems running today.  This code pipes the CPU
+        # types through head -n 1, so we only detect the type of CPU 0.
+        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" ;;
+            "EV4.5 (21064)")
+                UNAME_MACHINE="alpha" ;;
+            "LCA4 (21066/21068)")
+                UNAME_MACHINE="alpha" ;;
+            "EV5 (21164)")
+                UNAME_MACHINE="alphaev5" ;;
+            "EV5.6 (21164A)")
+                UNAME_MACHINE="alphaev56" ;;
+            "EV5.6 (21164PC)")
+                UNAME_MACHINE="alphapca56" ;;
+            "EV5.7 (21164PC)")
+                UNAME_MACHINE="alphapca57" ;;
+            "EV6 (21264)")
+                UNAME_MACHINE="alphaev6" ;;
+            "EV6.7 (21264A)")
+                UNAME_MACHINE="alphaev67" ;;
+            "EV6.8CB (21264C)")
+                UNAME_MACHINE="alphaev68" ;;
+            "EV6.8AL (21264B)")
+                UNAME_MACHINE="alphaev68" ;;
+            "EV6.8CX (21264D)")
+                UNAME_MACHINE="alphaev68" ;;
+            "EV6.9A (21264/EV69A)")
+                UNAME_MACHINE="alphaev69" ;;
+            "EV7 (21364)")
+                UNAME_MACHINE="alphaev7" ;;
+            "EV7.9 (21364A)")
+                UNAME_MACHINE="alphaev79" ;;
+        esac
+        # A Pn.n version is a patched version.
         # A Vn.n version is a released version.
         # 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.
-        cat <<EOF >$dummy.s
-        .data
-\$Lformat:
-        .byte 37,100,45,37,120,10,0     # "%d-%x\n"
-
-        .text
-        .globl main
-        .align 4
-        .ent main
-main:
-        .frame \$30,16,\$26,0
-        ldgp \$29,0(\$27)
-        .prologue 1
-        .long 0x47e03d80 # implver \$0
-        lda \$2,-1
-        .long 0x47e20c21 # amask \$2,\$1
-        lda \$16,\$Lformat
-        mov \$0,\$17
-        not \$1,\$18
-        jsr \$26,printf
-        ldgp \$29,0(\$26)
-        mov 0,\$16
-        jsr \$26,exit
-        .end main
-EOF
-        eval $set_cc_for_build
-        $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
-        if test "$?" = 0 ; then
-                case `./$dummy` in
-                        0-0)
-                                UNAME_MACHINE="alpha"
-                                ;;
-                        1-0)
-                                UNAME_MACHINE="alphaev5"
-                                ;;
-                        1-1)
-                                UNAME_MACHINE="alphaev56"
-                                ;;
-                        1-101)
-                                UNAME_MACHINE="alphapca56"
-                                ;;
-                        2-303)
-                                UNAME_MACHINE="alphaev6"
-                                ;;
-                        2-307)
-                                UNAME_MACHINE="alphaev67"
-                                ;;
-                        2-1307)
-                                UNAME_MACHINE="alphaev68"
-                                ;;
-                esac
-        fi
-        rm -f $dummy.s $dummy
-        echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        exit 0 ;;
+        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?
@@ -241 +282 @@
         # of the specific Alpha model?
         echo alpha-pc-interix
-        exit 0 ;;
+        exit ;;
     21064:Windows_NT:50:3)
         echo alpha-dec-winnt3.5
-        exit 0 ;;
+        exit ;;
     Amiga*:UNIX_System_V:4.0:*)
         echo m68k-unknown-sysv4
-        exit 0;;
-    amiga:OpenBSD:*:*)
-        echo m68k-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *:[Aa]miga[Oo][Ss]:*:*)
         echo ${UNAME_MACHINE}-unknown-amigaos
-        exit 0 ;;
-    arc64:OpenBSD:*:*)
-        echo mips64el-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
-    arc:OpenBSD:*:*)
-        echo mipsel-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
-    hkmips:OpenBSD:*:*)
-        echo mips-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
-    pmax:OpenBSD:*:*)
-        echo mipsel-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
-    sgi:OpenBSD:*:*)
-        echo mips-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-        echo mipsel-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+        echo ${UNAME_MACHINE}-unknown-morphos
+        exit ;;
     *:OS/390:*:*)
         echo i370-ibm-openedition
-        exit 0 ;;
+        exit ;;
+    *:z/VM:*:*)
+        echo s390-ibm-zvmoe
+        exit ;;
+    *:OS400:*:*)
+        echo powerpc-ibm-os400
+        exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
         echo arm-acorn-riscix${UNAME_RELEASE}
-        exit 0;;
+        exit ;;
+    arm:riscos:*:*|arm:RISCOS:*:*)
+        echo arm-unknown-riscos
+        exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
         echo hppa1.1-hitachi-hiuxmpp
-        exit 0;;
+        exit ;;
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
         # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
@@ -288 +320 @@
                 echo pyramid-pyramid-bsd
         fi
-        exit 0 ;;
+        exit ;;
     NILE*:*:*:dcosx)
         echo pyramid-pyramid-svr4
-        exit 0 ;;
+        exit ;;
+    DRS?6000:unix:4.0:6*)
+        echo sparc-icl-nx6
+        exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+        case `/usr/bin/uname -p` in
+            sparc) echo sparc-icl-nx7; exit ;;
+        esac ;;
+    s390x:SunOS:*:*)
+        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/[^.]*//'`
-        exit 0 ;;
+        exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
         echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-        exit 0 ;;
-    i86pc:SunOS:5.*:*)
-        echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-        exit 0 ;;
+        exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+        echo i386-pc-auroraux${UNAME_RELEASE}
+        exit ;;
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+        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
@@ -306 +364 @@
         # it's likely to be more like Solaris than SunOS4.
         echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-        exit 0 ;;
+        exit ;;
     sun4*:SunOS:*:*)
         case "`/usr/bin/arch -k`" in
@@ -315 +373 @@
         # Japanese Language versions have a version number like `4.1.3-JL'.
         echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-        exit 0 ;;
+        exit ;;
     sun3*:SunOS:*:*)
         echo m68k-sun-sunos${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     sun*:*:4.2BSD:*)
-        UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+        UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
         test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
         case "`/bin/arch`" in
@@ -330 +388 @@
                 ;;
         esac
-        exit 0 ;;
+        exit ;;
     aushp:SunOS:*:*)
         echo sparc-auspex-sunos${UNAME_RELEASE}
-        exit 0 ;;
-    sparc*:NetBSD:*)
-        echo `uname -p`-unknown-netbsd${UNAME_RELEASE}
-        exit 0 ;;
-    atari*:OpenBSD:*:*)
-        echo m68k-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
@@ -349 +401 @@
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
+        echo m68k-atari-mint${UNAME_RELEASE}
+        exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
+        echo m68k-atari-mint${UNAME_RELEASE}
+        exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
+        echo m68k-milan-mint${UNAME_RELEASE}
+        exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
+        echo m68k-hades-mint${UNAME_RELEASE}
+        exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
-    sun3*:OpenBSD:*:*)
-        echo m68k-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
-    mac68k:OpenBSD:*:*)
-        echo m68k-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-        echo m68k-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-        echo m88k-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
+        echo m68k-unknown-mint${UNAME_RELEASE}
+        exit ;;
+    m68k:machten:*:*)
+        echo m68k-apple-machten${UNAME_RELEASE}
+        exit ;;
     powerpc:machten:*:*)
         echo powerpc-apple-machten${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     RISC*:Mach:*:*)
         echo mips-dec-mach_bsd4.3
-        exit 0 ;;
+        exit ;;
     RISC*:ULTRIX:*:*)
         echo mips-dec-ultrix${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     VAX*:ULTRIX*:*:*)
         echo vax-dec-ultrix${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     2020:CLIX:*:* | 2430:CLIX:*:*)
         echo clipper-intergraph-clix${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
         eval $set_cc_for_build
@@ -416 +459 @@
         }
 EOF
-        $CC_FOR_BUILD $dummy.c -o $dummy \
-          && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-          && rm -f $dummy.c $dummy && exit 0
-        rm -f $dummy.c $dummy
+        $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}
-        exit 0 ;;
+        exit ;;
     Motorola:PowerMAX_OS:*:*)
         echo powerpc-motorola-powermax
-        exit 0 ;;
+        exit ;;
+    Motorola:*:4.3:PL8-*)
+        echo powerpc-harris-powermax
+        exit ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+        echo powerpc-harris-powermax
+        exit ;;
     Night_Hawk:Power_UNIX:*:*)
         echo powerpc-harris-powerunix
-        exit 0 ;;
+        exit ;;
     m88k:CX/UX:7*:*)
         echo m88k-harris-cxux7
-        exit 0 ;;
+        exit ;;
     m88k:*:4*:R4*)
         echo m88k-motorola-sysv4
-        exit 0 ;;
+        exit ;;
     m88k:*:3*:R3*)
         echo m88k-motorola-sysv3
-        exit 0 ;;
+        exit ;;
     AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
+        # DG/UX returns AViiON for all architectures
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
         if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
         then
@@ -452 +501 @@
             echo i586-dg-dgux${UNAME_RELEASE}
         fi
-        exit 0 ;;
+        exit ;;
     M88*:DolphinOS:*:*) # DolphinOS (SVR3)
         echo m88k-dolphin-sysv3
-        exit 0 ;;
+        exit ;;
     M88*:*:R3*:*)
         # Delta 88k system running SVR3
         echo m88k-motorola-sysv3
-        exit 0 ;;
+        exit ;;
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
         echo m88k-tektronix-sysv3
-        exit 0 ;;
+        exit ;;
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
         echo m68k-tektronix-bsd
-        exit 0 ;;
+        exit ;;
     *:IRIX*:*:*)
         echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-        exit 0 ;;
+        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
-        exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
+        echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+        exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
     i*86:AIX:*:*)
         echo i386-ibm-aix
-        exit 0 ;;
+        exit ;;
     ia64:AIX:*:*)
         if [ -x /usr/bin/oslevel ] ; then
@@ -482 +531 @@
         fi
         echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-        exit 0 ;;
+        exit ;;
     *:AIX:2:3)
         if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
@@ -497 +546 @@
                         }
 EOF
-                $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-                rm -f $dummy.c $dummy
-                echo rs6000-ibm-aix3.2.5
+                if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+                then
+                        echo "$SYSTEM_NAME"
+                else
+                        echo rs6000-ibm-aix3.2.5
+                fi
         elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
                 echo rs6000-ibm-aix3.2.4
@@ -505 +557 @@
                 echo rs6000-ibm-aix3.2
         fi
-        exit 0 ;;
-    *:AIX:*:[45])
-        IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
+        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
                 IBM_ARCH=rs6000
@@ -519 +571 @@
         fi
         echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-        exit 0 ;;
+        exit ;;
     *:AIX:*:*)
         echo rs6000-ibm-aix
-        exit 0 ;;
+        exit ;;
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
         echo romp-ibm-bsd4.4
-        exit 0 ;;
+        exit ;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
         echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-        exit 0 ;;                           # report: romp-ibm BSD 4.3
+        exit ;;                             # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
         echo rs6000-bull-bosx
-        exit 0 ;;
+        exit ;;
     DPX/2?00:B.O.S.:*:*)
         echo m68k-bull-sysv3
-        exit 0 ;;
+        exit ;;
     9000/[34]??:4.3bsd:1.*:*)
         echo m68k-hp-bsd
-        exit 0 ;;
+        exit ;;
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
         echo m68k-hp-bsd4.4
-        exit 0 ;;
+        exit ;;
     9000/[34678]??:HP-UX:*:*)
         HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
@@ -547 +599 @@
             9000/[34]?? )         HP_ARCH=m68k ;;
             9000/[678][0-9][0-9])
-              case "${HPUX_REV}" in
-                11.[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
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-                        esac ;;
-                    esac
-                  fi ;;
-              esac
-              if [ "${HP_ARCH}" = "" ]; then
-              eval $set_cc_for_build
-              sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-                {
-                case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-                case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-                case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-                    switch (bits)
-                        {
-                        case 64: puts ("hppa2.0w"); break;
-                        case 32: puts ("hppa2.0n"); break;
-                        default: puts ("hppa2.0"); break;
-                        } break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-                    puts ("hppa2.0"); break;
-              #endif
-                default: puts ("hppa1.0"); break;
-                }
-                  exit (0);
-              }
+                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
+                      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
+                        esac ;;
+                    esac
+                fi
+                if [ "${HP_ARCH}" = "" ]; then
+                    eval $set_cc_for_build
+                    sed 's/^            //' << EOF >$dummy.c
+
+                #define _HPUX_SOURCE
+                #include <stdlib.h>
+                #include <unistd.h>
+
+                int main ()
+                {
+                #if defined(_SC_KERNEL_BITS)
+                    long bits = sysconf(_SC_KERNEL_BITS);
+                #endif
+                    long cpu  = sysconf (_SC_CPU_VERSION);
+
+                    switch (cpu)
+                        {
+                        case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+                        case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+                        case CPU_PA_RISC2_0:
+                #if defined(_SC_KERNEL_BITS)
+                            switch (bits)
+                                {
+                                case 64: puts ("hppa2.0w"); break;
+                                case 32: puts ("hppa2.0n"); break;
+                                default: puts ("hppa2.0"); break;
+                                } break;
+                #else  /* !defined(_SC_KERNEL_BITS) */
+                            puts ("hppa2.0"); break;
+                #endif
+                        default: puts ("hppa1.0"); break;
+                        }
+                    exit (0);
+                }
 EOF
-            (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
-            if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-            rm -f $dummy.c $dummy
-        fi ;;
+                    (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" ]
+        then
+            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
+            # generating 64-bit code.  GNU and HP use different nomenclature:
+            #
+            # $ CC_FOR_BUILD=cc ./config.guess
+            # => hppa2.0w-hp-hpux11.23
+            # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+            # => hppa64-hp-hpux11.23
+
+            if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+                grep -q __LP64__
+            then
+                HP_ARCH="hppa2.0w"
+            else
+                HP_ARCH="hppa64"
+            fi
+        fi
         echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-        exit 0 ;;
+        exit ;;
     ia64:HP-UX:*:*)
         HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
         echo ia64-hp-hpux${HPUX_REV}
-        exit 0 ;;
+        exit ;;
     3050*:HI-UX:*:*)
         eval $set_cc_for_build
@@ -636 +706 @@
         }
 EOF
-        $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-        rm -f $dummy.c $dummy
+        $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+                { echo "$SYSTEM_NAME"; exit; }
         echo unknown-hitachi-hiuxwe2
-        exit 0 ;;
+        exit ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
         echo hppa1.1-hp-bsd
-        exit 0 ;;
+        exit ;;
     9000/8??:4.3bsd:*:*)
         echo hppa1.0-hp-bsd
-        exit 0 ;;
+        exit ;;
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
         echo hppa1.0-hp-mpeix
-        exit 0 ;;
+        exit ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
         echo hppa1.1-hp-osf
-        exit 0 ;;
+        exit ;;
     hp8??:OSF1:*:*)
         echo hppa1.0-hp-osf
-        exit 0 ;;
+        exit ;;
     i*86:OSF1:*:*)
         if [ -x /usr/sbin/sysversion ] ; then
@@ -661 +731 @@
             echo ${UNAME_MACHINE}-unknown-osf1
         fi
-        exit 0 ;;
+        exit ;;
     parisc*:Lites*:*:*)
         echo hppa1.1-hp-lites
-        exit 0 ;;
-    hppa*:OpenBSD:*:*)
-        echo hppa-unknown-openbsd
-        exit 0 ;;
+        exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
         echo c1-convex-bsd
-        exit 0 ;;
+        exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
         if getsysinfo -f scalar_acc
@@ -676 +743 @@
         else echo c2-convex-bsd
         fi
-        exit 0 ;;
+        exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
         echo c34-convex-bsd
-        exit 0 ;;
+        exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
         echo c38-convex-bsd
-        exit 0 ;;
+        exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
         echo c4-convex-bsd
-        exit 0 ;;
-    CRAY*X-MP:*:*:*)
-        echo xmp-cray-unicos
-        exit 0 ;;
+        exit ;;
     CRAY*Y-MP:*:*:*)
         echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-        exit 0 ;;
+        exit ;;
     CRAY*[A-Z]90:*:*:*)
         echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
@@ -697 +761 @@
               -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
               -e 's/\.[^.]*$/.X/'
-        exit 0 ;;
+        exit ;;
     CRAY*TS:*:*:*)
         echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-        exit 0 ;;
-    CRAY*T3D:*:*:*)
-        echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-        exit 0 ;;
+        exit ;;
     CRAY*T3E:*:*:*)
         echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-        exit 0 ;;
+        exit ;;
     CRAY*SV1:*:*:*)
         echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-        exit 0 ;;
-    CRAY-2:*:*:*)
-        echo cray2-cray-unicos
-        exit 0 ;;
+        exit ;;
+    *:UNICOS/mp:*:*)
+        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/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
-    hp300:OpenBSD:*:*)
-        echo m68k-unknown-openbsd${UNAME_RELEASE}
-        exit 0 ;;
+        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/ /_/'`
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
         echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     sparc*:BSD/OS:*:*)
         echo sparc-unknown-bsdi${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *:BSD/OS:*:*)
         echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *:FreeBSD:*:*)
-        echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-        exit 0 ;;
-    *:OpenBSD:*:*)
-        echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-        exit 0 ;;
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
+        case ${UNAME_PROCESSOR} in
+            amd64)
+                echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+            *)
+                echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+        esac
+        exit ;;
     i*:CYGWIN*:*)
         echo ${UNAME_MACHINE}-pc-cygwin
-        exit 0 ;;
-    i*:MINGW*:*)
+        exit ;;
+    *:MINGW*:*)
         echo ${UNAME_MACHINE}-pc-mingw32
-        exit 0 ;;
+        exit ;;
+    i*: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
-        exit 0 ;;
+        exit ;;
+    *:Interix*:*)
+        case ${UNAME_MACHINE} in
+            x86)
+                echo i586-pc-interix${UNAME_RELEASE}
+                exit ;;
+            authenticamd | genuineintel | EM64T)
+                echo x86_64-unknown-interix${UNAME_RELEASE}
+                exit ;;
+            IA64)
+                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 i386-pc-interix
-        exit 0 ;;
+        echo i586-pc-interix
+        exit ;;
     i*:UWIN*:*)
         echo ${UNAME_MACHINE}-pc-uwin
-        exit 0 ;;
+        exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+        echo x86_64-unknown-cygwin
+        exit ;;
     p*:CYGWIN*:*)
         echo powerpcle-unknown-cygwin
-        exit 0 ;;
+        exit ;;
     prep*:SunOS:5.*:*)
         echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-        exit 0 ;;
+        exit ;;
     *:GNU:*:*)
+        # the GNU system
         echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-        exit 0 ;;
+        exit ;;
+    *:GNU/*:*:*)
+        # other systems with GNU libc and userland
+        echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+        exit ;;
     i*86:Minix:*:*)
         echo ${UNAME_MACHINE}-pc-minix
-        exit 0 ;;
-    arm*:Linux:*:*)
+        exit ;;
+    aarch64:Linux:*:*)
         echo ${UNAME_MACHINE}-unknown-linux-gnu
-        exit 0 ;;
-    ia64:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux
-        exit 0 ;;
-    m68*:Linux:*:*)
+        exit ;;
+    aarch64_be:Linux:*:*)
+        UNAME_MACHINE=aarch64_be
         echo ${UNAME_MACHINE}-unknown-linux-gnu
-        exit 0 ;;
-    mips:Linux:*:*)
-        case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
-          big)    echo mips-unknown-linux-gnu && exit 0 ;;
-          little) echo mipsel-unknown-linux-gnu && exit 0 ;;
-        esac
-        ;;
-    ppc:Linux:*:*)
-        echo powerpc-unknown-linux-gnu
-        exit 0 ;;
-    ppc64:Linux:*:*)
-        echo powerpc64-unknown-linux-gnu
-        exit 0 ;;
+        exit ;;
     alpha:Linux:*:*)
         case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -797 +882 @@
           EV67)  UNAME_MACHINE=alphaev67 ;;
           EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-        objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+        esac
+        objdump --private-headers /bin/sh | grep -q ld.so.1
         if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
         echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-        exit 0 ;;
+        exit ;;
+    arm*:Linux:*:*)
+        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-gnu
+        else
+            if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+                | grep -q __ARM_PCS_VFP
+            then
+                echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+            else
+                echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+            fi
+        fi
+        exit ;;
+    avr32*:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        exit ;;
+    cris:Linux:*:*)
+        echo ${UNAME_MACHINE}-axis-linux-gnu
+        exit ;;
+    crisv32:Linux:*:*)
+        echo ${UNAME_MACHINE}-axis-linux-gnu
+        exit ;;
+    frv:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        exit ;;
+    hexagon:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        exit ;;
+    i*86:Linux:*:*)
+        LIBC=gnu
+        eval $set_cc_for_build
+        sed 's/^        //' << EOF >$dummy.c
+        #ifdef __dietlibc__
+        LIBC=dietlibc
+        #endif
+EOF
+        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+        echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+        exit ;;
+    ia64:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        exit ;;
+    m32r*:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        exit ;;
+    m68*:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        exit ;;
+    mips:Linux:*:* | mips64:Linux:*:*)
+        eval $set_cc_for_build
+        sed 's/^        //' << EOF >$dummy.c
+        #undef CPU
+        #undef ${UNAME_MACHINE}
+        #undef ${UNAME_MACHINE}el
+        #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+        CPU=${UNAME_MACHINE}el
+        #else
+        #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+        CPU=${UNAME_MACHINE}
+        #else
+        CPU=
+        #endif
+        #endif
+EOF
+        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+        test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+        ;;
+    or32:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        exit ;;
+    padre:Linux:*:*)
+        echo sparc-unknown-linux-gnu
+        exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+        echo hppa64-unknown-linux-gnu
+        exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
         # Look for CPU level
@@ -809 +973 @@
           *)    echo hppa-unknown-linux-gnu ;;
         esac
-        exit 0 ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-        echo hppa64-unknown-linux-gnu
-        exit 0 ;;
+        exit ;;
+    ppc64:Linux:*:*)
+        echo powerpc64-unknown-linux-gnu
+        exit ;;
+    ppc:Linux:*:*)
+        echo powerpc-unknown-linux-gnu
+        exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
         echo ${UNAME_MACHINE}-ibm-linux
-        exit 0 ;;
+        exit ;;
+    sh64*:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        exit ;;
     sh*:Linux:*:*)
         echo ${UNAME_MACHINE}-unknown-linux-gnu
-        exit 0 ;;
+        exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
         echo ${UNAME_MACHINE}-unknown-linux-gnu
-        exit 0 ;;
+        exit ;;
+    tile*:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        exit ;;
+    vax:Linux:*:*)
+        echo ${UNAME_MACHINE}-dec-linux-gnu
+        exit ;;
     x86_64:Linux:*:*)
-        echo x86_64-unknown-linux-gnu
-        exit 0 ;;
-    i*86:Linux:*:*)
-        # The BFD linker knows what the default object file format is, so
-        # first see if it will tell us. cd to the root directory to prevent
-        # problems with other programs or directories called `ld' in the path.
-        ld_supported_targets=`cd /; ld --help 2>&1 \
-                         | sed -ne '/supported targets:/!d
-                                    s/[         ][      ]*/ /g
-                                    s/.*supported targets: *//
-                                    s/ .*//
-                                    p'`
-        case "$ld_supported_targets" in
-          elf32-i386)
-                TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-                ;;
-          a.out-i386-linux)
-                echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-                exit 0 ;;               
-          coff-i386)
-                echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-                exit 0 ;;
-          "")
-                # Either a pre-BFD a.out linker (linux-gnuoldld) or
-                # one that does not give us useful --help.
-                echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-                exit 0 ;;
-        esac
-        # Determine whether the default compiler is a.out or elf
-        eval $set_cc_for_build
-        cat >$dummy.c <<EOF
-#include <features.h>
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-        int main (int argc, char *argv[]) {
-#else
-        int main (argc, argv) int argc; char *argv[]; {
-#endif
-#ifdef __ELF__
-# ifdef __GLIBC__
-#  if __GLIBC__ >= 2
-    printf ("%s-pc-linux-gnu\n", argv[1]);
-#  else
-    printf ("%s-pc-linux-gnulibc1\n", argv[1]);
-#  endif
-# else
-   printf ("%s-pc-linux-gnulibc1\n", argv[1]);
-# endif
-#else
-  printf ("%s-pc-linux-gnuaout\n", argv[1]);
-#endif
-  return 0;
-}
-EOF
-        $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
-        rm -f $dummy.c $dummy
-        test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-        ;;
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        exit ;;
+    xtensa*:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        exit ;;
     i*86:DYNIX/ptx:4*:*)
         # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -886 +1009 @@
         # sysname and nodename.
         echo i386-sequent-sysv4
-        exit 0 ;;
+        exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
+        # Unixware is an offshoot of SVR4, but it has its own version
+        # number series starting with 2...
+        # 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.
+        # Use sysv4.2uw... so that sysv4* matches it.
         echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-        exit 0 ;;
+        exit ;;
+    i*86:OS/2:*:*)
+        # If we were able to find `uname', then EMX Unix compatibility
+        # is probably installed.
+        echo ${UNAME_MACHINE}-pc-os2-emx
+        exit ;;
+    i*86:XTS-300:*:STOP)
+        echo ${UNAME_MACHINE}-unknown-stop
+        exit ;;
+    i*86:atheos:*:*)
+        echo ${UNAME_MACHINE}-unknown-atheos
+        exit ;;
+    i*86:syllable:*:*)
+        echo ${UNAME_MACHINE}-pc-syllable
+        exit ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+        echo i386-unknown-lynxos${UNAME_RELEASE}
+        exit ;;
+    i*86:*DOS:*:*)
+        echo ${UNAME_MACHINE}-pc-msdosdjgpp
+        exit ;;
     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
         UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
@@ -902 +1045 @@
                 echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
         fi
-        exit 0 ;;
-    i*86:*:5:[78]*)
+        exit ;;
+    i*86:*:5:[678]*)
+        # UnixWare 7.x, OpenUNIX and OpenServer 6.
         case `/bin/uname -X | grep "^Machine"` in
             *486*)           UNAME_MACHINE=i486 ;;
@@ -910 +1054 @@
         esac
         echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-        exit 0 ;;
+        exit ;;
     i*86:*:3.2:*)
         if test -f /usr/options/cb.name; then
@@ -916 +1060 @@
                 echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
         elif /bin/uname -X 2>/dev/null >/dev/null ; then
-                UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
-                (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-                (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+                UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+                (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+                (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
                         && UNAME_MACHINE=i586
-                (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
+                (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
                         && UNAME_MACHINE=i686
-                (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
+                (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
                         && UNAME_MACHINE=i686
                 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
@@ -928 +1072 @@
                 echo ${UNAME_MACHINE}-pc-sysv32
         fi
-        exit 0 ;;
-    i*86:*DOS:*:*)
-        echo ${UNAME_MACHINE}-pc-msdosdjgpp
-        exit 0 ;;
+        exit ;;
     pc:*:*:*)
         # Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-        echo i386-pc-msdosdjgpp
-        exit 0 ;;
+        # 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 configury will decide that
+        # this is a cross-build.
+        echo i586-pc-msdosdjgpp
+        exit ;;
     Intel:Mach:3*:*)
         echo i386-pc-mach3
-        exit 0 ;;
+        exit ;;
     paragon:*:*:*)
         echo i860-intel-osf1
-        exit 0 ;;
+        exit ;;
     i860:*:4.*:*) # i860-SVR4
         if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
@@ -950 +1094 @@
           echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
         fi
-        exit 0 ;;
+        exit ;;
     mini*:CTIX:SYS*5:*)
         # "miniframe"
         echo m68010-convergent-sysv
-        exit 0 ;;
-    M68*:*:R3V[567]*:*)
-        test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+        exit ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+        echo m68k-convergent-sysv
+        exit ;;
+    M680?0:D-NIX:5.3:*)
+        echo m68k-diab-dnix
+        exit ;;
+    M68*:*:R3V[5678]*:*)
+        test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
         OS_REL=''
         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 0
+          && { 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 0 ;;
+          && { 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 0 ;;
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+          && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+        OS_REL='.3'
+        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; }
+        /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+            && { 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; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
         echo m68k-unknown-lynxos${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     mc68030:UNIX_System_V:4.*:*)
         echo m68k-atari-sysv4
-        exit 0 ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-        echo i386-unknown-lynxos${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     TSUNAMI:LynxOS:2.*:*)
         echo sparc-unknown-lynxos${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     rs6000:LynxOS:2.*:*)
         echo rs6000-unknown-lynxos${UNAME_RELEASE}
-        exit 0 ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+        exit ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
         echo powerpc-unknown-lynxos${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     SM[BE]S:UNIX_SV:*:*)
         echo mips-dde-sysv${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     RM*:ReliantUNIX-*:*:*)
         echo mips-sni-sysv4
-        exit 0 ;;
+        exit ;;
     RM*:SINIX-*:*:*)
         echo mips-sni-sysv4
-        exit 0 ;;
+        exit ;;
     *:SINIX-*:*:*)
         if uname -p 2>/dev/null >/dev/null ; then
@@ -1002 +1159 @@
                 echo ns32k-sni-sysv
         fi
-        exit 0 ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit 0 ;;
+        exit ;;
+    PENTIUM:*:4.0*:*)   # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                        # says <Richard.M.Bartel@ccMail.Census.GOV>
+        echo i586-unisys-sysv4
+        exit ;;
     *:UNIX_System_V:4*:FTX*)
         # From Gerald Hewes <hewes@openmarket.com>.
         # How about differentiating between stratus architectures? -djm
         echo hppa1.1-stratus-sysv4
-        exit 0 ;;
+        exit ;;
     *:*:*:FTX*)
         # From seanf@swdc.stratus.com.
         echo i860-stratus-sysv4
-        exit 0 ;;
+        exit ;;
+    i*86:VOS:*:*)
+        # From Paul.Green@stratus.com.
+        echo ${UNAME_MACHINE}-stratus-vos
+        exit ;;
     *:VOS:*:*)
         # From Paul.Green@stratus.com.
         echo hppa1.1-stratus-vos
-        exit 0 ;;
+        exit ;;
     mc68*:A/UX:*:*)
         echo m68k-apple-aux${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     news*:NEWS-OS:6*:*)
         echo mips-sony-newsos6
-        exit 0 ;;
+        exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000: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}
-        fi
-        exit 0 ;;
+                echo mips-unknown-sysv${UNAME_RELEASE}
+        fi
+        exit ;;
     BeBox:BeOS:*:*)     # BeOS running on hardware made by Be, PPC only.
         echo powerpc-be-beos
-        exit 0 ;;
+        exit ;;
     BeMac:BeOS:*:*)     # BeOS running on Mac or Mac clone, PPC only.
         echo powerpc-apple-beos
-        exit 0 ;;
+        exit ;;
     BePC:BeOS:*:*)      # BeOS running on Intel PC compatible.
         echo i586-pc-beos
-        exit 0 ;;
+        exit ;;
+    BePC:Haiku:*:*)     # Haiku running on Intel PC compatible.
+        echo i586-pc-haiku
+        exit ;;
     SX-4:SUPER-UX:*:*)
         echo sx4-nec-superux${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     SX-5:SUPER-UX:*:*)
         echo sx5-nec-superux${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
+    SX-6:SUPER-UX:*:*)
+        echo sx6-nec-superux${UNAME_RELEASE}
+        exit ;;
+    SX-7:SUPER-UX:*:*)
+        echo sx7-nec-superux${UNAME_RELEASE}
+        exit ;;
+    SX-8:SUPER-UX:*:*)
+        echo sx8-nec-superux${UNAME_RELEASE}
+        exit ;;
+    SX-8R:SUPER-UX:*:*)
+        echo sx8r-nec-superux${UNAME_RELEASE}
+        exit ;;
     Power*:Rhapsody:*:*)
         echo powerpc-apple-rhapsody${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *:Rhapsody:*:*)
         echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *:Darwin:*:*)
-        echo `uname -p`-apple-darwin${UNAME_RELEASE}
-        exit 0 ;;
+        UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+        case $UNAME_PROCESSOR in
+            i386)
+                eval $set_cc_for_build
+                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
+                  then
+                      UNAME_PROCESSOR="x86_64"
+                  fi
+                fi ;;
+            unknown) UNAME_PROCESSOR=powerpc ;;
+        esac
+        echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+        exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
-        if test "${UNAME_MACHINE}" = "x86pc"; then
+        UNAME_PROCESSOR=`uname -p`
+        if test "$UNAME_PROCESSOR" = "x86"; then
+                UNAME_PROCESSOR=i386
                 UNAME_MACHINE=pc
         fi
-        echo `uname -p`-${UNAME_MACHINE}-nto-qnx
-        exit 0 ;;
+        echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+        exit ;;
     *:QNX:*:4*)
         echo i386-pc-qnx
-        exit 0 ;;
-    NSR-[KW]:NONSTOP_KERNEL:*:*)
+        exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+        echo neo-tandem-nsk${UNAME_RELEASE}
+        exit ;;
+    NSE-*:NONSTOP_KERNEL:*:*)
+        echo nse-tandem-nsk${UNAME_RELEASE}
+        exit ;;
+    NSR-?:NONSTOP_KERNEL:*:*)
         echo nsr-tandem-nsk${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *:NonStop-UX:*:*)
         echo mips-compaq-nonstopux
-        exit 0 ;;
+        exit ;;
     BS2000:POSIX*:*:*)
         echo bs2000-siemens-sysv
-        exit 0 ;;
+        exit ;;
     DS/*:UNIX_System_V:*:*)
         echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *:Plan9:*:*)
         # "uname -m" is not consistent, so use $cputype instead. 386
@@ -1088 +1286 @@
         fi
         echo ${UNAME_MACHINE}-unknown-plan9
-        exit 0 ;;
-    i*86:OS/2:*:*)
-        # If we were able to find `uname', then EMX Unix compatibility
-        # is probably installed.
-        echo ${UNAME_MACHINE}-pc-os2-emx
-        exit 0 ;;
+        exit ;;
     *:TOPS-10:*:*)
         echo pdp10-unknown-tops10
-        exit 0 ;;
+        exit ;;
     *:TENEX:*:*)
         echo pdp10-unknown-tenex
-        exit 0 ;;
+        exit ;;
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
         echo pdp10-dec-tops20
-        exit 0 ;;
+        exit ;;
     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
         echo pdp10-xkl-tops20
-        exit 0 ;;
+        exit ;;
     *:TOPS-20:*:*)
         echo pdp10-unknown-tops20
-        exit 0 ;;
+        exit ;;
     *:ITS:*:*)
         echo pdp10-unknown-its
-        exit 0 ;;
-    i*86:XTS-300:*:STOP)
-        echo ${UNAME_MACHINE}-unknown-stop
-        exit 0 ;;
-    i*86:atheos:*:*)
-        echo ${UNAME_MACHINE}-unknown-atheos
-        exit 0 ;;
+        exit ;;
+    SEI:*:*:SEIUX)
+        echo mips-sei-seiux${UNAME_RELEASE}
+        exit ;;
+    *:DragonFly:*:*)
+        echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+        exit ;;
+    *:*VMS:*:*)
+        UNAME_MACHINE=`(uname -p) 2>/dev/null`
+        case "${UNAME_MACHINE}" in
+            A*) echo alpha-dec-vms ; exit ;;
+            I*) echo ia64-dec-vms ; exit ;;
+            V*) echo vax-dec-vms ; exit ;;
+        esac ;;
+    *:XENIX:*:SysV)
+        echo i386-pc-xenix
+        exit ;;
+    i*86:skyos:*:*)
+        echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+        exit ;;
+    i*86:rdos:*:*)
+        echo ${UNAME_MACHINE}-pc-rdos
+        exit ;;
+    i*86:AROS:*:*)
+        echo ${UNAME_MACHINE}-pc-aros
+        exit ;;
+    x86_64:VMkernel:*:*)
+        echo ${UNAME_MACHINE}-unknown-esx
+        exit ;;
 esac
 
@@ -1140 +1355 @@
   printf ("m68k-sony-newsos%s\n",
 #ifdef NEWSOS4
-          "4"
+        "4"
 #else
-          ""
-#endif
-         ); exit (0);
+        ""
+#endif
+        ); exit (0);
 #endif
 #endif
 
 #if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
+  printf ("arm-acorn-riscix\n"); exit (0);
 #endif
 
@@ -1238 +1453 @@
 EOF
 
-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
-rm -f $dummy.c $dummy
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+        { echo "$SYSTEM_NAME"; exit; }
 
 # Apollos put the system type in the environment.
 
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
 
 # Convex versions that predate uname can use getsysinfo(1)
@@ -1252 +1467 @@
     c1*)
         echo c1-convex-bsd
-        exit 0 ;;
+        exit ;;
     c2*)
         if getsysinfo -f scalar_acc
@@ -1258 +1473 @@
         else echo c2-convex-bsd
         fi
-        exit 0 ;;
+        exit ;;
     c34*)
         echo c34-convex-bsd
-        exit 0 ;;
+        exit ;;
     c38*)
         echo c38-convex-bsd
-        exit 0 ;;
+        exit ;;
     c4*)
         echo c4-convex-bsd
-        exit 0 ;;
+        exit ;;
     esac
 fi
@@ -1278 +1493 @@
 download the most up to date version of the config scripts from
 
-    ftp://ftp.gnu.org/pub/gnu/config/
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+and
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 
 If the version you run ($0) is already up to date, please

pjproject/trunk/config.sub

@@ -2 +2 @@
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-
-timestamp='2005-04-22'
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012 Free Software Foundation, Inc.
+
+timestamp='2012-06-17'
 
 # This file is (in principle) common to ALL GNU software.
@@ -21 +22 @@
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
+# 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
@@ -30 +29 @@
 # the same distribution terms that you use for the rest of that program.
 
+
 # Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# diff and a properly formatted GNU ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
@@ -37 +37 @@
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.
+
+# You can get the latest version of this script from:
+# 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
@@ -71 +74 @@
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 Free Software Foundation, Inc.
 
@@ -84 +88 @@
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
@@ -100 +104 @@
        # First pass through any local machine types.
        echo $1
-       exit 0;;
+       exit ;;
 
     * )
@@ -119 +123 @@
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
+  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
     ;;
   *)
@@ -146 +157 @@
         -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
         -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-        -apple | -axis | -knuth | -cray)
+        -apple | -axis | -knuth | -cray | -microblaze)
                 os=
                 basic_machine=$1
+                ;;
+        -bluegene*)
+                os=-cnk
                 ;;
         -sim | -cisco | -oki | -wec | -winbond)
@@ -164 +178 @@
                 basic_machine=$1
                 ;;
-        -chorusrdb)
-                os=-chorusrdb
+        -chorusrdb)
+                os=-chorusrdb
                 basic_machine=$1
-                ;;
+                ;;
         -hiux*)
                 os=-hiuxwe2
+                ;;
+        -sco6)
+                os=-sco5v6
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
                 ;;
         -sco5)
@@ -187 +205 @@
                 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
@@ -203 +225 @@
         -isc*)
                 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                ;;
+        -lynx*178)
+                os=-lynxos178
+                ;;
+        -lynx*5)
+                os=-lynxos5
                 ;;
         -lynx*)
@@ -228 +256 @@
         1750a | 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 | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+        | be32 | be64 \
         | bfin \
         | c4x | clipper \
         | d10v | d30v | dlx | dsp16xx \
-        | fr30 | frv \
+        | epiphany \
+        | fido | fr30 | frv \
         | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+        | hexagon \
         | i370 | i860 | i960 | ia64 \
         | ip2k | iq2000 \
-        | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
+        | le32 | le64 \
+        | lm32 \
+        | m32c | m32r | m32rle | m68000 | m68k | m88k \
+        | maxq | mb | microblaze | mcore | mep | metag \
         | mips | mipsbe | mipseb | mipsel | mipsle \
         | mips16 \
         | mips64 | mips64el \
+        | mips64octeon | mips64octeonel \
+        | mips64orion | mips64orionel \
+        | mips64r5900 | mips64r5900el \
         | mips64vr | mips64vrel \
-        | mips64orion | mips64orionel \
         | mips64vr4100 | mips64vr4100el \
         | mips64vr4300 | mips64vr4300el \
         | mips64vr5000 | mips64vr5000el \
+        | mips64vr5900 | mips64vr5900el \
         | mipsisa32 | mipsisa32el \
         | mipsisa32r2 | mipsisa32r2el \
@@ -256 +294 @@
         | mipstx39 | mipstx39el \
         | mn10200 | mn10300 \
+        | moxie \
+        | mt \
         | msp430 \
+        | nds32 | nds32le | nds32be \
+        | nios | nios2 \
         | ns16k | ns32k \
-        | openrisc | or32 \
+        | open8 \
+        | or32 \
         | pdp10 | pdp11 | pj | pjl \
-        | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+        | powerpc | powerpc64 | powerpc64le | powerpcle \
         | pyramid \
-        | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+        | 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 | sparc86x | sparclet | sparclite \
-        | sparcv8 | sparcv9 | sparcv9b \
-        | strongarm \
-        | tahoe | thumb | tic4x | tic80 | tron \
-        | v850 | v850e \
+        | 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 \
         | we32k \
-        | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
-        | z8k)
+        | x86 | xc16x | xstormy16 | xtensa \
+        | z8k | z80)
                 basic_machine=$basic_machine-unknown
                 ;;
-        m6811 | m68hc11 | m6812 | m68hc12)
-                # Motorola 68HC11/12.
+        c54x)
+                basic_machine=tic54x-unknown
+                ;;
+        c55x)
+                basic_machine=tic55x-unknown
+                ;;
+        c6x)
+                basic_machine=tic6x-unknown
+                ;;
+        m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
                 basic_machine=$basic_machine-unknown
                 os=-none
                 ;;
         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
                 ;;
 
@@ -296 +368 @@
         580-* \
         | a29k-* \
+        | aarch64-* | aarch64_be-* \
         | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
         | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
         | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
         | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-        | avr-* \
+        | avr-* | avr32-* \
+        | be32-* | be64-* \
         | bfin-* | bs2000-* \
-        | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+        | c[123]* | c30-* | [cjt]90-* | c4x-* \
         | clipper-* | craynv-* | cydra-* \
         | d10v-* | d30v-* | dlx-* \
         | elxsi-* \
-        | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+        | 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-* \
-        | m32r-* | m32rle-* \
+        | le32-* | le64-* \
+        | lm32-* \
+        | m32c-* | m32r-* | m32rle-* \
         | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-        | m88110-* | m88k-* | maxq-* | mcore-* \
+        | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
         | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
         | mips16-* \
         | mips64-* | mips64el-* \
+        | mips64octeon-* | mips64octeonel-* \
+        | mips64orion-* | mips64orionel-* \
+        | mips64r5900-* | mips64r5900el-* \
         | mips64vr-* | mips64vrel-* \
-        | mips64orion-* | mips64orionel-* \
         | mips64vr4100-* | mips64vr4100el-* \
         | mips64vr4300-* | mips64vr4300el-* \
         | mips64vr5000-* | mips64vr5000el-* \
+        | mips64vr5900-* | mips64vr5900el-* \
         | mipsisa32-* | mipsisa32el-* \
         | mipsisa32r2-* | mipsisa32r2el-* \
@@ -330 +410 @@
         | mipstx39-* | mipstx39el-* \
         | mmix-* \
+        | mt-* \
         | msp430-* \
+        | nds32-* | nds32le-* | nds32be-* \
+        | nios-* | nios2-* \
         | none-* | np1-* | ns16k-* | ns32k-* \
+        | open8-* \
         | orion-* \
         | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
         | pyramid-* \
-        | romp-* | rs6000-* \
-        | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+        | 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-* | sparc86x-* | sparclet-* \
+        | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
         | sparclite-* \
-        | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-        | tahoe-* | thumb-* \
+        | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+        | tahoe-* \
         | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+        | tile*-* \
         | tron-* \
-        | v850-* | v850e-* | vax-* \
+        | ubicom32-* \
+        | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+        | vax-* \
         | we32k-* \
-        | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-        | xstormy16-* | xtensa-* \
+        | x86-* | x86_64-* | xc16x-* | xps100-* \
+        | xstormy16-* | xtensa*-* \
         | ymp-* \
-        | z8k-*)
+        | 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
@@ -368 +459 @@
                 os=-udi
                 ;;
-        abacus)
+        abacus)
                 basic_machine=abacus-unknown
                 ;;
@@ -414 +505 @@
                 os=-bsd
                 ;;
+        aros)
+                basic_machine=i386-pc
+                os=-aros
+                ;;
         aux)
                 basic_machine=m68k-apple
@@ -422 +517 @@
                 os=-dynix
                 ;;
+        blackfin)
+                basic_machine=bfin-unknown
+                os=-linux
+                ;;
+        blackfin-*)
+                basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+                os=-linux
+                ;;
+        bluegene*)
+                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
@@ -454 +574 @@
                 os=-unicosmp
                 ;;
-        cr16c)
-                basic_machine=cr16c-unknown
+        cr16 | cr16-*)
+                basic_machine=cr16-unknown
                 os=-elf
                 ;;
@@ -493 +613 @@
                 os=-sysv3
                 ;;
+        dicos)
+                basic_machine=i686-pc
+                os=-dicos
+                ;;
         djgpp)
                 basic_machine=i586-pc
@@ -608 +732 @@
                 basic_machine=i370-ibm
                 ;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
         i*86v32)
                 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
@@ -647 +770 @@
                 os=-sysv
                 ;;
+        m68knommu)
+                basic_machine=m68k-unknown
+                os=-linux
+                ;;
+        m68knommu-*)
+                basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+                os=-linux
+                ;;
         m88k-omron*)
                 basic_machine=m88k-omron
@@ -658 +789 @@
                 os=-sysv
                 ;;
+        microblaze)
+                basic_machine=microblaze-xilinx
+                ;;
         mingw32)
                 basic_machine=i386-pc
                 os=-mingw32
                 ;;
+        mingw32ce)
+                basic_machine=arm-unknown
+                os=-mingw32ce
+                ;;
         miniframe)
                 basic_machine=m68000-convergent
@@ -687 +825 @@
                 os=-msdos
                 ;;
+        ms1-*)
+                basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+                ;;
+        msys)
+                basic_machine=i386-pc
+                os=-msys
+                ;;
         mvs)
                 basic_machine=i370-ibm
                 os=-mvs
+                ;;
+        nacl)
+                basic_machine=le32-unknown
+                os=-nacl
                 ;;
         ncr3000)
@@ -755 +904 @@
                 basic_machine=np1-gould
                 ;;
+        neo-tandem)
+                basic_machine=neo-tandem
+                ;;
+        nse-tandem)
+                basic_machine=nse-tandem
+                ;;
         nsr-tandem)
                 basic_machine=nsr-tandem
@@ -762 +917 @@
                 os=-proelf
                 ;;
-        or32 | or32-*)
+        openrisc | openrisc-*)
                 basic_machine=or32-unknown
-                os=-coff
                 ;;
         os400)
@@ -786 +940 @@
                 os=-osf
                 ;;
+        parisc)
+                basic_machine=hppa-unknown
+                os=-linux
+                ;;
+        parisc-*)
+                basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+                os=-linux
+                ;;
         pbd)
                 basic_machine=sparc-tti
@@ -795 +957 @@
                 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
@@ -824 +992 @@
         power)  basic_machine=power-ibm
                 ;;
-        ppc)    basic_machine=powerpc-unknown
-                ;;
-        ppc-*)  basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+        ppc | ppcbe)    basic_machine=powerpc-unknown
+                ;;
+        ppc-* | ppcbe-*)
+                basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
         ppcle | powerpclittle | ppc-le | powerpc-little)
@@ -851 +1020 @@
                 os=-pw32
                 ;;
+        rdos)
+                basic_machine=i386-pc
+                os=-rdos
+                ;;
         rom68k)
                 basic_machine=m68k-rom68k
@@ -877 +1050 @@
                 basic_machine=mipsisa64sb1el-unknown
                 ;;
+        sde)
+                basic_machine=mipsisa32-sde
+                os=-elf
+                ;;
         sei)
                 basic_machine=mips-sei
@@ -888 +1065 @@
                 os=-hms
                 ;;
+        sh5el)
+                basic_machine=sh5le-unknown
+                ;;
         sh64)
                 basic_machine=sh64-unknown
@@ -909 +1089 @@
                 os=-sysv4
                 ;;
+        strongarm-* | thumb-*)
+                basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
         sun2)
                 basic_machine=m68000-sun
@@ -965 +1148 @@
                 os=-unicos
                 ;;
-        tic54x | c54x*)
-                basic_machine=tic54x-unknown
-                os=-coff
-                ;;
-        tic55x | c55x*)
-                basic_machine=tic55x-unknown
-                os=-coff
-                ;;
-        tic6x | c6x*)
-                basic_machine=tic6x-unknown
-                os=-coff
+        tile*)
+                basic_machine=$basic_machine-unknown
+                os=-linux-gnu
                 ;;
         tx39)
@@ -1044 +1219 @@
                 basic_machine=xps100-honeywell
                 ;;
+        xscale-* | xscalee[bl]-*)
+                basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+                ;;
         ymp)
                 basic_machine=ymp-cray
@@ -1050 +1228 @@
         z8k-*-coff)
                 basic_machine=z8k-unknown
+                os=-sim
+                ;;
+        z80-*-coff)
+                basic_machine=z80-unknown
                 os=-sim
                 ;;
@@ -1090 +1272 @@
                 basic_machine=we32k-att
                 ;;
-        sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+        sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
                 basic_machine=sh-unknown
                 ;;
-        sh64)
-                basic_machine=sh64-unknown
-                ;;
-        sparc | sparcv8 | sparcv9 | sparcv9b)
+        sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
                 basic_machine=sparc-sun
                 ;;
@@ -1113 +1292 @@
         pmac | pmac-mpw)
                 basic_machine=powerpc-apple
-                ;;
-        nios2*)
-                basic_machine=nios2-altera
                 ;;
         *-unknown)
@@ -1143 +1319 @@
 then
 case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
+        # 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
+                ;;
         -solaris1 | -solaris1.*)
                 os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -1166 +1345 @@
         # -sysv* is not here because it comes later, after sysvr4.
         -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-              | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-              | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+              | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+              | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+              | -sym* | -kopensolaris* \
               | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-              | -aos* \
+              | -aos* | -aros* \
               | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
               | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-              | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+              | -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* \
-              | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-              | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+              | -chorusos* | -chorusrdb* | -cegcc* \
+              | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+              | -mingw32* | -linux-gnu* | -linux-android* \
+              | -linux-newlib* | -linux-uclibc* \
+              | -uxpv* | -beos* | -mpeix* | -udk* \
               | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
               | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1185 +1368 @@
               | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
               | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-              | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
+              | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+              | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
         # Remember, each alternative MUST END IN *, to match a version number.
                 ;;
@@ -1203 +1387 @@
                 ;;
         -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-              | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+              | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
               | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
                 ;;
@@ -1224 +1408 @@
                 os=-openedition
                 ;;
-        -os400*)
+        -os400*)
                 os=-os400
                 ;;
@@ -1273 +1457 @@
                 os=-sysv4
                 ;;
-        -tpf*)
+        -tpf*)
                 os=-tpf
                 ;;
@@ -1314 +1498 @@
         -zvmoe)
                 os=-zvmoe
+                ;;
+        -dicos*)
+                os=-dicos
+                ;;
+        -nacl*)
                 ;;
         -none)
@@ -1337 +1526 @@
 
 case $basic_machine in
+        score-*)
+                os=-elf
+                ;;
+        spu-*)
+                os=-elf
+                ;;
         *-acorn)
                 os=-riscix1.2
@@ -1346 +1541 @@
                 os=-aout
                 ;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
+        c4x-* | tic4x-*)
+                os=-coff
+                ;;
+        hexagon-*)
+                os=-elf
+                ;;
+        tic54x-*)
+                os=-coff
+                ;;
+        tic55x-*)
+                os=-coff
+                ;;
+        tic6x-*)
+                os=-coff
+                ;;
         # This must come before the *-dec entry.
         pdp10-*)
@@ -1367 +1574 @@
         m68000-sun)
                 os=-sunos3
-                # This also exists in the configure program, but was not the
-                # default.
-                # os=-sunos4
                 ;;
         m68*-cisco)
                 os=-aout
                 ;;
+        mep-*)
+                os=-elf
+                ;;
         mips*-cisco)
                 os=-elf
@@ -1392 +1599 @@
                 os=-beos
                 ;;
+        *-haiku)
+                os=-haiku
+                ;;
         *-ibm)
                 os=-aix
                 ;;
-        *-knuth)
+        *-knuth)
                 os=-mmixware
                 ;;
@@ -1500 +1710 @@
                                 vendor=sun
                                 ;;
-                        -aix*)
+                        -cnk*|-aix*)
                                 vendor=ibm
                                 ;;
@@ -1563 +1773 @@
 
 echo $basic_machine$os
-exit 0
+exit
 
 # Local variables:

pjproject/trunk/pjlib/include/pj/compat/socket.h

@@ -176 +176 @@
 #undef s_addr
 #undef s6_addr
+#undef sin_zero
 
 /*

pjproject/trunk/pjlib/include/pj/config_site_sample.h

@@ -360 +360 @@
 
 #endif
+
+/*
+ * Android sample settings.
+ */
+#if PJ_CONFIG_ANDROID
+
+    #define PJ_ANDROID                          1
+
+    /*
+     * PJLIB settings.
+     */
+
+    /* Disable floating point support */
+    #undef PJ_HAS_FLOATING_POINT
+    #define PJ_HAS_FLOATING_POINT               0
+
+    /*
+     * PJMEDIA settings
+     */
+
+    /* We have our own OpenSL ES backend */
+    #define PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO     0
+    #define PJMEDIA_AUDIO_DEV_HAS_WMME          0
+    #define PJMEDIA_AUDIO_DEV_HAS_OPENSL        1
+    #define PJMEDIA_AUDIO_DEV_HAS_ANDROID_JNI   0
+
+    /* Disable some codecs */
+    #define PJMEDIA_HAS_L16_CODEC               0
+    #define PJMEDIA_HAS_G722_CODEC              0
+
+    /* Fine tune Speex's default settings for best performance/quality */
+    #define PJMEDIA_CODEC_SPEEX_DEFAULT_QUALITY 5
+
+    /*
+     * PJSIP settings.
+     */
+
+    /* Increase allowable packet size, just in case */
+    //#define PJSIP_MAX_PKT_LEN                 2000
+
+    /*
+     * PJSUA settings.
+     */
+
+    /* Default codec quality, previously was set to 5, however it is now
+     * set to 4 to make sure pjsua instantiates resampler with small filter.
+     */
+    #define PJSUA_DEFAULT_CODEC_QUALITY         4
+
+    /* Set maximum number of dialog/transaction/calls to minimum */
+    #define PJSIP_MAX_TSX_COUNT                 31
+    #define PJSIP_MAX_DIALOG_COUNT              31
+    #define PJSUA_MAX_CALLS                     4
+
+    /* Other pjsua settings */
+    #define PJSUA_MAX_ACC                       4
+    #define PJSUA_MAX_PLAYERS                   4
+    #define PJSUA_MAX_RECORDERS                 4
+    #define PJSUA_MAX_CONF_PORTS                (PJSUA_MAX_CALLS+2*PJSUA_MAX_PLAYERS)
+    #define PJSUA_MAX_BUDDIES                   32
+#endif
+
 
 /*

pjproject/trunk/pjmedia/build/Makefile

@@ -82 +82 @@
 export PJMEDIA_AUDIODEV_OBJS +=  audiodev.o audiotest.o errno.o \
                                  coreaudio_dev.o legacy_dev.o null_dev.o pa_dev.o wmme_dev.o \
-                                 alsa_dev.o bb10_dev.o bdimad_dev.o
+                                 alsa_dev.o bb10_dev.o bdimad_dev.o \
+                                 android_jni_dev.o opensl_dev.o
 export PJMEDIA_AUDIODEV_CFLAGS += $(_CFLAGS)
 

pjproject/trunk/pjmedia/include/pjmedia-audiodev/config.h

@@ -56 +56 @@
 #       define PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO  1
 #   endif
+#endif
+
+/**
+ * This setting controls whether Android OpenSL audio support should be
+ * included.
+ */
+#ifndef PJMEDIA_AUDIO_DEV_HAS_OPENSL
+#   define PJMEDIA_AUDIO_DEV_HAS_OPENSL         0
+#endif
+
+/**
+ * This setting controls whether Android JNI audio support should be
+ * included.
+ */
+#ifndef PJMEDIA_AUDIO_DEV_HAS_ANDROID_JNI
+#   define PJMEDIA_AUDIO_DEV_HAS_ANDROID_JNI    0
 #endif
 

pjproject/trunk/pjmedia/src/pjmedia-audiodev/audiodev.c

@@ -79 +79 @@
 #endif
 
+#if PJMEDIA_AUDIO_DEV_HAS_OPENSL
+pjmedia_aud_dev_factory* pjmedia_opensl_factory(pj_pool_factory *pf);
+#endif
+
+#if PJMEDIA_AUDIO_DEV_HAS_ANDROID_JNI
+pjmedia_aud_dev_factory* pjmedia_android_factory(pj_pool_factory *pf);
+#endif
+
 #if PJMEDIA_AUDIO_DEV_HAS_BB10
 pjmedia_aud_dev_factory* pjmedia_bb10_factory(pj_pool_factory *pf);
@@ -396 +404 @@
 
     /* Register creation functions */
+#if PJMEDIA_AUDIO_DEV_HAS_OPENSL
+    aud_subsys.drv[aud_subsys.drv_cnt++].create = &pjmedia_opensl_factory;
+#endif
+#if PJMEDIA_AUDIO_DEV_HAS_ANDROID_JNI
+    aud_subsys.drv[aud_subsys.drv_cnt++].create = &pjmedia_android_factory;
+#endif
 #if PJMEDIA_AUDIO_DEV_HAS_BB10
     aud_subsys.drv[aud_subsys.drv_cnt++].create = &pjmedia_bb10_factory;