← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gnupg/trusty-updates

« back to all changes in this revision

Viewing changes to debian/patches/autoconfupdate.dpatch

  • Committer: Package Import Robot
  • Author(s): Colin Watson
  • Date: 2012-12-04 22:26:16 UTC
  • mfrom: (1.1.18 sid)
  • Revision ID: package-import@ubuntu.com-20121204222616-cr0fow26geq90l3y
Tags: 1.4.12-6ubuntu1
* Resynchronise with Debian.  Remaining changes:
  - Disable mlock() test since it fails with ulimit 0 (on buildds).
  - Set gpg (or gpg2) and gpgsm to use a passphrase agent by default.
  - Only suggest gnupg-curl and libldap; recommendations are pulled into
    minimal, and we don't need the keyserver utilities in a minimal Ubuntu
    system.
  - Remove the Win32 build.
  - Update config.guess/config.sub for aarch64.
* Dropped patches:
  - Fix udeb build failure on powerpc, building with -O2 instead of -Os.
    (No longer seems to be necessary.)
* Simplify removal of Win32 build, to make this easier to merge in future.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/autoconfupdate.dpatch
1
 
#! /bin/sh /usr/share/dpatch/dpatch-run
2
 
## autoconfupdate.dpatch by Wookey <wookey@wookware.org>
3
 
##
4
 
## All lines beginning with `## DP:' are a description of the patch.
5
 
## DP: Update config.guess,sub for aarch64
6
 
 
7
 
@DPATCH@
8
 
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gnupg-1.4.11~/scripts/config.guess gnupg-1.4.11/scripts/config.guess
9
 
--- gnupg-1.4.11~/scripts/config.guess  2010-10-18 10:06:52.000000000 +0100
10
 
+++ gnupg-1.4.11/scripts/config.guess   2012-10-04 11:55:19.000000000 +0100
11
 
@@ -1,10 +1,10 @@
12
 
 #! /bin/sh
13
 
 # Attempt to guess a canonical system name.
14
 
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
15
 
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
16
 
-#   Free Software Foundation, Inc.
17
 
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
18
 
+#   2011, 2012 Free Software Foundation, Inc.
19
 
 
20
 
-timestamp='2010-09-24'
21
 
+timestamp='2012-02-10'
22
 
 
23
 
 # This file is free software; you can redistribute it and/or modify it
24
 
 # under the terms of the GNU General Public License as published by
25
 
@@ -17,9 +17,7 @@
26
 
 # General Public License for more details.
27
 
 #
28
 
 # You should have received a copy of the GNU General Public License
29
 
-# along with this program; if not, write to the Free Software
30
 
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
31
 
-# 02110-1301, USA.
32
 
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
33
 
 #
34
 
 # As a special exception to the GNU General Public License, if you
35
 
 # distribute this file as part of a program that contains a
36
 
@@ -57,8 +55,8 @@
37
 
 
38
 
 Originally written by Per Bothner.
39
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
40
 
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
41
 
-Software Foundation, Inc.
42
 
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
43
 
+Free Software Foundation, Inc.
44
 
 
45
 
 This is free software; see the source for copying conditions.  There is NO
46
 
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
47
 
@@ -92,7 +90,7 @@
48
 
   exit 1
49
 
 fi
50
 
 
51
 
-trap 'exit 1' HUP INT TERM
52
 
+trap 'exit 1' 1 2 15
53
 
 
54
 
 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
55
 
 # compiler to aid in system detection is discouraged as it requires
56
 
@@ -106,7 +104,7 @@
57
 
 
58
 
 set_cc_for_build='
59
 
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
60
 
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT PIPE TERM ;
61
 
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
62
 
 : ${TMPDIR=/tmp} ;
63
 
  { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
64
 
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
65
 
@@ -145,7 +143,7 @@
66
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
67
 
     *:NetBSD:*:*)
68
 
        # NetBSD (nbsd) targets should (where applicable) match one or
69
 
-       # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
70
 
+       # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
71
 
        # *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
72
 
        # switched to ELF, *-*-netbsd* would select the old
73
 
        # object file format.  This provides both forward
74
 
@@ -181,7 +179,7 @@
75
 
                fi
76
 
                ;;
77
 
            *)
78
 
-               os=netbsd
79
 
+               os=netbsd
80
 
                ;;
81
 
        esac
82
 
        # The OS release
83
 
@@ -224,7 +222,7 @@
84
 
                UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
85
 
                ;;
86
 
        *5.*)
87
 
-               UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
88
 
+               UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
89
 
                ;;
90
 
        esac
91
 
        # According to Compaq, /usr/sbin/psrinfo has been available on
92
 
@@ -270,7 +268,10 @@
93
 
        # A Xn.n version is an unreleased experimental baselevel.
94
 
        # 1.2 uses "1.2" for uname -r.
95
 
        echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
96
 
-       exit ;;
97
 
+       # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
98
 
+       exitcode=$?
99
 
+       trap '' 0
100
 
+       exit $exitcode ;;
101
 
     Alpha\ *:Windows_NT*:*)
102
 
        # How do we know it's Interix rather than the generic POSIX subsystem?
103
 
        # Should we change UNAME_MACHINE based on the output of uname instead
104
 
@@ -296,7 +297,7 @@
105
 
        echo s390-ibm-zvmoe
106
 
        exit ;;
107
 
     *:OS400:*:*)
108
 
-        echo powerpc-ibm-os400
109
 
+       echo powerpc-ibm-os400
110
 
        exit ;;
111
 
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
112
 
        echo arm-acorn-riscix${UNAME_RELEASE}
113
 
@@ -395,23 +396,23 @@
114
 
     # MiNT.  But MiNT is downward compatible to TOS, so this should
115
 
     # be no problem.
116
 
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
117
 
-        echo m68k-atari-mint${UNAME_RELEASE}
118
 
+       echo m68k-atari-mint${UNAME_RELEASE}
119
 
        exit ;;
120
 
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
121
 
        echo m68k-atari-mint${UNAME_RELEASE}
122
 
-        exit ;;
123
 
+       exit ;;
124
 
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
125
 
-        echo m68k-atari-mint${UNAME_RELEASE}
126
 
+       echo m68k-atari-mint${UNAME_RELEASE}
127
 
        exit ;;
128
 
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
129
 
-        echo m68k-milan-mint${UNAME_RELEASE}
130
 
-        exit ;;
131
 
+       echo m68k-milan-mint${UNAME_RELEASE}
132
 
+       exit ;;
133
 
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
134
 
-        echo m68k-hades-mint${UNAME_RELEASE}
135
 
-        exit ;;
136
 
+       echo m68k-hades-mint${UNAME_RELEASE}
137
 
+       exit ;;
138
 
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
139
 
-        echo m68k-unknown-mint${UNAME_RELEASE}
140
 
-        exit ;;
141
 
+       echo m68k-unknown-mint${UNAME_RELEASE}
142
 
+       exit ;;
143
 
     m68k:machten:*:*)
144
 
        echo m68k-apple-machten${UNAME_RELEASE}
145
 
        exit ;;
146
 
@@ -481,8 +482,8 @@
147
 
        echo m88k-motorola-sysv3
148
 
        exit ;;
149
 
     AViiON:dgux:*:*)
150
 
-        # DG/UX returns AViiON for all architectures
151
 
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
152
 
+       # DG/UX returns AViiON for all architectures
153
 
+       UNAME_PROCESSOR=`/usr/bin/uname -p`
154
 
        if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
155
 
        then
156
 
            if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
157
 
@@ -495,7 +496,7 @@
158
 
        else
159
 
            echo i586-dg-dgux${UNAME_RELEASE}
160
 
        fi
161
 
-       exit ;;
162
 
+       exit ;;
163
 
     M88*:DolphinOS:*:*)        # DolphinOS (SVR3)
164
 
        echo m88k-dolphin-sysv3
165
 
        exit ;;
166
 
@@ -595,52 +596,52 @@
167
 
            9000/[678][0-9][0-9])
168
 
                if [ -x /usr/bin/getconf ]; then
169
 
                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
170
 
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
171
 
-                    case "${sc_cpu_version}" in
172
 
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
173
 
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
174
 
-                      532)                      # CPU_PA_RISC2_0
175
 
-                        case "${sc_kernel_bits}" in
176
 
-                          32) HP_ARCH="hppa2.0n" ;;
177
 
-                          64) HP_ARCH="hppa2.0w" ;;
178
 
+                   sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
179
 
+                   case "${sc_cpu_version}" in
180
 
+                     523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
181
 
+                     528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
182
 
+                     532)                      # CPU_PA_RISC2_0
183
 
+                       case "${sc_kernel_bits}" in
184
 
+                         32) HP_ARCH="hppa2.0n" ;;
185
 
+                         64) HP_ARCH="hppa2.0w" ;;
186
 
                          '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
187
 
-                        esac ;;
188
 
-                    esac
189
 
+                       esac ;;
190
 
+                   esac
191
 
                fi
192
 
                if [ "${HP_ARCH}" = "" ]; then
193
 
                    eval $set_cc_for_build
194
 
-                   sed 's/^              //' << EOF >$dummy.c
195
 
+                   sed 's/^            //' << EOF >$dummy.c
196
 
 
197
 
-              #define _HPUX_SOURCE
198
 
-              #include <stdlib.h>
199
 
-              #include <unistd.h>
200
 
+               #define _HPUX_SOURCE
201
 
+               #include <stdlib.h>
202
 
+               #include <unistd.h>
203
 
 
204
 
-              int main ()
205
 
-              {
206
 
-              #if defined(_SC_KERNEL_BITS)
207
 
-                  long bits = sysconf(_SC_KERNEL_BITS);
208
 
-              #endif
209
 
-                  long cpu  = sysconf (_SC_CPU_VERSION);
210
 
+               int main ()
211
 
+               {
212
 
+               #if defined(_SC_KERNEL_BITS)
213
 
+                   long bits = sysconf(_SC_KERNEL_BITS);
214
 
+               #endif
215
 
+                   long cpu  = sysconf (_SC_CPU_VERSION);
216
 
 
217
 
-                  switch (cpu)
218
 
-               {
219
 
-               case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
220
 
-               case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
221
 
-               case CPU_PA_RISC2_0:
222
 
-              #if defined(_SC_KERNEL_BITS)
223
 
-                   switch (bits)
224
 
-                       {
225
 
-                       case 64: puts ("hppa2.0w"); break;
226
 
-                       case 32: puts ("hppa2.0n"); break;
227
 
-                       default: puts ("hppa2.0"); break;
228
 
-                       } break;
229
 
-              #else  /* !defined(_SC_KERNEL_BITS) */
230
 
-                   puts ("hppa2.0"); break;
231
 
-              #endif
232
 
-               default: puts ("hppa1.0"); break;
233
 
-               }
234
 
-                  exit (0);
235
 
-              }
236
 
+                   switch (cpu)
237
 
+                       {
238
 
+                       case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
239
 
+                       case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
240
 
+                       case CPU_PA_RISC2_0:
241
 
+               #if defined(_SC_KERNEL_BITS)
242
 
+                           switch (bits)
243
 
+                               {
244
 
+                               case 64: puts ("hppa2.0w"); break;
245
 
+                               case 32: puts ("hppa2.0n"); break;
246
 
+                               default: puts ("hppa2.0"); break;
247
 
+                               } break;
248
 
+               #else  /* !defined(_SC_KERNEL_BITS) */
249
 
+                           puts ("hppa2.0"); break;
250
 
+               #endif
251
 
+                       default: puts ("hppa1.0"); break;
252
 
+                       }
253
 
+                   exit (0);
254
 
+               }
255
 
 EOF
256
 
                    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
257
 
                    test -z "$HP_ARCH" && HP_ARCH=hppa
258
 
@@ -731,22 +732,22 @@
259
 
        exit ;;
260
 
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
261
 
        echo c1-convex-bsd
262
 
-        exit ;;
263
 
+       exit ;;
264
 
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
265
 
        if getsysinfo -f scalar_acc
266
 
        then echo c32-convex-bsd
267
 
        else echo c2-convex-bsd
268
 
        fi
269
 
-        exit ;;
270
 
+       exit ;;
271
 
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
272
 
        echo c34-convex-bsd
273
 
-        exit ;;
274
 
+       exit ;;
275
 
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
276
 
        echo c38-convex-bsd
277
 
-        exit ;;
278
 
+       exit ;;
279
 
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
280
 
        echo c4-convex-bsd
281
 
-        exit ;;
282
 
+       exit ;;
283
 
     CRAY*Y-MP:*:*:*)
284
 
        echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
285
 
        exit ;;
286
 
@@ -770,14 +771,14 @@
287
 
        exit ;;
288
 
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
289
 
        FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
290
 
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
291
 
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
292
 
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
293
 
-        exit ;;
294
 
+       FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
295
 
+       FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
296
 
+       echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
297
 
+       exit ;;
298
 
     5000:UNIX_System_V:4.*:*)
299
 
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
300
 
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
301
 
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
302
 
+       FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
303
 
+       FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
304
 
+       echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
305
 
        exit ;;
306
 
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
307
 
        echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
308
 
@@ -789,13 +790,12 @@
309
 
        echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
310
 
        exit ;;
311
 
     *:FreeBSD:*:*)
312
 
-       case ${UNAME_MACHINE} in
313
 
-           pc98)
314
 
-               echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
315
 
+       UNAME_PROCESSOR=`/usr/bin/uname -p`
316
 
+       case ${UNAME_PROCESSOR} in
317
 
            amd64)
318
 
                echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
319
 
            *)
320
 
-               echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
321
 
+               echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
322
 
        esac
323
 
        exit ;;
324
 
     i*:CYGWIN*:*)
325
 
@@ -804,15 +804,18 @@
326
 
     *:MINGW*:*)
327
 
        echo ${UNAME_MACHINE}-pc-mingw32
328
 
        exit ;;
329
 
+    i*:MSYS*:*)
330
 
+       echo ${UNAME_MACHINE}-pc-msys
331
 
+       exit ;;
332
 
     i*:windows32*:*)
333
 
-       # uname -m includes "-pc" on this system.
334
 
-       echo ${UNAME_MACHINE}-mingw32
335
 
+       # uname -m includes "-pc" on this system.
336
 
+       echo ${UNAME_MACHINE}-mingw32
337
 
        exit ;;
338
 
     i*:PW*:*)
339
 
        echo ${UNAME_MACHINE}-pc-pw32
340
 
        exit ;;
341
 
     *:Interix*:*)
342
 
-       case ${UNAME_MACHINE} in
343
 
+       case ${UNAME_MACHINE} in
344
 
            x86)
345
 
                echo i586-pc-interix${UNAME_RELEASE}
346
 
                exit ;;
347
 
@@ -858,6 +861,13 @@
348
 
     i*86:Minix:*:*)
349
 
        echo ${UNAME_MACHINE}-pc-minix
350
 
        exit ;;
351
 
+    aarch64:Linux:*:*)
352
 
+       echo ${UNAME_MACHINE}-unknown-linux-gnu
353
 
+       exit ;;
354
 
+    aarch64_be:Linux:*:*)
355
 
+       UNAME_MACHINE=aarch64_be
356
 
+       echo ${UNAME_MACHINE}-unknown-linux-gnu
357
 
+       exit ;;
358
 
     alpha:Linux:*:*)
359
 
        case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
360
 
          EV5)   UNAME_MACHINE=alphaev5 ;;
361
 
@@ -867,7 +877,7 @@
362
 
          EV6)   UNAME_MACHINE=alphaev6 ;;
363
 
          EV67)  UNAME_MACHINE=alphaev67 ;;
364
 
          EV68*) UNAME_MACHINE=alphaev68 ;;
365
 
-        esac
366
 
+       esac
367
 
        objdump --private-headers /bin/sh | grep -q ld.so.1
368
 
        if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
369
 
        echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
370
 
@@ -879,20 +889,29 @@
371
 
        then
372
 
            echo ${UNAME_MACHINE}-unknown-linux-gnu
373
 
        else
374
 
-           echo ${UNAME_MACHINE}-unknown-linux-gnueabi
375
 
+           if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
376
 
+               | grep -q __ARM_PCS_VFP
377
 
+           then
378
 
+               echo ${UNAME_MACHINE}-unknown-linux-gnueabi
379
 
+           else
380
 
+               echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
381
 
+           fi
382
 
        fi
383
 
        exit ;;
384
 
     avr32*:Linux:*:*)
385
 
        echo ${UNAME_MACHINE}-unknown-linux-gnu
386
 
        exit ;;
387
 
     cris:Linux:*:*)
388
 
-       echo cris-axis-linux-gnu
389
 
+       echo ${UNAME_MACHINE}-axis-linux-gnu
390
 
        exit ;;
391
 
     crisv32:Linux:*:*)
392
 
-       echo crisv32-axis-linux-gnu
393
 
+       echo ${UNAME_MACHINE}-axis-linux-gnu
394
 
        exit ;;
395
 
     frv:Linux:*:*)
396
 
-       echo frv-unknown-linux-gnu
397
 
+       echo ${UNAME_MACHINE}-unknown-linux-gnu
398
 
+       exit ;;
399
 
+    hexagon:Linux:*:*)
400
 
+       echo ${UNAME_MACHINE}-unknown-linux-gnu
401
 
        exit ;;
402
 
     i*86:Linux:*:*)
403
 
        LIBC=gnu
404
 
@@ -934,7 +953,7 @@
405
 
        test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
406
 
        ;;
407
 
     or32:Linux:*:*)
408
 
-       echo or32-unknown-linux-gnu
409
 
+       echo ${UNAME_MACHINE}-unknown-linux-gnu
410
 
        exit ;;
411
 
     padre:Linux:*:*)
412
 
        echo sparc-unknown-linux-gnu
413
 
@@ -960,7 +979,7 @@
414
 
        echo ${UNAME_MACHINE}-ibm-linux
415
 
        exit ;;
416
 
     sh64*:Linux:*:*)
417
 
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
418
 
+       echo ${UNAME_MACHINE}-unknown-linux-gnu
419
 
        exit ;;
420
 
     sh*:Linux:*:*)
421
 
        echo ${UNAME_MACHINE}-unknown-linux-gnu
422
 
@@ -969,16 +988,16 @@
423
 
        echo ${UNAME_MACHINE}-unknown-linux-gnu
424
 
        exit ;;
425
 
     tile*:Linux:*:*)
426
 
-       echo ${UNAME_MACHINE}-tilera-linux-gnu
427
 
+       echo ${UNAME_MACHINE}-unknown-linux-gnu
428
 
        exit ;;
429
 
     vax:Linux:*:*)
430
 
        echo ${UNAME_MACHINE}-dec-linux-gnu
431
 
        exit ;;
432
 
     x86_64:Linux:*:*)
433
 
-       echo x86_64-unknown-linux-gnu
434
 
+       echo ${UNAME_MACHINE}-unknown-linux-gnu
435
 
        exit ;;
436
 
     xtensa*:Linux:*:*)
437
 
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
438
 
+       echo ${UNAME_MACHINE}-unknown-linux-gnu
439
 
        exit ;;
440
 
     i*86:DYNIX/ptx:4*:*)
441
 
        # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
442
 
@@ -987,11 +1006,11 @@
443
 
        echo i386-sequent-sysv4
444
 
        exit ;;
445
 
     i*86:UNIX_SV:4.2MP:2.*)
446
 
-        # Unixware is an offshoot of SVR4, but it has its own version
447
 
-        # number series starting with 2...
448
 
-        # I am not positive that other SVR4 systems won't match this,
449
 
+       # Unixware is an offshoot of SVR4, but it has its own version
450
 
+       # number series starting with 2...
451
 
+       # I am not positive that other SVR4 systems won't match this,
452
 
        # I just have to hope.  -- rms.
453
 
-        # Use sysv4.2uw... so that sysv4* matches it.
454
 
+       # Use sysv4.2uw... so that sysv4* matches it.
455
 
        echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
456
 
        exit ;;
457
 
     i*86:OS/2:*:*)
458
 
@@ -1023,7 +1042,7 @@
459
 
        fi
460
 
        exit ;;
461
 
     i*86:*:5:[678]*)
462
 
-       # UnixWare 7.x, OpenUNIX and OpenServer 6.
463
 
+       # UnixWare 7.x, OpenUNIX and OpenServer 6.
464
 
        case `/bin/uname -X | grep "^Machine"` in
465
 
            *486*)           UNAME_MACHINE=i486 ;;
466
 
            *Pentium)        UNAME_MACHINE=i586 ;;
467
 
@@ -1051,13 +1070,13 @@
468
 
        exit ;;
469
 
     pc:*:*:*)
470
 
        # Left here for compatibility:
471
 
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
472
 
-        # the processor, so we play safe by assuming i586.
473
 
+       # uname -m prints for DJGPP always 'pc', but it prints nothing about
474
 
+       # the processor, so we play safe by assuming i586.
475
 
        # Note: whatever this is, it MUST be the same as what config.sub
476
 
        # prints for the "djgpp" host, or else GDB configury will decide that
477
 
        # this is a cross-build.
478
 
        echo i586-pc-msdosdjgpp
479
 
-        exit ;;
480
 
+       exit ;;
481
 
     Intel:Mach:3*:*)
482
 
        echo i386-pc-mach3
483
 
        exit ;;
484
 
@@ -1092,8 +1111,8 @@
485
 
        /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
486
 
          && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
487
 
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
488
 
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
489
 
-          && { echo i486-ncr-sysv4; exit; } ;;
490
 
+       /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
491
 
+         && { echo i486-ncr-sysv4; exit; } ;;
492
 
     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
493
 
        OS_REL='.3'
494
 
        test -r /etc/.relid \
495
 
@@ -1136,10 +1155,10 @@
496
 
                echo ns32k-sni-sysv
497
 
        fi
498
 
        exit ;;
499
 
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
500
 
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
501
 
-        echo i586-unisys-sysv4
502
 
-        exit ;;
503
 
+    PENTIUM:*:4.0*:*)  # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
504
 
+                       # says <Richard.M.Bartel@ccMail.Census.GOV>
505
 
+       echo i586-unisys-sysv4
506
 
+       exit ;;
507
 
     *:UNIX_System_V:4*:FTX*)
508
 
        # From Gerald Hewes <hewes@openmarket.com>.
509
 
        # How about differentiating between stratus architectures? -djm
510
 
@@ -1165,11 +1184,11 @@
511
 
        exit ;;
512
 
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
513
 
        if [ -d /usr/nec ]; then
514
 
-               echo mips-nec-sysv${UNAME_RELEASE}
515
 
+               echo mips-nec-sysv${UNAME_RELEASE}
516
 
        else
517
 
-               echo mips-unknown-sysv${UNAME_RELEASE}
518
 
+               echo mips-unknown-sysv${UNAME_RELEASE}
519
 
        fi
520
 
-        exit ;;
521
 
+       exit ;;
522
 
     BeBox:BeOS:*:*)    # BeOS running on hardware made by Be, PPC only.
523
 
        echo powerpc-be-beos
524
 
        exit ;;
525
 
@@ -1282,13 +1301,13 @@
526
 
        echo pdp10-unknown-its
527
 
        exit ;;
528
 
     SEI:*:*:SEIUX)
529
 
-        echo mips-sei-seiux${UNAME_RELEASE}
530
 
+       echo mips-sei-seiux${UNAME_RELEASE}
531
 
        exit ;;
532
 
     *:DragonFly:*:*)
533
 
        echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
534
 
        exit ;;
535
 
     *:*VMS:*:*)
536
 
-       UNAME_MACHINE=`(uname -p) 2>/dev/null`
537
 
+       UNAME_MACHINE=`(uname -p) 2>/dev/null`
538
 
        case "${UNAME_MACHINE}" in
539
 
            A*) echo alpha-dec-vms ; exit ;;
540
 
            I*) echo ia64-dec-vms ; exit ;;
541
 
@@ -1306,6 +1325,9 @@
542
 
     i*86:AROS:*:*)
543
 
        echo ${UNAME_MACHINE}-pc-aros
544
 
        exit ;;
545
 
+    x86_64:VMkernel:*:*)
546
 
+       echo ${UNAME_MACHINE}-unknown-esx
547
 
+       exit ;;
548
 
 esac
549
 
 
550
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
551
 
@@ -1328,11 +1350,11 @@
552
 
 #include <sys/param.h>
553
 
   printf ("m68k-sony-newsos%s\n",
554
 
 #ifdef NEWSOS4
555
 
-          "4"
556
 
+       "4"
557
 
 #else
558
 
-         ""
559
 
+       ""
560
 
 #endif
561
 
-         ); exit (0);
562
 
+       ); exit (0);
563
 
 #endif
564
 
 #endif
565
 
 
566
 
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gnupg-1.4.11~/scripts/config.sub gnupg-1.4.11/scripts/config.sub
567
 
--- gnupg-1.4.11~/scripts/config.sub    2010-10-18 10:06:48.000000000 +0100
568
 
+++ gnupg-1.4.11/scripts/config.sub     2012-10-04 11:55:19.000000000 +0100
569
 
@@ -1,10 +1,10 @@
570
 
 #! /bin/sh
571
 
 # Configuration validation subroutine script.
572
 
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
573
 
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
574
 
-#   Free Software Foundation, Inc.
575
 
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
576
 
+#   2011, 2012 Free Software Foundation, Inc.
577
 
 
578
 
-timestamp='2010-09-11'
579
 
+timestamp='2012-04-18'
580
 
 
581
 
 # This file is (in principle) common to ALL GNU software.
582
 
 # The presence of a machine in this file suggests that SOME GNU software
583
 
@@ -21,9 +21,7 @@
584
 
 # GNU General Public License for more details.
585
 
 #
586
 
 # You should have received a copy of the GNU General Public License
587
 
-# along with this program; if not, write to the Free Software
588
 
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
589
 
-# 02110-1301, USA.
590
 
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
591
 
 #
592
 
 # As a special exception to the GNU General Public License, if you
593
 
 # distribute this file as part of a program that contains a
594
 
@@ -76,8 +74,8 @@
595
 
 GNU config.sub ($timestamp)
596
 
 
597
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
598
 
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
599
 
-Software Foundation, Inc.
600
 
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
601
 
+Free Software Foundation, Inc.
602
 
 
603
 
 This is free software; see the source for copying conditions.  There is NO
604
 
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
605
 
@@ -132,6 +130,10 @@
606
 
     os=-$maybe_os
607
 
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
608
 
     ;;
609
 
+  android-linux)
610
 
+    os=-linux-android
611
 
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
612
 
+    ;;
613
 
   *)
614
 
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
615
 
     if [ $basic_machine != $1 ]
616
 
@@ -158,8 +160,8 @@
617
 
                os=
618
 
                basic_machine=$1
619
 
                ;;
620
 
-        -bluegene*)
621
 
-               os=-cnk
622
 
+       -bluegene*)
623
 
+               os=-cnk
624
 
                ;;
625
 
        -sim | -cisco | -oki | -wec | -winbond)
626
 
                os=
627
 
@@ -175,10 +177,10 @@
628
 
                os=-chorusos
629
 
                basic_machine=$1
630
 
                ;;
631
 
-       -chorusrdb)
632
 
-               os=-chorusrdb
633
 
+       -chorusrdb)
634
 
+               os=-chorusrdb
635
 
                basic_machine=$1
636
 
-               ;;
637
 
+               ;;
638
 
        -hiux*)
639
 
                os=-hiuxwe2
640
 
                ;;
641
 
@@ -223,6 +225,12 @@
642
 
        -isc*)
643
 
                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
644
 
                ;;
645
 
+       -lynx*178)
646
 
+               os=-lynxos178
647
 
+               ;;
648
 
+       -lynx*5)
649
 
+               os=-lynxos5
650
 
+               ;;
651
 
        -lynx*)
652
 
                os=-lynxos
653
 
                ;;
654
 
@@ -247,17 +255,22 @@
655
 
        # Some are omitted here because they have special meanings below.
656
 
        1750a | 580 \
657
 
        | a29k \
658
 
+       | aarch64 | aarch64_be \
659
 
        | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
660
 
        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
661
 
        | am33_2.0 \
662
 
        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
663
 
+        | be32 | be64 \
664
 
        | bfin \
665
 
        | c4x | clipper \
666
 
        | d10v | d30v | dlx | dsp16xx \
667
 
+       | epiphany \
668
 
        | fido | fr30 | frv \
669
 
        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
670
 
+       | hexagon \
671
 
        | i370 | i860 | i960 | ia64 \
672
 
        | ip2k | iq2000 \
673
 
+       | le32 | le64 \
674
 
        | lm32 \
675
 
        | m32c | m32r | m32rle | m68000 | m68k | m88k \
676
 
        | maxq | mb | microblaze | mcore | mep | metag \
677
 
@@ -286,22 +299,23 @@
678
 
        | nds32 | nds32le | nds32be \
679
 
        | nios | nios2 \
680
 
        | ns16k | ns32k \
681
 
+       | open8 \
682
 
        | or32 \
683
 
        | pdp10 | pdp11 | pj | pjl \
684
 
-       | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
685
 
+       | powerpc | powerpc64 | powerpc64le | powerpcle \
686
 
        | pyramid \
687
 
-       | rx \
688
 
+       | rl78 | rx \
689
 
        | score \
690
 
        | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
691
 
        | sh64 | sh64le \
692
 
        | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
693
 
        | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
694
 
-       | spu | strongarm \
695
 
-       | tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
696
 
+       | spu \
697
 
+       | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
698
 
        | ubicom32 \
699
 
-       | v850 | v850e \
700
 
+       | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
701
 
        | we32k \
702
 
-       | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
703
 
+       | x86 | xc16x | xstormy16 | xtensa \
704
 
        | z8k | z80)
705
 
                basic_machine=$basic_machine-unknown
706
 
                ;;
707
 
@@ -314,8 +328,7 @@
708
 
        c6x)
709
 
                basic_machine=tic6x-unknown
710
 
                ;;
711
 
-       m6811 | m68hc11 | m6812 | m68hc12 | picochip)
712
 
-               # Motorola 68HC11/12.
713
 
+       m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
714
 
                basic_machine=$basic_machine-unknown
715
 
                os=-none
716
 
                ;;
717
 
@@ -325,6 +338,21 @@
718
 
                basic_machine=mt-unknown
719
 
                ;;
720
 
 
721
 
+       strongarm | thumb | xscale)
722
 
+               basic_machine=arm-unknown
723
 
+               ;;
724
 
+       xgate)
725
 
+               basic_machine=$basic_machine-unknown
726
 
+               os=-none
727
 
+               ;;
728
 
+       xscaleeb)
729
 
+               basic_machine=armeb-unknown
730
 
+               ;;
731
 
+
732
 
+       xscaleel)
733
 
+               basic_machine=armel-unknown
734
 
+               ;;
735
 
+
736
 
        # We use `pc' rather than `unknown'
737
 
        # because (1) that's what they normally are, and
738
 
        # (2) the word "unknown" tends to confuse beginning users.
739
 
@@ -339,11 +367,13 @@
740
 
        # Recognize the basic CPU types with company name.
741
 
        580-* \
742
 
        | a29k-* \
743
 
+       | aarch64-* | aarch64_be-* \
744
 
        | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
745
 
        | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
746
 
        | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
747
 
        | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
748
 
        | avr-* | avr32-* \
749
 
+       | be32-* | be64-* \
750
 
        | bfin-* | bs2000-* \
751
 
        | c[123]* | c30-* | [cjt]90-* | c4x-* \
752
 
        | clipper-* | craynv-* | cydra-* \
753
 
@@ -352,8 +382,10 @@
754
 
        | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
755
 
        | h8300-* | h8500-* \
756
 
        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
757
 
+       | hexagon-* \
758
 
        | i*86-* | i860-* | i960-* | ia64-* \
759
 
        | ip2k-* | iq2000-* \
760
 
+       | le32-* | le64-* \
761
 
        | lm32-* \
762
 
        | m32c-* | m32r-* | m32rle-* \
763
 
        | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
764
 
@@ -382,24 +414,26 @@
765
 
        | nds32-* | nds32le-* | nds32be-* \
766
 
        | nios-* | nios2-* \
767
 
        | none-* | np1-* | ns16k-* | ns32k-* \
768
 
+       | open8-* \
769
 
        | orion-* \
770
 
        | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
771
 
-       | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
772
 
+       | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
773
 
        | pyramid-* \
774
 
-       | romp-* | rs6000-* | rx-* \
775
 
+       | rl78-* | romp-* | rs6000-* | rx-* \
776
 
        | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
777
 
        | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
778
 
        | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
779
 
        | sparclite-* \
780
 
-       | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
781
 
-       | tahoe-* | thumb-* \
782
 
+       | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
783
 
+       | tahoe-* \
784
 
        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
785
 
-       | tile-* | tilegx-* \
786
 
+       | tile*-* \
787
 
        | tron-* \
788
 
        | ubicom32-* \
789
 
-       | v850-* | v850e-* | vax-* \
790
 
+       | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
791
 
+       | vax-* \
792
 
        | we32k-* \
793
 
-       | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
794
 
+       | x86-* | x86_64-* | xc16x-* | xps100-* \
795
 
        | xstormy16-* | xtensa*-* \
796
 
        | ymp-* \
797
 
        | z8k-* | z80-*)
798
 
@@ -424,7 +458,7 @@
799
 
                basic_machine=a29k-amd
800
 
                os=-udi
801
 
                ;;
802
 
-       abacus)
803
 
+       abacus)
804
 
                basic_machine=abacus-unknown
805
 
                ;;
806
 
        adobe68k)
807
 
@@ -507,7 +541,7 @@
808
 
                basic_machine=c90-cray
809
 
                os=-unicos
810
 
                ;;
811
 
-        cegcc)
812
 
+       cegcc)
813
 
                basic_machine=arm-unknown
814
 
                os=-cegcc
815
 
                ;;
816
 
@@ -539,7 +573,7 @@
817
 
                basic_machine=craynv-cray
818
 
                os=-unicosmp
819
 
                ;;
820
 
-       cr16)
821
 
+       cr16 | cr16-*)
822
 
                basic_machine=cr16-unknown
823
 
                os=-elf
824
 
                ;;
825
 
@@ -697,7 +731,6 @@
826
 
        i370-ibm* | ibm*)
827
 
                basic_machine=i370-ibm
828
 
                ;;
829
 
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
830
 
        i*86v32)
831
 
                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
832
 
                os=-sysv32
833
 
@@ -755,7 +788,7 @@
834
 
                basic_machine=ns32k-utek
835
 
                os=-sysv
836
 
                ;;
837
 
-        microblaze)
838
 
+       microblaze)
839
 
                basic_machine=microblaze-xilinx
840
 
                ;;
841
 
        mingw32)
842
 
@@ -794,10 +827,18 @@
843
 
        ms1-*)
844
 
                basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
845
 
                ;;
846
 
+       msys)
847
 
+               basic_machine=i386-pc
848
 
+               os=-msys
849
 
+               ;;
850
 
        mvs)
851
 
                basic_machine=i370-ibm
852
 
                os=-mvs
853
 
                ;;
854
 
+       nacl)
855
 
+               basic_machine=le32-unknown
856
 
+               os=-nacl
857
 
+               ;;
858
 
        ncr3000)
859
 
                basic_machine=i486-ncr
860
 
                os=-sysv4
861
 
@@ -862,10 +903,10 @@
862
 
        np1)
863
 
                basic_machine=np1-gould
864
 
                ;;
865
 
-        neo-tandem)
866
 
+       neo-tandem)
867
 
                basic_machine=neo-tandem
868
 
                ;;
869
 
-        nse-tandem)
870
 
+       nse-tandem)
871
 
                basic_machine=nse-tandem
872
 
                ;;
873
 
        nsr-tandem)
874
 
@@ -950,9 +991,10 @@
875
 
                ;;
876
 
        power)  basic_machine=power-ibm
877
 
                ;;
878
 
-       ppc)    basic_machine=powerpc-unknown
879
 
+       ppc | ppcbe)    basic_machine=powerpc-unknown
880
 
                ;;
881
 
-       ppc-*)  basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
882
 
+       ppc-* | ppcbe-*)
883
 
+               basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
884
 
                ;;
885
 
        ppcle | powerpclittle | ppc-le | powerpc-little)
886
 
                basic_machine=powerpcle-unknown
887
 
@@ -1046,6 +1088,9 @@
888
 
                basic_machine=i860-stratus
889
 
                os=-sysv4
890
 
                ;;
891
 
+       strongarm-* | thumb-*)
892
 
+               basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
893
 
+               ;;
894
 
        sun2)
895
 
                basic_machine=m68000-sun
896
 
                ;;
897
 
@@ -1102,13 +1147,8 @@
898
 
                basic_machine=t90-cray
899
 
                os=-unicos
900
 
                ;;
901
 
-        # This must be matched before tile*.
902
 
-        tilegx*)
903
 
-               basic_machine=tilegx-unknown
904
 
-               os=-linux-gnu
905
 
-               ;;
906
 
        tile*)
907
 
-               basic_machine=tile-unknown
908
 
+               basic_machine=$basic_machine-unknown
909
 
                os=-linux-gnu
910
 
                ;;
911
 
        tx39)
912
 
@@ -1178,6 +1218,9 @@
913
 
        xps | xps100)
914
 
                basic_machine=xps100-honeywell
915
 
                ;;
916
 
+       xscale-* | xscalee[bl]-*)
917
 
+               basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
918
 
+               ;;
919
 
        ymp)
920
 
                basic_machine=ymp-cray
921
 
                os=-unicos
922
 
@@ -1275,11 +1318,11 @@
923
 
 if [ x"$os" != x"" ]
924
 
 then
925
 
 case $os in
926
 
-        # First match some system type aliases
927
 
-        # that might get confused with valid system types.
928
 
+       # First match some system type aliases
929
 
+       # that might get confused with valid system types.
930
 
        # -solaris* is a basic system type, with this one exception.
931
 
-        -auroraux)
932
 
-               os=-auroraux
933
 
+       -auroraux)
934
 
+               os=-auroraux
935
 
                ;;
936
 
        -solaris1 | -solaris1.*)
937
 
                os=`echo $os | sed -e 's|solaris1|sunos4|'`
938
 
@@ -1315,7 +1358,7 @@
939
 
              | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
940
 
              | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
941
 
              | -chorusos* | -chorusrdb* | -cegcc* \
942
 
-             | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
943
 
+             | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
944
 
              | -mingw32* | -linux-gnu* | -linux-android* \
945
 
              | -linux-newlib* | -linux-uclibc* \
946
 
              | -uxpv* | -beos* | -mpeix* | -udk* \
947
 
@@ -1364,7 +1407,7 @@
948
 
        -opened*)
949
 
                os=-openedition
950
 
                ;;
951
 
-        -os400*)
952
 
+       -os400*)
953
 
                os=-os400
954
 
                ;;
955
 
        -wince*)
956
 
@@ -1413,7 +1456,7 @@
957
 
        -sinix*)
958
 
                os=-sysv4
959
 
                ;;
960
 
-        -tpf*)
961
 
+       -tpf*)
962
 
                os=-tpf
963
 
                ;;
964
 
        -triton*)
965
 
@@ -1458,8 +1501,8 @@
966
 
        -dicos*)
967
 
                os=-dicos
968
 
                ;;
969
 
-        -nacl*)
970
 
-               ;;
971
 
+       -nacl*)
972
 
+               ;;
973
 
        -none)
974
 
                ;;
975
 
        *)
976
 
@@ -1482,10 +1525,10 @@
977
 
 # system, and we'll never get to this point.
978
 
 
979
 
 case $basic_machine in
980
 
-        score-*)
981
 
+       score-*)
982
 
                os=-elf
983
 
                ;;
984
 
-        spu-*)
985
 
+       spu-*)
986
 
                os=-elf
987
 
                ;;
988
 
        *-acorn)
989
 
@@ -1497,8 +1540,11 @@
990
 
        arm*-semi)
991
 
                os=-aout
992
 
                ;;
993
 
-        c4x-* | tic4x-*)
994
 
-               os=-coff
995
 
+       c4x-* | tic4x-*)
996
 
+               os=-coff
997
 
+               ;;
998
 
+       hexagon-*)
999
 
+               os=-elf
1000
 
                ;;
1001
 
        tic54x-*)
1002
 
                os=-coff
1003
 
@@ -1527,14 +1573,11 @@
1004
 
                ;;
1005
 
        m68000-sun)
1006
 
                os=-sunos3
1007
 
-               # This also exists in the configure program, but was not the
1008
 
-               # default.
1009
 
-               # os=-sunos4
1010
 
                ;;
1011
 
        m68*-cisco)
1012
 
                os=-aout
1013
 
                ;;
1014
 
-        mep-*)
1015
 
+       mep-*)
1016
 
                os=-elf
1017
 
                ;;
1018
 
        mips*-cisco)
1019
 
@@ -1561,7 +1604,7 @@
1020
 
        *-ibm)
1021
 
                os=-aix
1022
 
                ;;
1023
 
-       *-knuth)
1024
 
+       *-knuth)
1025
 
                os=-mmixware
1026
 
                ;;
1027
 
        *-wec)