jonathan/openssh
1
0
Fork 0
forked from rpms/openssh
Code Pull Requests Activity

don't use GPLv3 versions of config.{sub,guess}

Browse Source
This commit is contained in:
Petr Lautrbach 2013-04-17 16:29:14 +02:00
parent 1d76d11f64
commit df630eaccf
1 changed files with 107 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

326
openssh-6.2p1-aarch64.patch
View File

@ -1,25 +1,20 @@
diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess diff --git a/config.guess b/config.guess
--- openssh-6.2p1/config.guess.aarch64 2013-04-16 17:56:50.213887042 +0200 index 78553c4..b94cde8 100755
+++ openssh-6.2p1/config.guess 2013-04-16 17:57:03.380828155 +0200 --- a/config.guess
@@ -1,14 +1,12 @@ +++ b/config.guess
#! /bin/sh @@ -2,9 +2,9 @@
# Attempt to guess a canonical system name. # Attempt to guess a canonical system name.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011 Free Software Foundation, Inc. -# 2011 Free Software Foundation, Inc.
+# Copyright 1992-2013 Free Software Foundation, Inc. +# 2011, 2012, 2013 Free Software Foundation, Inc.
-timestamp='2011-01-23' -timestamp='2011-01-23'
+timestamp='2013-02-12' +timestamp='2012-12-23'
# This file is free software; you can redistribute it and/or modify it # This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or @@ -17,9 +17,7 @@ timestamp='2011-01-23'
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
@@ -17,26 +15,22 @@ timestamp='2011-01-23'
# General Public License for more details. # General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
@ -30,42 +25,18 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess
# #
# As a special exception to the GNU General Public License, if you # As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a # distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under @@ -57,8 +55,8 @@ GNU config.guess ($timestamp)
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner. Please send patches (context
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# entry.
+# the same distribution terms that you use for the rest of that
+# program. This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
#
-# This script attempts to guess a canonical system name similar to
-# config.sub. If it succeeds, it prints the system name on stdout, and
-# exits with 0. Otherwise, it exits with 1.
+# Originally written by Per Bothner.
#
# 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
+#
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+
me=`echo "$0" | sed -e 's,.*/,,'`
@@ -56,9 +50,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner. Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc. -Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+2012, 2013 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -145,7 +137,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` | @@ -145,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:NetBSD:*:*) *:NetBSD:*:*)
# NetBSD (nbsd) targets should (where applicable) match one or # NetBSD (nbsd) targets should (where applicable) match one or
@ -74,7 +45,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess
# *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
# switched to ELF, *-*-netbsd* would select the old # switched to ELF, *-*-netbsd* would select the old
# object file format. This provides both forward # object file format. This provides both forward
@@ -181,7 +173,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ @@ -181,7 +179,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
fi fi
;; ;;
*) *)
@ -83,7 +54,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess
;; ;;
esac esac
# The OS release # The OS release
@@ -202,6 +194,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ @@ -202,6 +200,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "${machine}-${os}${release}" echo "${machine}-${os}${release}"
exit ;; exit ;;
@ -94,7 +65,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess
*:OpenBSD:*:*) *:OpenBSD:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -224,7 +220,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ @@ -224,7 +226,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
;; ;;
*5.*) *5.*)
@ -103,7 +74,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess
;; ;;
esac esac
# According to Compaq, /usr/sbin/psrinfo has been available on # According to Compaq, /usr/sbin/psrinfo has been available on
@@ -299,12 +295,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ @@ -299,12 +301,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
echo s390-ibm-zvmoe echo s390-ibm-zvmoe
exit ;; exit ;;
*:OS400:*:*) *:OS400:*:*)
@ -118,7 +89,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess
echo arm-unknown-riscos echo arm-unknown-riscos
exit ;; exit ;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -398,23 +394,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ @@ -398,23 +400,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# MiNT. But MiNT is downward compatible to TOS, so this should # MiNT. But MiNT is downward compatible to TOS, so this should
# be no problem. # be no problem.
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
@ -151,7 +122,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess
m68k:machten:*:*) m68k:machten:*:*)
echo m68k-apple-machten${UNAME_RELEASE} echo m68k-apple-machten${UNAME_RELEASE}
exit ;; exit ;;
@@ -484,8 +480,8 @@ EOF @@ -484,8 +486,8 @@ EOF
echo m88k-motorola-sysv3 echo m88k-motorola-sysv3
exit ;; exit ;;
AViiON:dgux:*:*) AViiON:dgux:*:*)
@ -162,7 +133,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess
if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
then then
if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -498,7 +494,7 @@ EOF @@ -498,7 +500,7 @@ EOF
else else
echo i586-dg-dgux${UNAME_RELEASE} echo i586-dg-dgux${UNAME_RELEASE}
fi fi
@ -171,7 +142,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess
M88*:DolphinOS:*:*) # DolphinOS (SVR3) M88*:DolphinOS:*:*) # DolphinOS (SVR3)
echo m88k-dolphin-sysv3 echo m88k-dolphin-sysv3
exit ;; exit ;;
@@ -598,52 +594,52 @@ EOF @@ -598,52 +600,52 @@ EOF
9000/[678][0-9][0-9]) 9000/[678][0-9][0-9])
if [ -x /usr/bin/getconf ]; then if [ -x /usr/bin/getconf ]; then
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
@ -201,22 +172,27 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess
eval $set_cc_for_build eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c - sed 's/^ //' << EOF >$dummy.c
+ sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c
+
+ #define _HPUX_SOURCE
+ #include <stdlib.h>
+ #include <unistd.h>
- #define _HPUX_SOURCE - #define _HPUX_SOURCE
- #include <stdlib.h> - #include <stdlib.h>
- #include <unistd.h> - #include <unistd.h>
- + #define _HPUX_SOURCE
+ #include <stdlib.h>
+ #include <unistd.h>
- int main () - int main ()
- { - {
- #if defined(_SC_KERNEL_BITS) - #if defined(_SC_KERNEL_BITS)
- long bits = sysconf(_SC_KERNEL_BITS); - long bits = sysconf(_SC_KERNEL_BITS);
- #endif - #endif
- long cpu = sysconf (_SC_CPU_VERSION); - long cpu = sysconf (_SC_CPU_VERSION);
- + int main ()
+ {
+ #if defined(_SC_KERNEL_BITS)
+ long bits = sysconf(_SC_KERNEL_BITS);
+ #endif
+ long cpu = sysconf (_SC_CPU_VERSION);
- switch (cpu) - switch (cpu)
- { - {
- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
@ -236,13 +212,6 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess
- } - }
- exit (0); - exit (0);
- } - }
+ int main ()
+ {
+ #if defined(_SC_KERNEL_BITS)
+ long bits = sysconf(_SC_KERNEL_BITS);
+ #endif
+ long cpu = sysconf (_SC_CPU_VERSION);
+
+ switch (cpu) + switch (cpu)
+ { + {
+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
@ -265,7 +234,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess
EOF EOF
(CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
test -z "$HP_ARCH" && HP_ARCH=hppa test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -734,22 +730,22 @@ EOF @@ -734,22 +736,22 @@ EOF
exit ;; exit ;;
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
echo c1-convex-bsd echo c1-convex-bsd
@ -293,7 +262,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess
CRAY*Y-MP:*:*:*) CRAY*Y-MP:*:*:*)
echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit ;; exit ;;
@@ -773,14 +769,14 @@ EOF @@ -773,14 +775,14 @@ EOF
exit ;; exit ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
@ -315,7 +284,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess
exit ;; exit ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -792,30 +788,35 @@ EOF @@ -792,30 +794,35 @@ EOF
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit ;; exit ;;
*:FreeBSD:*:*) *:FreeBSD:*:*)
@ -358,7 +327,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess
x86) x86)
echo i586-pc-interix${UNAME_RELEASE} echo i586-pc-interix${UNAME_RELEASE}
exit ;; exit ;;
@@ -861,6 +862,13 @@ EOF @@ -861,6 +868,13 @@ EOF
i*86:Minix:*:*) i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix echo ${UNAME_MACHINE}-pc-minix
exit ;; exit ;;
@ -372,7 +341,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess
alpha:Linux:*:*) alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
EV5) UNAME_MACHINE=alphaev5 ;; EV5) UNAME_MACHINE=alphaev5 ;;
@@ -870,7 +878,7 @@ EOF @@ -870,7 +884,7 @@ EOF
EV6) UNAME_MACHINE=alphaev6 ;; EV6) UNAME_MACHINE=alphaev6 ;;
EV67) UNAME_MACHINE=alphaev67 ;; EV67) UNAME_MACHINE=alphaev67 ;;
EV68*) UNAME_MACHINE=alphaev68 ;; EV68*) UNAME_MACHINE=alphaev68 ;;
@ -381,7 +350,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess
objdump --private-headers /bin/sh | grep -q ld.so.1 objdump --private-headers /bin/sh | grep -q ld.so.1
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
@@ -882,20 +890,29 @@ EOF @@ -882,20 +896,29 @@ EOF
then then
echo ${UNAME_MACHINE}-unknown-linux-gnu echo ${UNAME_MACHINE}-unknown-linux-gnu
else else
@ -415,20 +384,16 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess
exit ;; exit ;;
i*86:Linux:*:*) i*86:Linux:*:*)
LIBC=gnu LIBC=gnu
@@ -936,8 +953,11 @@ EOF @@ -937,7 +960,7 @@ EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;; ;;
+ or1k:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
or32:Linux:*:*) or32:Linux:*:*)
- echo or32-unknown-linux-gnu - echo or32-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;; exit ;;
padre:Linux:*:*) padre:Linux:*:*)
echo sparc-unknown-linux-gnu echo sparc-unknown-linux-gnu
@@ -963,7 +983,7 @@ EOF @@ -963,7 +986,7 @@ EOF
echo ${UNAME_MACHINE}-ibm-linux echo ${UNAME_MACHINE}-ibm-linux
exit ;; exit ;;
sh64*:Linux:*:*) sh64*:Linux:*:*)
@ -437,7 +402,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess
exit ;; exit ;;
sh*:Linux:*:*) sh*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -972,16 +992,16 @@ EOF @@ -972,16 +995,16 @@ EOF
echo ${UNAME_MACHINE}-unknown-linux-gnu echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;; exit ;;
tile*:Linux:*:*) tile*:Linux:*:*)
@ -457,7 +422,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess
exit ;; exit ;;
i*86:DYNIX/ptx:4*:*) i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -990,11 +1010,11 @@ EOF @@ -990,11 +1013,11 @@ EOF
echo i386-sequent-sysv4 echo i386-sequent-sysv4
exit ;; exit ;;
i*86:UNIX_SV:4.2MP:2.*) i*86:UNIX_SV:4.2MP:2.*)
@ -473,7 +438,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
exit ;; exit ;;
i*86:OS/2:*:*) i*86:OS/2:*:*)
@@ -1026,7 +1046,7 @@ EOF @@ -1026,7 +1049,7 @@ EOF
fi fi
exit ;; exit ;;
i*86:*:5:[678]*) i*86:*:5:[678]*)
@ -482,7 +447,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess
case `/bin/uname -X | grep "^Machine"` in case `/bin/uname -X | grep "^Machine"` in
*486*) UNAME_MACHINE=i486 ;; *486*) UNAME_MACHINE=i486 ;;
*Pentium) UNAME_MACHINE=i586 ;; *Pentium) UNAME_MACHINE=i586 ;;
@@ -1054,13 +1074,13 @@ EOF @@ -1054,13 +1077,13 @@ EOF
exit ;; exit ;;
pc:*:*:*) pc:*:*:*)
# Left here for compatibility: # Left here for compatibility:
@ -499,7 +464,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess
Intel:Mach:3*:*) Intel:Mach:3*:*)
echo i386-pc-mach3 echo i386-pc-mach3
exit ;; exit ;;
@@ -1095,8 +1115,8 @@ EOF @@ -1095,8 +1118,8 @@ EOF
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
&& { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
@ -510,7 +475,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess
NCR*:*:4.2:* | MPRAS*:*:4.2:*) NCR*:*:4.2:* | MPRAS*:*:4.2:*)
OS_REL='.3' OS_REL='.3'
test -r /etc/.relid \ test -r /etc/.relid \
@@ -1139,10 +1159,10 @@ EOF @@ -1139,10 +1162,10 @@ EOF
echo ns32k-sni-sysv echo ns32k-sni-sysv
fi fi
exit ;; exit ;;
@ -525,7 +490,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess
*:UNIX_System_V:4*:FTX*) *:UNIX_System_V:4*:FTX*)
# From Gerald Hewes <hewes@openmarket.com>. # From Gerald Hewes <hewes@openmarket.com>.
# How about differentiating between stratus architectures? -djm # How about differentiating between stratus architectures? -djm
@@ -1168,11 +1188,11 @@ EOF @@ -1168,11 +1191,11 @@ EOF
exit ;; exit ;;
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
if [ -d /usr/nec ]; then if [ -d /usr/nec ]; then
@ -540,7 +505,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
echo powerpc-be-beos echo powerpc-be-beos
exit ;; exit ;;
@@ -1185,6 +1205,9 @@ EOF @@ -1185,6 +1208,9 @@ EOF
BePC:Haiku:*:*) # Haiku running on Intel PC compatible. BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
echo i586-pc-haiku echo i586-pc-haiku
exit ;; exit ;;
@ -550,7 +515,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess
SX-4:SUPER-UX:*:*) SX-4:SUPER-UX:*:*)
echo sx4-nec-superux${UNAME_RELEASE} echo sx4-nec-superux${UNAME_RELEASE}
exit ;; exit ;;
@@ -1240,7 +1263,7 @@ EOF @@ -1240,7 +1266,7 @@ EOF
NEO-?:NONSTOP_KERNEL:*:*) NEO-?:NONSTOP_KERNEL:*:*)
echo neo-tandem-nsk${UNAME_RELEASE} echo neo-tandem-nsk${UNAME_RELEASE}
exit ;; exit ;;
@ -559,7 +524,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess
echo nse-tandem-nsk${UNAME_RELEASE} echo nse-tandem-nsk${UNAME_RELEASE}
exit ;; exit ;;
NSR-?:NONSTOP_KERNEL:*:*) NSR-?:NONSTOP_KERNEL:*:*)
@@ -1285,13 +1308,13 @@ EOF @@ -1285,13 +1311,13 @@ EOF
echo pdp10-unknown-its echo pdp10-unknown-its
exit ;; exit ;;
SEI:*:*:SEIUX) SEI:*:*:SEIUX)
@ -575,7 +540,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess
case "${UNAME_MACHINE}" in case "${UNAME_MACHINE}" in
A*) echo alpha-dec-vms ; exit ;; A*) echo alpha-dec-vms ; exit ;;
I*) echo ia64-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;;
@@ -1309,11 +1332,11 @@ EOF @@ -1309,11 +1335,11 @@ EOF
i*86:AROS:*:*) i*86:AROS:*:*)
echo ${UNAME_MACHINE}-pc-aros echo ${UNAME_MACHINE}-pc-aros
exit ;; exit ;;
@ -590,7 +555,7 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess
eval $set_cc_for_build eval $set_cc_for_build
cat >$dummy.c <<EOF cat >$dummy.c <<EOF
#ifdef _SEQUENT_ #ifdef _SEQUENT_
@@ -1331,11 +1354,11 @@ main () @@ -1331,11 +1357,11 @@ main ()
#include <sys/param.h> #include <sys/param.h>
printf ("m68k-sony-newsos%s\n", printf ("m68k-sony-newsos%s\n",
#ifdef NEWSOS4 #ifdef NEWSOS4
@ -605,42 +570,24 @@ diff -up openssh-6.2p1/config.guess.aarch64 openssh-6.2p1/config.guess
#endif #endif
#endif #endif
diff -up openssh-6.2p1/config.sub.aarch64 openssh-6.2p1/config.sub diff --git a/config.sub b/config.sub
--- openssh-6.2p1/config.sub.aarch64 2013-04-16 17:56:38.981937275 +0200 index 2d81696..eee8dcc 100755
+++ openssh-6.2p1/config.sub 2013-04-16 17:57:03.379828159 +0200 --- a/config.sub
@@ -1,38 +1,31 @@ +++ b/config.sub
#! /bin/sh @@ -2,9 +2,9 @@
# Configuration validation subroutine script. # Configuration validation subroutine script.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011 Free Software Foundation, Inc. -# 2011 Free Software Foundation, Inc.
- +# 2011, 2012, 2013 Free Software Foundation, Inc.
-timestamp='2011-01-01' -timestamp='2011-01-01'
- +timestamp='2012-12-23'
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software # This file is (in principle) common to ALL GNU software.
-# can handle that machine. It does not imply ALL GNU software can. # The presence of a machine in this file suggests that SOME GNU software
-# @@ -21,9 +21,7 @@ timestamp='2011-01-01'
-# This file is free software; you can redistribute it and/or modify # GNU General Public License for more details.
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# Copyright 1992-2013 Free Software Foundation, Inc.
+
+timestamp='2013-02-12'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software -# along with this program; if not, write to the Free Software
@ -650,31 +597,18 @@ diff -up openssh-6.2p1/config.sub.aarch64 openssh-6.2p1/config.sub
# #
# As a special exception to the GNU General Public License, if you # As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a # distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under @@ -76,8 +74,8 @@ version="\
-# the same distribution terms that you use for the rest of that program.
+# the same distribution terms that you use for the rest of that
+# program. This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
-# Please send patches to <config-patches@gnu.org>. Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
@@ -75,9 +68,7 @@ Report bugs and patches to <config-patch
version="\
GNU config.sub ($timestamp) GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-Software Foundation, Inc. -Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+2012, 2013 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -125,13 +116,17 @@ esac @@ -125,13 +123,17 @@ esac
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in case $maybe_os in
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
@ -693,7 +627,7 @@ diff -up openssh-6.2p1/config.sub.aarch64 openssh-6.2p1/config.sub
*) *)
basic_machine=`echo $1 | sed 's/-[^-]*$//'` basic_machine=`echo $1 | sed 's/-[^-]*$//'`
if [ $basic_machine != $1 ] if [ $basic_machine != $1 ]
@@ -154,12 +149,12 @@ case $os in @@ -154,12 +156,12 @@ case $os in
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
@ -709,7 +643,7 @@ diff -up openssh-6.2p1/config.sub.aarch64 openssh-6.2p1/config.sub
;; ;;
-sim | -cisco | -oki | -wec | -winbond) -sim | -cisco | -oki | -wec | -winbond)
os= os=
@@ -175,10 +170,10 @@ case $os in @@ -175,10 +177,10 @@ case $os in
os=-chorusos os=-chorusos
basic_machine=$1 basic_machine=$1
;; ;;
@ -723,7 +657,7 @@ diff -up openssh-6.2p1/config.sub.aarch64 openssh-6.2p1/config.sub
-hiux*) -hiux*)
os=-hiuxwe2 os=-hiuxwe2
;; ;;
@@ -223,6 +218,12 @@ case $os in @@ -223,6 +225,12 @@ case $os in
-isc*) -isc*)
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;; ;;
@ -736,7 +670,7 @@ diff -up openssh-6.2p1/config.sub.aarch64 openssh-6.2p1/config.sub
-lynx*) -lynx*)
os=-lynxos os=-lynxos
;; ;;
@@ -247,20 +248,27 @@ case $basic_machine in @@ -247,20 +255,27 @@ case $basic_machine in
# Some are omitted here because they have special meanings below. # Some are omitted here because they have special meanings below.
1750a | 580 \ 1750a | 580 \
| a29k \ | a29k \
@ -766,23 +700,12 @@ diff -up openssh-6.2p1/config.sub.aarch64 openssh-6.2p1/config.sub
| mips | mipsbe | mipseb | mipsel | mipsle \ | mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \ | mips16 \
| mips64 | mips64el \ | mips64 | mips64el \
@@ -278,30 +286,32 @@ case $basic_machine in @@ -286,22 +301,23 @@ case $basic_machine in
| mipsisa64r2 | mipsisa64r2el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
+ | mipsr5900 | mipsr5900el \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
| moxie \
| mt \
| msp430 \
| nds32 | nds32le | nds32be \ | nds32 | nds32le | nds32be \
- | nios | nios2 \ | nios | nios2 \
+ | nios | nios2 | nios2eb | nios2el \
| ns16k | ns32k \ | ns16k | ns32k \
- | or32 \
+ | open8 \ + | open8 \
+ | or1k | or32 \ | or32 \
| pdp10 | pdp11 | pj | pjl \ | pdp10 | pdp11 | pj | pjl \
- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | powerpc | powerpc64 | powerpc64le | powerpcle \
@ -807,7 +730,7 @@ diff -up openssh-6.2p1/config.sub.aarch64 openssh-6.2p1/config.sub
| z8k | z80) | z8k | z80)
basic_machine=$basic_machine-unknown basic_machine=$basic_machine-unknown
;; ;;
@@ -314,8 +324,7 @@ case $basic_machine in @@ -314,8 +330,7 @@ case $basic_machine in
c6x) c6x)
basic_machine=tic6x-unknown basic_machine=tic6x-unknown
;; ;;
@ -817,7 +740,7 @@ diff -up openssh-6.2p1/config.sub.aarch64 openssh-6.2p1/config.sub
basic_machine=$basic_machine-unknown basic_machine=$basic_machine-unknown
os=-none os=-none
;; ;;
@@ -325,6 +334,21 @@ case $basic_machine in @@ -325,6 +340,21 @@ case $basic_machine in
basic_machine=mt-unknown basic_machine=mt-unknown
;; ;;
@ -839,7 +762,7 @@ diff -up openssh-6.2p1/config.sub.aarch64 openssh-6.2p1/config.sub
# We use `pc' rather than `unknown' # We use `pc' rather than `unknown'
# because (1) that's what they normally are, and # because (1) that's what they normally are, and
# (2) the word "unknown" tends to confuse beginning users. # (2) the word "unknown" tends to confuse beginning users.
@@ -339,11 +363,13 @@ case $basic_machine in @@ -339,11 +369,13 @@ case $basic_machine in
# Recognize the basic CPU types with company name. # Recognize the basic CPU types with company name.
580-* \ 580-* \
| a29k-* \ | a29k-* \
@ -853,7 +776,7 @@ diff -up openssh-6.2p1/config.sub.aarch64 openssh-6.2p1/config.sub
| bfin-* | bs2000-* \ | bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \
| clipper-* | craynv-* | cydra-* \ | clipper-* | craynv-* | cydra-* \
@@ -352,12 +378,15 @@ case $basic_machine in @@ -352,12 +384,15 @@ case $basic_machine in
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \ | h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
@ -870,18 +793,9 @@ diff -up openssh-6.2p1/config.sub.aarch64 openssh-6.2p1/config.sub
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \ | mips16-* \
| mips64-* | mips64el-* \ | mips64-* | mips64el-* \
@@ -375,31 +404,34 @@ case $basic_machine in @@ -382,24 +417,26 @@ case $basic_machine in
| mipsisa64r2-* | mipsisa64r2el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+ | mipsr5900-* | mipsr5900el-* \
| mipstx39-* | mipstx39el-* \
| mmix-* \
| mt-* \
| msp430-* \
| nds32-* | nds32le-* | nds32be-* \ | nds32-* | nds32le-* | nds32be-* \
- | nios-* | nios2-* \ | nios-* | nios2-* \
+ | nios-* | nios2-* | nios2eb-* | nios2el-* \
| none-* | np1-* | ns16k-* | ns32k-* \ | none-* | np1-* | ns16k-* | ns32k-* \
+ | open8-* \ + | open8-* \
| orion-* \ | orion-* \
@ -913,7 +827,7 @@ diff -up openssh-6.2p1/config.sub.aarch64 openssh-6.2p1/config.sub
| xstormy16-* | xtensa*-* \ | xstormy16-* | xtensa*-* \
| ymp-* \ | ymp-* \
| z8k-* | z80-*) | z8k-* | z80-*)
@@ -424,7 +456,7 @@ case $basic_machine in @@ -424,7 +461,7 @@ case $basic_machine in
basic_machine=a29k-amd basic_machine=a29k-amd
os=-udi os=-udi
;; ;;
@ -922,7 +836,7 @@ diff -up openssh-6.2p1/config.sub.aarch64 openssh-6.2p1/config.sub
basic_machine=abacus-unknown basic_machine=abacus-unknown
;; ;;
adobe68k) adobe68k)
@@ -507,7 +539,7 @@ case $basic_machine in @@ -507,7 +544,7 @@ case $basic_machine in
basic_machine=c90-cray basic_machine=c90-cray
os=-unicos os=-unicos
;; ;;
@ -931,7 +845,7 @@ diff -up openssh-6.2p1/config.sub.aarch64 openssh-6.2p1/config.sub
basic_machine=arm-unknown basic_machine=arm-unknown
os=-cegcc os=-cegcc
;; ;;
@@ -697,7 +729,6 @@ case $basic_machine in @@ -697,7 +734,6 @@ case $basic_machine in
i370-ibm* | ibm*) i370-ibm* | ibm*)
basic_machine=i370-ibm basic_machine=i370-ibm
;; ;;
@ -939,7 +853,7 @@ diff -up openssh-6.2p1/config.sub.aarch64 openssh-6.2p1/config.sub
i*86v32) i*86v32)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-sysv32 os=-sysv32
@@ -755,9 +786,13 @@ case $basic_machine in @@ -755,9 +791,13 @@ case $basic_machine in
basic_machine=ns32k-utek basic_machine=ns32k-utek
os=-sysv os=-sysv
;; ;;
@ -954,7 +868,7 @@ diff -up openssh-6.2p1/config.sub.aarch64 openssh-6.2p1/config.sub
mingw32) mingw32)
basic_machine=i386-pc basic_machine=i386-pc
os=-mingw32 os=-mingw32
@@ -794,10 +829,18 @@ case $basic_machine in @@ -794,10 +834,18 @@ case $basic_machine in
ms1-*) ms1-*)
basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
;; ;;
@ -973,7 +887,7 @@ diff -up openssh-6.2p1/config.sub.aarch64 openssh-6.2p1/config.sub
ncr3000) ncr3000)
basic_machine=i486-ncr basic_machine=i486-ncr
os=-sysv4 os=-sysv4
@@ -862,10 +905,10 @@ case $basic_machine in @@ -862,10 +910,10 @@ case $basic_machine in
np1) np1)
basic_machine=np1-gould basic_machine=np1-gould
;; ;;
@ -986,7 +900,7 @@ diff -up openssh-6.2p1/config.sub.aarch64 openssh-6.2p1/config.sub
basic_machine=nse-tandem basic_machine=nse-tandem
;; ;;
nsr-tandem) nsr-tandem)
@@ -950,9 +993,10 @@ case $basic_machine in @@ -950,9 +998,10 @@ case $basic_machine in
;; ;;
power) basic_machine=power-ibm power) basic_machine=power-ibm
;; ;;
@ -999,7 +913,7 @@ diff -up openssh-6.2p1/config.sub.aarch64 openssh-6.2p1/config.sub
;; ;;
ppcle | powerpclittle | ppc-le | powerpc-little) ppcle | powerpclittle | ppc-le | powerpc-little)
basic_machine=powerpcle-unknown basic_machine=powerpcle-unknown
@@ -977,7 +1021,11 @@ case $basic_machine in @@ -977,7 +1026,11 @@ case $basic_machine in
basic_machine=i586-unknown basic_machine=i586-unknown
os=-pw32 os=-pw32
;; ;;
@ -1012,7 +926,7 @@ diff -up openssh-6.2p1/config.sub.aarch64 openssh-6.2p1/config.sub
basic_machine=i386-pc basic_machine=i386-pc
os=-rdos os=-rdos
;; ;;
@@ -1046,6 +1094,9 @@ case $basic_machine in @@ -1046,6 +1099,9 @@ case $basic_machine in
basic_machine=i860-stratus basic_machine=i860-stratus
os=-sysv4 os=-sysv4
;; ;;
@ -1022,7 +936,7 @@ diff -up openssh-6.2p1/config.sub.aarch64 openssh-6.2p1/config.sub
sun2) sun2)
basic_machine=m68000-sun basic_machine=m68000-sun
;; ;;
@@ -1102,13 +1153,8 @@ case $basic_machine in @@ -1102,13 +1158,8 @@ case $basic_machine in
basic_machine=t90-cray basic_machine=t90-cray
os=-unicos os=-unicos
;; ;;
@ -1037,7 +951,7 @@ diff -up openssh-6.2p1/config.sub.aarch64 openssh-6.2p1/config.sub
os=-linux-gnu os=-linux-gnu
;; ;;
tx39) tx39)
@@ -1178,6 +1224,9 @@ case $basic_machine in @@ -1178,6 +1229,9 @@ case $basic_machine in
xps | xps100) xps | xps100)
basic_machine=xps100-honeywell basic_machine=xps100-honeywell
;; ;;
@ -1047,7 +961,7 @@ diff -up openssh-6.2p1/config.sub.aarch64 openssh-6.2p1/config.sub
ymp) ymp)
basic_machine=ymp-cray basic_machine=ymp-cray
os=-unicos os=-unicos
@@ -1275,11 +1324,11 @@ esac @@ -1275,11 +1329,11 @@ esac
if [ x"$os" != x"" ] if [ x"$os" != x"" ]
then then
case $os in case $os in
@ -1063,14 +977,7 @@ diff -up openssh-6.2p1/config.sub.aarch64 openssh-6.2p1/config.sub
;; ;;
-solaris1 | -solaris1.*) -solaris1 | -solaris1.*)
os=`echo $os | sed -e 's|solaris1|sunos4|'` os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -1303,21 +1352,21 @@ case $os in @@ -1309,15 +1363,15 @@ case $os in
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- | -sym* | -kopensolaris* \
+ | -sym* | -kopensolaris* | -plan9* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
@ -1090,7 +997,7 @@ diff -up openssh-6.2p1/config.sub.aarch64 openssh-6.2p1/config.sub
| -uxpv* | -beos* | -mpeix* | -udk* \ | -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1364,7 +1413,7 @@ case $os in @@ -1364,7 +1418,7 @@ case $os in
-opened*) -opened*)
os=-openedition os=-openedition
;; ;;
@ -1099,7 +1006,7 @@ diff -up openssh-6.2p1/config.sub.aarch64 openssh-6.2p1/config.sub
os=-os400 os=-os400
;; ;;
-wince*) -wince*)
@@ -1413,7 +1462,7 @@ case $os in @@ -1413,7 +1467,7 @@ case $os in
-sinix*) -sinix*)
os=-sysv4 os=-sysv4
;; ;;
@ -1108,16 +1015,7 @@ diff -up openssh-6.2p1/config.sub.aarch64 openssh-6.2p1/config.sub
os=-tpf os=-tpf
;; ;;
-triton*) -triton*)
@@ -1449,17 +1498,14 @@ case $os in @@ -1458,8 +1512,8 @@ case $os in
-aros*)
os=-aros
;;
- -kaos*)
- os=-kaos
- ;;
-zvmoe)
os=-zvmoe
;;
-dicos*) -dicos*)
os=-dicos os=-dicos
;; ;;
@ -1128,7 +1026,7 @@ diff -up openssh-6.2p1/config.sub.aarch64 openssh-6.2p1/config.sub
-none) -none)
;; ;;
*) *)
@@ -1482,10 +1528,10 @@ else @@ -1482,10 +1536,10 @@ else
# system, and we'll never get to this point. # system, and we'll never get to this point.
case $basic_machine in case $basic_machine in
@ -1141,7 +1039,7 @@ diff -up openssh-6.2p1/config.sub.aarch64 openssh-6.2p1/config.sub
os=-elf os=-elf
;; ;;
*-acorn) *-acorn)
@@ -1497,8 +1543,11 @@ case $basic_machine in @@ -1497,8 +1551,11 @@ case $basic_machine in
arm*-semi) arm*-semi)
os=-aout os=-aout
;; ;;
@ -1155,7 +1053,7 @@ diff -up openssh-6.2p1/config.sub.aarch64 openssh-6.2p1/config.sub
;; ;;
tic54x-*) tic54x-*)
os=-coff os=-coff
@@ -1527,14 +1576,11 @@ case $basic_machine in @@ -1527,14 +1584,11 @@ case $basic_machine in
;; ;;
m68000-sun) m68000-sun)
os=-sunos3 os=-sunos3
@ -1171,17 +1069,7 @@ diff -up openssh-6.2p1/config.sub.aarch64 openssh-6.2p1/config.sub
os=-elf os=-elf
;; ;;
mips*-cisco) mips*-cisco)
@@ -1543,6 +1589,9 @@ case $basic_machine in @@ -1561,7 +1615,7 @@ case $basic_machine in
mips*-*)
os=-elf
;;
+ or1k-*)
+ os=-elf
+ ;;
or32-*)
os=-coff
;;
@@ -1561,7 +1610,7 @@ case $basic_machine in
*-ibm) *-ibm)
os=-aix os=-aix
;; ;;