~ubuntu-branches/ubuntu/trusty/dropbear/trusty-proposed : revision 20

1

diff -urN '--exclude=.pc*' a/config.guess b/config.guess

2

--- a/config.guess 2012-02-23 13:47:05.000000000 +0000

3

+++ b/config.guess 2012-09-28 14:19:10.000000000 +0100

4

@@ -1,10 +1,10 @@

5

#! /bin/sh

6

# Attempt to guess a canonical system name.

7

8

-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,

9

-# Inc.

10

+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,

11

+# 2011, 2012 Free Software Foundation, Inc.

12

13

-timestamp='2007-01-15'

14

+timestamp='2012-02-10'

15

16

# This file is free software; you can redistribute it and/or modify it

17

# under the terms of the GNU General Public License as published by

18

@@ -17,9 +17,7 @@

19

# General Public License for more details.

20

#

21

# You should have received a copy of the GNU General Public License

22

-# along with this program; if not, write to the Free Software

23

-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA

24

-# 02110-1301, USA.

25

+# along with this program; if not, see <http://www.gnu.org/licenses/>.

26

#

27

# As a special exception to the GNU General Public License, if you

28

# distribute this file as part of a program that contains a

29

@@ -27,16 +25,16 @@

30

# the same distribution terms that you use for the rest of that program.

31

32

33

-# Originally written by Per Bothner <per@bothner.com>.

34

-# Please send patches to <config-patches@gnu.org>. Submit a context

35

-# diff and a properly formatted ChangeLog entry.

36

+# Originally written by Per Bothner. Please send patches (context

37

+# diff format) to <config-patches@gnu.org> and include a ChangeLog

38

+# entry.

39

#

40

# This script attempts to guess a canonical system name similar to

41

# config.sub. If it succeeds, it prints the system name on stdout, and

42

# exits with 0. Otherwise, it exits with 1.

43

#

44

-# The plan is that this can be called by configure scripts if you

45

-# don't specify an explicit build system type.

46

+# You can get the latest version of this script from:

47

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

48

49

me=`echo "$0" | sed -e 's,.*/,,'`

50

51

@@ -56,7 +54,8 @@

52

GNU config.guess ($timestamp)

53

54

Originally written by Per Bothner.

55

56

57

+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012

58

Free Software Foundation, Inc.

59

60

This is free software; see the source for copying conditions. There is NO

61

@@ -144,7 +143,7 @@

62

case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in

63

*:NetBSD:*:*)

64

# NetBSD (nbsd) targets should (where applicable) match one or

65

- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,

66

+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,

67

# *-*-netbsdecoff* and *-*-netbsd*. For targets that recently

68

# switched to ELF, *-*-netbsd* would select the old

69

# object file format. This provides both forward

70

@@ -170,7 +169,7 @@

71

arm*|i386|m68k|ns32k|sh3*|sparc|vax)

72

eval $set_cc_for_build

73

if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \

74

- | grep __ELF__ >/dev/null

75

+ | grep -q __ELF__

76

then

77

# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).

78

# Return netbsd for either. FIX?

79

@@ -180,7 +179,7 @@

80

fi

81

;;

82

*)

83

- os=netbsd

84

+ os=netbsd

85

;;

86

esac

87

# The OS release

88

@@ -223,7 +222,7 @@

89

UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`

90

;;

91

*5.*)

92

- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`

93

+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`

94

;;

95

esac

96

# According to Compaq, /usr/sbin/psrinfo has been available on

97

@@ -269,7 +268,10 @@

98

# A Xn.n version is an unreleased experimental baselevel.

99

# 1.2 uses "1.2" for uname -r.

100

echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`

101

- exit ;;

102

+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code.

103

+ exitcode=$?

104

+ trap '' 0

105

+ exit $exitcode ;;

106

Alpha\ *:Windows_NT*:*)

107

# How do we know it's Interix rather than the generic POSIX subsystem?

108

# Should we change UNAME_MACHINE based on the output of uname instead

109

@@ -295,7 +297,7 @@

110

echo s390-ibm-zvmoe

111

exit ;;

112

*:OS400:*:*)

113

- echo powerpc-ibm-os400

114

+ echo powerpc-ibm-os400

115

exit ;;

116

arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)

117

echo arm-acorn-riscix${UNAME_RELEASE}

118

@@ -324,14 +326,33 @@

119

case `/usr/bin/uname -p` in

120

sparc) echo sparc-icl-nx7; exit ;;

121

esac ;;

122

+ s390x:SunOS:*:*)

123

+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`

124

+ exit ;;

125

sun4H:SunOS:5.*:*)

126

echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`

127

exit ;;

128

sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)

129

echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`

130

exit ;;

131

- i86pc:SunOS:5.*:*)

132

- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`

133

+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)

134

+ echo i386-pc-auroraux${UNAME_RELEASE}

135

+ exit ;;

136

+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)

137

+ eval $set_cc_for_build

138

+ SUN_ARCH="i386"

139

+ # If there is a compiler, see if it is configured for 64-bit objects.

140

+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.

141

+ # This test works for both compilers.

142

+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then

143

+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \

144

+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \

145

+ grep IS_64BIT_ARCH >/dev/null

146

+ then

147

+ SUN_ARCH="x86_64"

148

+ fi

149

+ fi

150

+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`

151

exit ;;

152

sun4*:SunOS:6*:*)

153

# According to config.sub, this is the proper way to canonicalize

154

@@ -375,23 +396,23 @@

155

# MiNT. But MiNT is downward compatible to TOS, so this should

156

# be no problem.

157

atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)

158

- echo m68k-atari-mint${UNAME_RELEASE}

159

+ echo m68k-atari-mint${UNAME_RELEASE}

160

exit ;;

161

atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)

162

echo m68k-atari-mint${UNAME_RELEASE}

163

- exit ;;

164

+ exit ;;

165

*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)

166

- echo m68k-atari-mint${UNAME_RELEASE}

167

+ echo m68k-atari-mint${UNAME_RELEASE}

168

exit ;;

169

milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)

170

- echo m68k-milan-mint${UNAME_RELEASE}

171

- exit ;;

172

+ echo m68k-milan-mint${UNAME_RELEASE}

173

+ exit ;;

174

hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)

175

- echo m68k-hades-mint${UNAME_RELEASE}

176

- exit ;;

177

+ echo m68k-hades-mint${UNAME_RELEASE}

178

+ exit ;;

179

*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)

180

- echo m68k-unknown-mint${UNAME_RELEASE}

181

- exit ;;

182

+ echo m68k-unknown-mint${UNAME_RELEASE}

183

+ exit ;;

184

m68k:machten:*:*)

185

echo m68k-apple-machten${UNAME_RELEASE}

186

exit ;;

187

@@ -461,8 +482,8 @@

188

echo m88k-motorola-sysv3

189

exit ;;

190

AViiON:dgux:*:*)

191

- # DG/UX returns AViiON for all architectures

192

- UNAME_PROCESSOR=`/usr/bin/uname -p`

193

+ # DG/UX returns AViiON for all architectures

194

+ UNAME_PROCESSOR=`/usr/bin/uname -p`

195

if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]

196

then

197

if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \

198

@@ -475,7 +496,7 @@

199

else

200

echo i586-dg-dgux${UNAME_RELEASE}

201

fi

202

- exit ;;

203

+ exit ;;

204

M88*:DolphinOS:*:*) # DolphinOS (SVR3)

205

echo m88k-dolphin-sysv3

206

exit ;;

207

@@ -532,7 +553,7 @@

208

echo rs6000-ibm-aix3.2

209

fi

210

exit ;;

211

- *:AIX:*:[45])

212

+ *:AIX:*:[4567])

213

IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`

214

if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then

215

IBM_ARCH=rs6000

216

@@ -575,52 +596,52 @@

217

9000/[678][0-9][0-9])

218

if [ -x /usr/bin/getconf ]; then

219

sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`

220

- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`

221

- case "${sc_cpu_version}" in

222

- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0

223

- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1

224

- 532) # CPU_PA_RISC2_0

225

- case "${sc_kernel_bits}" in

226

- 32) HP_ARCH="hppa2.0n" ;;

227

- 64) HP_ARCH="hppa2.0w" ;;

228

+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`

229

+ case "${sc_cpu_version}" in

230

+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0

231

+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1

232

+ 532) # CPU_PA_RISC2_0

233

+ case "${sc_kernel_bits}" in

234

+ 32) HP_ARCH="hppa2.0n" ;;

235

+ 64) HP_ARCH="hppa2.0w" ;;

236

'') HP_ARCH="hppa2.0" ;; # HP-UX 10.20

237

- esac ;;

238

- esac

239

+ esac ;;

240

+ esac

241

fi

242

if [ "${HP_ARCH}" = "" ]; then

243

eval $set_cc_for_build

244

- sed 's/^ //' << EOF >$dummy.c

245

+ sed 's/^ //' << EOF >$dummy.c

246

+

247

+ #define _HPUX_SOURCE

248

+ #include <stdlib.h>

249

+ #include <unistd.h>

250

251

- #define _HPUX_SOURCE

252

- #include <stdlib.h>

253

- #include <unistd.h>

254

-

255

- int main ()

256

- {

257

- #if defined(_SC_KERNEL_BITS)

258

- long bits = sysconf(_SC_KERNEL_BITS);

259

- #endif

260

- long cpu = sysconf (_SC_CPU_VERSION);

261

-

262

- switch (cpu)

263

- {

264

- case CPU_PA_RISC1_0: puts ("hppa1.0"); break;

265

- case CPU_PA_RISC1_1: puts ("hppa1.1"); break;

266

- case CPU_PA_RISC2_0:

267

- #if defined(_SC_KERNEL_BITS)

268

- switch (bits)

269

- {

270

- case 64: puts ("hppa2.0w"); break;

271

- case 32: puts ("hppa2.0n"); break;

272

- default: puts ("hppa2.0"); break;

273

- } break;

274

- #else /* !defined(_SC_KERNEL_BITS) */

275

- puts ("hppa2.0"); break;

276

- #endif

277

- default: puts ("hppa1.0"); break;

278

- }

279

- exit (0);

280

- }

281

+ int main ()

282

+ {

283

+ #if defined(_SC_KERNEL_BITS)

284

+ long bits = sysconf(_SC_KERNEL_BITS);

285

+ #endif

286

+ long cpu = sysconf (_SC_CPU_VERSION);

287

+

288

+ switch (cpu)

289

+ {

290

+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;

291

+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;

292

+ case CPU_PA_RISC2_0:

293

+ #if defined(_SC_KERNEL_BITS)

294

+ switch (bits)

295

+ {

296

+ case 64: puts ("hppa2.0w"); break;

297

+ case 32: puts ("hppa2.0n"); break;

298

+ default: puts ("hppa2.0"); break;

299

+ } break;

300

+ #else /* !defined(_SC_KERNEL_BITS) */

301

+ puts ("hppa2.0"); break;

302

+ #endif

303

+ default: puts ("hppa1.0"); break;

304

+ }

305

+ exit (0);

306

+ }

307

EOF

308

(CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`

309

test -z "$HP_ARCH" && HP_ARCH=hppa

310

@@ -640,7 +661,7 @@

311

# => hppa64-hp-hpux11.23

312

313

if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |

314

- grep __LP64__ >/dev/null

315

+ grep -q __LP64__

316

then

317

HP_ARCH="hppa2.0w"

318

else

319

@@ -711,22 +732,22 @@

320

exit ;;

321

C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)

322

echo c1-convex-bsd

323

- exit ;;

324

+ exit ;;

325

C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)

326

if getsysinfo -f scalar_acc

327

then echo c32-convex-bsd

328

else echo c2-convex-bsd

329

fi

330

- exit ;;

331

+ exit ;;

332

C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)

333

echo c34-convex-bsd

334

- exit ;;

335

+ exit ;;

336

C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)

337

echo c38-convex-bsd

338

- exit ;;

339

+ exit ;;

340

C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)

341

echo c4-convex-bsd

342

- exit ;;

343

+ exit ;;

344

CRAY*Y-MP:*:*:*)

345

echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'

346

exit ;;

347

@@ -750,14 +771,14 @@

348

exit ;;

349

F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)

350

FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`

351

- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`

352

- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`

353

- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"

354

- exit ;;

355

+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`

356

+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`

357

+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"

358

+ exit ;;

359

5000:UNIX_System_V:4.*:*)

360

- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`

361

- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`

362

- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"

363

+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`

364

+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`

365

+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"

366

exit ;;

367

i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)

368

echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}

369

@@ -769,13 +790,12 @@

370

echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}

371

exit ;;

372

*:FreeBSD:*:*)

373

- case ${UNAME_MACHINE} in

374

- pc98)

375

- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;

376

+ UNAME_PROCESSOR=`/usr/bin/uname -p`

377

+ case ${UNAME_PROCESSOR} in

378

amd64)

379

echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;

380

*)

381

- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;

382

+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;

383

esac

384

exit ;;

385

i*:CYGWIN*:*)

386

@@ -784,22 +804,34 @@

387

*:MINGW*:*)

388

echo ${UNAME_MACHINE}-pc-mingw32

389

exit ;;

390

+ i*:MSYS*:*)

391

+ echo ${UNAME_MACHINE}-pc-msys

392

+ exit ;;

393

i*:windows32*:*)

394

- # uname -m includes "-pc" on this system.

395

- echo ${UNAME_MACHINE}-mingw32

396

+ # uname -m includes "-pc" on this system.

397

+ echo ${UNAME_MACHINE}-mingw32

398

exit ;;

399

i*:PW*:*)

400

echo ${UNAME_MACHINE}-pc-pw32

401

exit ;;

402

- x86:Interix*:[3456]*)

403

- echo i586-pc-interix${UNAME_RELEASE}

404

- exit ;;

405

- EM64T:Interix*:[3456]* | authenticamd:Interix*:[3456]*)

406

- echo x86_64-unknown-interix${UNAME_RELEASE}

407

- exit ;;

408

+ *:Interix*:*)

409

+ case ${UNAME_MACHINE} in

410

+ x86)

411

+ echo i586-pc-interix${UNAME_RELEASE}

412

+ exit ;;

413

+ authenticamd | genuineintel | EM64T)

414

+ echo x86_64-unknown-interix${UNAME_RELEASE}

415

+ exit ;;

416

+ IA64)

417

+ echo ia64-unknown-interix${UNAME_RELEASE}

418

+ exit ;;

419

+ esac ;;

420

[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)

421

echo i${UNAME_MACHINE}-pc-mks

422

exit ;;

423

+ 8664:Windows_NT:*)

424

+ echo x86_64-pc-mks

425

+ exit ;;

426

i*:Windows_NT*:* | Pentium*:Windows_NT*:*)

427

# How do we know it's Interix rather than the generic POSIX subsystem?

428

# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we

429

@@ -829,20 +861,68 @@

430

i*86:Minix:*:*)

431

echo ${UNAME_MACHINE}-pc-minix

432

exit ;;

433

- arm*:Linux:*:*)

434

+ aarch64:Linux:*:*)

435

echo ${UNAME_MACHINE}-unknown-linux-gnu

436

exit ;;

437

+ aarch64_be:Linux:*:*)

438

+ UNAME_MACHINE=aarch64_be

439

+ echo ${UNAME_MACHINE}-unknown-linux-gnu

440

+ exit ;;

441

+ alpha:Linux:*:*)

442

+ case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in

443

+ EV5) UNAME_MACHINE=alphaev5 ;;

444

+ EV56) UNAME_MACHINE=alphaev56 ;;

445

+ PCA56) UNAME_MACHINE=alphapca56 ;;

446

+ PCA57) UNAME_MACHINE=alphapca56 ;;

447

+ EV6) UNAME_MACHINE=alphaev6 ;;

448

+ EV67) UNAME_MACHINE=alphaev67 ;;

449

+ EV68*) UNAME_MACHINE=alphaev68 ;;

450

+ esac

451

+ objdump --private-headers /bin/sh | grep -q ld.so.1

452

+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi

453

+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}

454

+ exit ;;

455

+ arm*:Linux:*:*)

456

+ eval $set_cc_for_build

457

+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \

458

+ | grep -q __ARM_EABI__

459

+ then

460

+ echo ${UNAME_MACHINE}-unknown-linux-gnu

461

+ else

462

+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \

463

+ | grep -q __ARM_PCS_VFP

464

+ then

465

+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi

466

+ else

467

+ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf

468

+ fi

469

+ fi

470

+ exit ;;

471

avr32*:Linux:*:*)

472

echo ${UNAME_MACHINE}-unknown-linux-gnu

473

exit ;;

474

cris:Linux:*:*)

475

- echo cris-axis-linux-gnu

476

+ echo ${UNAME_MACHINE}-axis-linux-gnu

477

exit ;;

478

crisv32:Linux:*:*)

479

- echo crisv32-axis-linux-gnu

480

+ echo ${UNAME_MACHINE}-axis-linux-gnu

481

exit ;;

482

frv:Linux:*:*)

483

- echo frv-unknown-linux-gnu

484

+ echo ${UNAME_MACHINE}-unknown-linux-gnu

485

+ exit ;;

486

+ hexagon:Linux:*:*)

487

+ echo ${UNAME_MACHINE}-unknown-linux-gnu

488

+ exit ;;

489

+ i*86:Linux:*:*)

490

+ LIBC=gnu

491

+ eval $set_cc_for_build

492

+ sed 's/^ //' << EOF >$dummy.c

493

+ #ifdef __dietlibc__

494

+ LIBC=dietlibc

495

+ #endif

496

+EOF

497

+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`

498

+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"

499

exit ;;

500

ia64:Linux:*:*)

501

echo ${UNAME_MACHINE}-unknown-linux-gnu

502

@@ -853,74 +933,33 @@

503

m68*:Linux:*:*)

504

echo ${UNAME_MACHINE}-unknown-linux-gnu

505

exit ;;

506

- mips:Linux:*:*)

507

- eval $set_cc_for_build

508

- sed 's/^ //' << EOF >$dummy.c

509

- #undef CPU

510

- #undef mips

511

- #undef mipsel

512

- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)

513

- CPU=mipsel

514

- #else

515

- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)

516

- CPU=mips

517

- #else

518

- CPU=

519

- #endif

520

- #endif

521

-EOF

522

- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '

523

- /^CPU/{

524

- s: ::g

525

- p

526

- }'`"

527

- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }

528

- ;;

529

- mips64:Linux:*:*)

530

+ mips:Linux:*:* | mips64:Linux:*:*)

531

eval $set_cc_for_build

532

sed 's/^ //' << EOF >$dummy.c

533

#undef CPU

534

- #undef mips64

535

- #undef mips64el

536

+ #undef ${UNAME_MACHINE}

537

+ #undef ${UNAME_MACHINE}el

538

#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)

539

- CPU=mips64el

540

+ CPU=${UNAME_MACHINE}el

541

#else

542

#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)

543

- CPU=mips64

544

+ CPU=${UNAME_MACHINE}

545

#else

546

CPU=

547

#endif

548

#endif

549

EOF

550

- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '

551

- /^CPU/{

552

- s: ::g

553

- p

554

- }'`"

555

+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`

556

test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }

557

;;

558

or32:Linux:*:*)

559

- echo or32-unknown-linux-gnu

560

+ echo ${UNAME_MACHINE}-unknown-linux-gnu

561

exit ;;

562

- ppc:Linux:*:*)

563

- echo powerpc-unknown-linux-gnu

564

+ padre:Linux:*:*)

565

+ echo sparc-unknown-linux-gnu

566

exit ;;

567

- ppc64:Linux:*:*)

568

- echo powerpc64-unknown-linux-gnu

569

- exit ;;

570

- alpha:Linux:*:*)

571

- case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in

572

- EV5) UNAME_MACHINE=alphaev5 ;;

573

- EV56) UNAME_MACHINE=alphaev56 ;;

574

- PCA56) UNAME_MACHINE=alphapca56 ;;

575

- PCA57) UNAME_MACHINE=alphapca56 ;;

576

- EV6) UNAME_MACHINE=alphaev6 ;;

577

- EV67) UNAME_MACHINE=alphaev67 ;;

578

- EV68*) UNAME_MACHINE=alphaev68 ;;

579

- esac

580

- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null

581

- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi

582

- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}

583

+ parisc64:Linux:*:* | hppa64:Linux:*:*)

584

+ echo hppa64-unknown-linux-gnu

585

exit ;;

586

parisc:Linux:*:* | hppa:Linux:*:*)

587

# Look for CPU level

588

@@ -930,14 +969,17 @@

589

*) echo hppa-unknown-linux-gnu ;;

590

esac

591

exit ;;

592

- parisc64:Linux:*:* | hppa64:Linux:*:*)

593

- echo hppa64-unknown-linux-gnu

594

+ ppc64:Linux:*:*)

595

+ echo powerpc64-unknown-linux-gnu

596

+ exit ;;

597

+ ppc:Linux:*:*)

598

+ echo powerpc-unknown-linux-gnu

599

exit ;;

600

s390:Linux:*:* | s390x:Linux:*:*)

601

echo ${UNAME_MACHINE}-ibm-linux

602

exit ;;

603

sh64*:Linux:*:*)

604

- echo ${UNAME_MACHINE}-unknown-linux-gnu

605

+ echo ${UNAME_MACHINE}-unknown-linux-gnu

606

exit ;;

607

sh*:Linux:*:*)

608

echo ${UNAME_MACHINE}-unknown-linux-gnu

609

@@ -945,78 +987,18 @@

610

sparc:Linux:*:* | sparc64:Linux:*:*)

611

echo ${UNAME_MACHINE}-unknown-linux-gnu

612

exit ;;

613

+ tile*:Linux:*:*)

614

+ echo ${UNAME_MACHINE}-unknown-linux-gnu

615

+ exit ;;

616

vax:Linux:*:*)

617

echo ${UNAME_MACHINE}-dec-linux-gnu

618

exit ;;

619

x86_64:Linux:*:*)

620

- echo x86_64-unknown-linux-gnu

621

+ echo ${UNAME_MACHINE}-unknown-linux-gnu

622

exit ;;

623

- xtensa:Linux:*:*)

624

- echo xtensa-unknown-linux-gnu

625

+ xtensa*:Linux:*:*)

626

+ echo ${UNAME_MACHINE}-unknown-linux-gnu

627

exit ;;

628

- i*86:Linux:*:*)

629

- # The BFD linker knows what the default object file format is, so

630

- # first see if it will tell us. cd to the root directory to prevent

631

- # problems with other programs or directories called `ld' in the path.

632

- # Set LC_ALL=C to ensure ld outputs messages in English.

633

- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \

634

- | sed -ne '/supported targets:/!d

635

- s/[ ][ ]*/ /g

636

- s/.*supported targets: *//

637

- s/ .*//

638

- p'`

639

- case "$ld_supported_targets" in

640

- elf32-i386)

641

- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"

642

- ;;

643

- a.out-i386-linux)

644

- echo "${UNAME_MACHINE}-pc-linux-gnuaout"

645

- exit ;;

646

- coff-i386)

647

- echo "${UNAME_MACHINE}-pc-linux-gnucoff"

648

- exit ;;

649

- "")

650

- # Either a pre-BFD a.out linker (linux-gnuoldld) or

651

- # one that does not give us useful --help.

652

- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"

653

- exit ;;

654

- esac

655

- # Determine whether the default compiler is a.out or elf

656

- eval $set_cc_for_build

657

- sed 's/^ //' << EOF >$dummy.c

658

- #include <features.h>

659

- #ifdef __ELF__

660

- # ifdef __GLIBC__

661

- # if __GLIBC__ >= 2

662

- LIBC=gnu

663

- # else

664

- LIBC=gnulibc1

665

- # endif

666

- # else

667

- LIBC=gnulibc1

668

- # endif

669

- #else

670

- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)

671

- LIBC=gnu

672

- #else

673

- LIBC=gnuaout

674

- #endif

675

- #endif

676

- #ifdef __dietlibc__

677

- LIBC=dietlibc

678

- #endif

679

-EOF

680

- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '

681

- /^LIBC/{

682

- s: ::g

683

- p

684

- }'`"

685

- test x"${LIBC}" != x && {

686

- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"

687

- exit

688

- }

689

- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }

690

- ;;

691

i*86:DYNIX/ptx:4*:*)

692

# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.

693

# earlier versions are messed up and put the nodename in both

694

@@ -1024,11 +1006,11 @@

695

echo i386-sequent-sysv4

696

exit ;;

697

i*86:UNIX_SV:4.2MP:2.*)

698

- # Unixware is an offshoot of SVR4, but it has its own version

699

- # number series starting with 2...

700

- # I am not positive that other SVR4 systems won't match this,

701

+ # Unixware is an offshoot of SVR4, but it has its own version

702

+ # number series starting with 2...

703

+ # I am not positive that other SVR4 systems won't match this,

704

# I just have to hope. -- rms.

705

- # Use sysv4.2uw... so that sysv4* matches it.

706

+ # Use sysv4.2uw... so that sysv4* matches it.

707

echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}

708

exit ;;

709

i*86:OS/2:*:*)

710

@@ -1045,7 +1027,7 @@

711

i*86:syllable:*:*)

712

echo ${UNAME_MACHINE}-pc-syllable

713

exit ;;

714

- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)

715

+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)

716

echo i386-unknown-lynxos${UNAME_RELEASE}

717

exit ;;

718

i*86:*DOS:*:*)

719

@@ -1060,7 +1042,7 @@

720

fi

721

exit ;;

722

i*86:*:5:[678]*)

723

- # UnixWare 7.x, OpenUNIX and OpenServer 6.

724

+ # UnixWare 7.x, OpenUNIX and OpenServer 6.

725

case `/bin/uname -X | grep "^Machine"` in

726

*486*) UNAME_MACHINE=i486 ;;

727

*Pentium) UNAME_MACHINE=i586 ;;

728

@@ -1088,10 +1070,13 @@

729

exit ;;

730

pc:*:*:*)

731

# Left here for compatibility:

732

- # uname -m prints for DJGPP always 'pc', but it prints nothing about

733

- # the processor, so we play safe by assuming i386.

734

- echo i386-pc-msdosdjgpp

735

- exit ;;

736

+ # uname -m prints for DJGPP always 'pc', but it prints nothing about

737

+ # the processor, so we play safe by assuming i586.

738

+ # Note: whatever this is, it MUST be the same as what config.sub

739

+ # prints for the "djgpp" host, or else GDB configury will decide that

740

+ # this is a cross-build.

741

+ echo i586-pc-msdosdjgpp

742

+ exit ;;

743

Intel:Mach:3*:*)

744

echo i386-pc-mach3

745

exit ;;

746

@@ -1126,8 +1111,18 @@

747

/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \

748

&& { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;

749

3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)

750

- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \

751

- && { echo i486-ncr-sysv4; exit; } ;;

752

+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \

753

+ && { echo i486-ncr-sysv4; exit; } ;;

754

+ NCR*:*:4.2:* | MPRAS*:*:4.2:*)

755

+ OS_REL='.3'

756

+ test -r /etc/.relid \

757

+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`

758

+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \

759

+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }

760

+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \

761

+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; }

762

+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \

763

+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;

764

m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)

765

echo m68k-unknown-lynxos${UNAME_RELEASE}

766

exit ;;

767

@@ -1140,7 +1135,7 @@

768

rs6000:LynxOS:2.*:*)

769

echo rs6000-unknown-lynxos${UNAME_RELEASE}

770

exit ;;

771

- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)

772

+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)

773

echo powerpc-unknown-lynxos${UNAME_RELEASE}

774

exit ;;

775

SM[BE]S:UNIX_SV:*:*)

776

@@ -1160,10 +1155,10 @@

777

echo ns32k-sni-sysv

778

fi

779

exit ;;

780

- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort

781

- # says <Richard.M.Bartel@ccMail.Census.GOV>

782

- echo i586-unisys-sysv4

783

- exit ;;

784

+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort

785

+ # says <Richard.M.Bartel@ccMail.Census.GOV>

786

+ echo i586-unisys-sysv4

787

+ exit ;;

788

*:UNIX_System_V:4*:FTX*)

789

# From Gerald Hewes <hewes@openmarket.com>.

790

# How about differentiating between stratus architectures? -djm

791

@@ -1189,11 +1184,11 @@

792

exit ;;

793

R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)

794

if [ -d /usr/nec ]; then

795

- echo mips-nec-sysv${UNAME_RELEASE}

796

+ echo mips-nec-sysv${UNAME_RELEASE}

797

else

798

- echo mips-unknown-sysv${UNAME_RELEASE}

799

+ echo mips-unknown-sysv${UNAME_RELEASE}

800

fi

801

- exit ;;

802

+ exit ;;

803

BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.

804

echo powerpc-be-beos

805

exit ;;

806

@@ -1203,6 +1198,9 @@

807

BePC:BeOS:*:*) # BeOS running on Intel PC compatible.

808

echo i586-pc-beos

809

exit ;;

810

+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible.

811

+ echo i586-pc-haiku

812

+ exit ;;

813

SX-4:SUPER-UX:*:*)

814

echo sx4-nec-superux${UNAME_RELEASE}

815

exit ;;

816

@@ -1230,6 +1228,16 @@

817

*:Darwin:*:*)

818

UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown

819

case $UNAME_PROCESSOR in

820

+ i386)

821

+ eval $set_cc_for_build

822

+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then

823

+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \

824

+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \

825

+ grep IS_64BIT_ARCH >/dev/null

826

+ then

827

+ UNAME_PROCESSOR="x86_64"

828

+ fi

829

+ fi ;;

830

unknown) UNAME_PROCESSOR=powerpc ;;

831

esac

832

echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}

833

@@ -1245,6 +1253,9 @@

834

*:QNX:*:4*)

835

echo i386-pc-qnx

836

exit ;;

837

+ NEO-?:NONSTOP_KERNEL:*:*)

838

+ echo neo-tandem-nsk${UNAME_RELEASE}

839

+ exit ;;

840

NSE-?:NONSTOP_KERNEL:*:*)

841

echo nse-tandem-nsk${UNAME_RELEASE}

842

exit ;;

843

@@ -1290,13 +1301,13 @@

844

echo pdp10-unknown-its

845

exit ;;

846

SEI:*:*:SEIUX)

847

- echo mips-sei-seiux${UNAME_RELEASE}

848

+ echo mips-sei-seiux${UNAME_RELEASE}

849

exit ;;

850

*:DragonFly:*:*)

851

echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`

852

exit ;;

853

*:*VMS:*:*)

854

- UNAME_MACHINE=`(uname -p) 2>/dev/null`

855

+ UNAME_MACHINE=`(uname -p) 2>/dev/null`

856

case "${UNAME_MACHINE}" in

857

A*) echo alpha-dec-vms ; exit ;;

858

I*) echo ia64-dec-vms ; exit ;;

859

@@ -1311,6 +1322,12 @@

860

i*86:rdos:*:*)

861

echo ${UNAME_MACHINE}-pc-rdos

862

exit ;;

863

+ i*86:AROS:*:*)

864

+ echo ${UNAME_MACHINE}-pc-aros

865

+ exit ;;

866

+ x86_64:VMkernel:*:*)

867

+ echo ${UNAME_MACHINE}-unknown-esx

868

+ exit ;;

869

esac

870

871

#echo '(No uname command or uname output not recognized.)' 1>&2

872

@@ -1333,11 +1350,11 @@

873

#include <sys/param.h>

874

printf ("m68k-sony-newsos%s\n",

875

#ifdef NEWSOS4

876

- "4"

877

+ "4"

878

#else

879

- ""

880

+ ""

881

#endif

882

- ); exit (0);

883

+ ); exit (0);

884

#endif

885

#endif

886

887

@@ -1471,9 +1488,9 @@

888

the operating system you are using. It is advised that you

889

download the most up to date version of the config scripts from

890

891

- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess

892

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

893

and

894

- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub

895

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

896

897

If the version you run ($0) is already up to date, please

898

send the following data and any information you think might be

899

diff -urN '--exclude=.pc*' a/config.sub b/config.sub

900

--- a/config.sub 2012-02-23 13:47:05.000000000 +0000

901

+++ b/config.sub 2012-09-28 14:19:10.000000000 +0100

902

@@ -1,10 +1,10 @@

903

#! /bin/sh

904

# Configuration validation subroutine script.

905

906

-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,

907

-# Inc.

908

+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,

909

+# 2011, 2012 Free Software Foundation, Inc.

910

911

-timestamp='2007-01-18'

912

+timestamp='2012-04-18'

913

914

# This file is (in principle) common to ALL GNU software.

915

# The presence of a machine in this file suggests that SOME GNU software

916

@@ -21,9 +21,7 @@

917

# GNU General Public License for more details.

918

#

919

# You should have received a copy of the GNU General Public License

920

-# along with this program; if not, write to the Free Software

921

-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA

922

-# 02110-1301, USA.

923

+# along with this program; if not, see <http://www.gnu.org/licenses/>.

924

#

925

# As a special exception to the GNU General Public License, if you

926

# distribute this file as part of a program that contains a

927

@@ -32,13 +30,16 @@

928

929

930

# Please send patches to <config-patches@gnu.org>. Submit a context

931

-# diff and a properly formatted ChangeLog entry.

932

+# diff and a properly formatted GNU ChangeLog entry.

933

#

934

# Configuration subroutine to validate and canonicalize a configuration type.

935

# Supply the specified configuration type as an argument.

936

# If it is invalid, we print an error message on stderr and exit with code 1.

937

# Otherwise, we print the canonical config type on stdout and succeed.

938

939

+# You can get the latest version of this script from:

940

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

941

+

942

# This file is supposed to be the same for all GNU packages

943

# and recognize all the CPU types, system types and aliases

944

# that are meaningful with *any* GNU software.

945

@@ -72,7 +73,8 @@

946

version="\

947

GNU config.sub ($timestamp)

948

949

950

951

+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012

952

Free Software Foundation, Inc.

953

954

This is free software; see the source for copying conditions. There is NO

955

@@ -120,12 +122,18 @@

956

# Here we must recognize all the valid KERNEL-OS combinations.

957

maybe_os=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\2/'`

958

case $maybe_os in

959

960

961

962

+ linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \

963

+ knetbsd*-gnu* | netbsd*-gnu* | \

964

+ kopensolaris*-gnu* | \

965

storm-chaos* | os2-emx* | rtmk-nova*)

966

os=-$maybe_os

967

basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'`

968

;;

969

+ android-linux)

970

+ os=-linux-android

971

+ basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'`-unknown

972

+ ;;

973

*)

974

basic_machine=`echo $1 | sed 's/-[^-]*$//'`

975

if [ $basic_machine != $1 ]

976

@@ -148,10 +156,13 @@

977

-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\

978

-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \

979

980

- -apple | -axis | -knuth | -cray)

981

+ -apple | -axis | -knuth | -cray | -microblaze)

982

os=

983

basic_machine=$1

984

;;

985

+ -bluegene*)

986

+ os=-cnk

987

+ ;;

988

-sim | -cisco | -oki | -wec | -winbond)

989

os=

990

basic_machine=$1

991

@@ -166,10 +177,10 @@

992

os=-chorusos

993

basic_machine=$1

994

;;

995

- -chorusrdb)

996

- os=-chorusrdb

997

+ -chorusrdb)

998

+ os=-chorusrdb

999

basic_machine=$1

1000

- ;;

1001

+ ;;

1002

-hiux*)

1003

os=-hiuxwe2

1004

;;

1005

@@ -214,6 +225,12 @@

1006

-isc*)

1007

basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`

1008

;;

1009

+ -lynx*178)

1010

+ os=-lynxos178

1011

+ ;;

1012

+ -lynx*5)

1013

+ os=-lynxos5

1014

+ ;;

1015

-lynx*)

1016

os=-lynxos

1017

;;

1018

@@ -238,24 +255,32 @@

1019

# Some are omitted here because they have special meanings below.

1020

1750a | 580 \

1021

| a29k \

1022

+ | aarch64 | aarch64_be \

1023

1024

1025

| am33_2.0 \

1026

| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \

1027

+ | be32 | be64 \

1028

| bfin \

1029

| c4x | clipper \

1030

| d10v | d30v | dlx | dsp16xx \

1031

+ | epiphany \

1032

| fido | fr30 | frv \

1033

1034

+ | hexagon \

1035

| i370 | i860 | i960 | ia64 \

1036

| ip2k | iq2000 \

1037

+ | le32 | le64 \

1038

+ | lm32 \

1039

| m32c | m32r | m32rle | m68000 | m68k | m88k \

1040

- | maxq | mb | microblaze | mcore | mep \

1041

+ | maxq | mb | microblaze | mcore | mep | metag \

1042

1043

| mips16 \

1044

| mips64 | mips64el \

1045

- | mips64vr | mips64vrel \

1046

+ | mips64octeon | mips64octeonel \

1047

| mips64orion | mips64orionel \

1048

+ | mips64r5900 | mips64r5900el \

1049

+ | mips64vr | mips64vrel \

1050

| mips64vr4100 | mips64vr4100el \

1051

| mips64vr4300 | mips64vr4300el \

1052

| mips64vr5000 | mips64vr5000el \

1053

@@ -268,29 +293,42 @@

1054

| mipsisa64sr71k | mipsisa64sr71kel \

1055

| mipstx39 | mipstx39el \

1056

| mn10200 | mn10300 \

1057

+ | moxie \

1058

| mt \

1059

| msp430 \

1060

+ | nds32 | nds32le | nds32be \

1061

| nios | nios2 \

1062

| ns16k | ns32k \

1063

+ | open8 \

1064

| or32 \

1065

| pdp10 | pdp11 | pj | pjl \

1066

1067

+ | powerpc | powerpc64 | powerpc64le | powerpcle \

1068

| pyramid \

1069

+ | rl78 | rx \

1070

| score \

1071

- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \

1072

+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \

1073

| sh64 | sh64le \

1074

1075

| sparcv8 | sparcv9 | sparcv9b | sparcv9v \

1076

- | spu | strongarm \

1077

1078

- | v850 | v850e \

1079

+ | spu \

1080

1081

+ | ubicom32 \

1082

+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \

1083

| we32k \

1084

- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \

1085

- | z8k)

1086

+ | x86 | xc16x | xstormy16 | xtensa \

1087

+ | z8k | z80)

1088

basic_machine=$basic_machine-unknown

1089

;;

1090

- m6811 | m68hc11 | m6812 | m68hc12)

1091

- # Motorola 68HC11/12.

1092

+ c54x)

1093

+ basic_machine=tic54x-unknown

1094

+ ;;

1095

+ c55x)

1096

+ basic_machine=tic55x-unknown

1097

+ ;;

1098

+ c6x)

1099

+ basic_machine=tic6x-unknown

1100

+ ;;

1101

+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)

1102

basic_machine=$basic_machine-unknown

1103

os=-none

1104

;;

1105

@@ -300,6 +338,21 @@

1106

basic_machine=mt-unknown

1107

;;

1108

1109

+ strongarm | thumb | xscale)

1110

+ basic_machine=arm-unknown

1111

+ ;;

1112

+ xgate)

1113

+ basic_machine=$basic_machine-unknown

1114

+ os=-none

1115

+ ;;

1116

+ xscaleeb)

1117

+ basic_machine=armeb-unknown

1118

+ ;;

1119

+

1120

+ xscaleel)

1121

+ basic_machine=armel-unknown

1122

+ ;;

1123

+

1124

# We use `pc' rather than `unknown'

1125

# because (1) that's what they normally are, and

1126

# (2) the word "unknown" tends to confuse beginning users.

1127

@@ -314,29 +367,36 @@

1128

# Recognize the basic CPU types with company name.

1129

580-* \

1130

| a29k-* \

1131

+ | aarch64-* | aarch64_be-* \

1132

| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \

1133

| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \

1134

| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \

1135

1136

| avr-* | avr32-* \

1137

+ | be32-* | be64-* \

1138

| bfin-* | bs2000-* \

1139

- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \

1140

+ | c[123]* | c30-* | [cjt]90-* | c4x-* \

1141

| clipper-* | craynv-* | cydra-* \

1142

| d10v-* | d30v-* | dlx-* \

1143

| elxsi-* \

1144

| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \

1145

| h8300-* | h8500-* \

1146

1147

+ | hexagon-* \

1148

| i*86-* | i860-* | i960-* | ia64-* \

1149

| ip2k-* | iq2000-* \

1150

+ | le32-* | le64-* \

1151

+ | lm32-* \

1152

| m32c-* | m32r-* | m32rle-* \

1153

| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \

1154

- | m88110-* | m88k-* | maxq-* | mcore-* \

1155

+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \

1156

1157

| mips16-* \

1158

| mips64-* | mips64el-* \

1159

- | mips64vr-* | mips64vrel-* \

1160

+ | mips64octeon-* | mips64octeonel-* \

1161

| mips64orion-* | mips64orionel-* \

1162

+ | mips64r5900-* | mips64r5900el-* \

1163

+ | mips64vr-* | mips64vrel-* \

1164

| mips64vr4100-* | mips64vr4100el-* \

1165

| mips64vr4300-* | mips64vr4300el-* \

1166

| mips64vr5000-* | mips64vr5000el-* \

1167

@@ -351,27 +411,36 @@

1168

| mmix-* \

1169

| mt-* \

1170

| msp430-* \

1171

+ | nds32-* | nds32le-* | nds32be-* \

1172

| nios-* | nios2-* \

1173

| none-* | np1-* | ns16k-* | ns32k-* \

1174

+ | open8-* \

1175

| orion-* \

1176

| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \

1177

1178

+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \

1179

| pyramid-* \

1180

- | romp-* | rs6000-* \

1181

- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \

1182

+ | rl78-* | romp-* | rs6000-* | rx-* \

1183

+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \

1184

1185

1186

| sparclite-* \

1187

1188

- | tahoe-* | thumb-* \

1189

+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \

1190

+ | tahoe-* \

1191

1192

+ | tile*-* \

1193

| tron-* \

1194

- | v850-* | v850e-* | vax-* \

1195

+ | ubicom32-* \

1196

+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \

1197

+ | vax-* \

1198

| we32k-* \

1199

- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \

1200

- | xstormy16-* | xtensa-* \

1201

+ | x86-* | x86_64-* | xc16x-* | xps100-* \

1202

+ | xstormy16-* | xtensa*-* \

1203

| ymp-* \

1204

- | z8k-*)

1205

+ | z8k-* | z80-*)

1206

+ ;;

1207

+ # Recognize the basic CPU types without company name, with glob match.

1208

+ xtensa*)

1209

+ basic_machine=$basic_machine-unknown

1210

;;

1211

# Recognize the various machine names and aliases which stand

1212

# for a CPU type and a company and sometimes even an OS.

1213

@@ -389,7 +458,7 @@

1214

basic_machine=a29k-amd

1215

os=-udi

1216

;;

1217

- abacus)

1218

+ abacus)

1219

basic_machine=abacus-unknown

1220

;;

1221

adobe68k)

1222

@@ -435,6 +504,10 @@

1223

basic_machine=m68k-apollo

1224

os=-bsd

1225

;;

1226

+ aros)

1227

+ basic_machine=i386-pc

1228

+ os=-aros

1229

+ ;;

1230

aux)

1231

basic_machine=m68k-apple

1232

os=-aux

1233

@@ -443,10 +516,35 @@

1234

basic_machine=ns32k-sequent

1235

os=-dynix

1236

;;

1237

+ blackfin)

1238

+ basic_machine=bfin-unknown

1239

+ os=-linux

1240

+ ;;

1241

+ blackfin-*)

1242

+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`

1243

+ os=-linux

1244

+ ;;

1245

+ bluegene*)

1246

+ basic_machine=powerpc-ibm

1247

+ os=-cnk

1248

+ ;;

1249

+ c54x-*)

1250

+ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`

1251

+ ;;

1252

+ c55x-*)

1253

+ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`

1254

+ ;;

1255

+ c6x-*)

1256

+ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`

1257

+ ;;

1258

c90)

1259

basic_machine=c90-cray

1260

os=-unicos

1261

;;

1262

+ cegcc)

1263

+ basic_machine=arm-unknown

1264

+ os=-cegcc

1265

+ ;;

1266

convex-c1)

1267

basic_machine=c1-convex

1268

os=-bsd

1269

@@ -475,8 +573,8 @@

1270

basic_machine=craynv-cray

1271

os=-unicosmp

1272

;;

1273

- cr16c)

1274

- basic_machine=cr16c-unknown

1275

+ cr16 | cr16-*)

1276

+ basic_machine=cr16-unknown

1277

os=-elf

1278

;;

1279

crds | unos)

1280

@@ -514,6 +612,10 @@

1281

basic_machine=m88k-motorola

1282

os=-sysv3

1283

;;

1284

+ dicos)

1285

+ basic_machine=i686-pc

1286

+ os=-dicos

1287

+ ;;

1288

djgpp)

1289

basic_machine=i586-pc

1290

os=-msdosdjgpp

1291

@@ -629,7 +731,6 @@

1292

i370-ibm* | ibm*)

1293

basic_machine=i370-ibm

1294

;;

1295

-# I'm not sure what "Sysv32" means. Should this be sysv3.2?

1296

i*86v32)

1297

basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`

1298

os=-sysv32

1299

@@ -668,6 +769,14 @@

1300

basic_machine=m68k-isi

1301

os=-sysv

1302

;;

1303

+ m68knommu)

1304

+ basic_machine=m68k-unknown

1305

+ os=-linux

1306

+ ;;

1307

+ m68knommu-*)

1308

+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`

1309

+ os=-linux

1310

+ ;;

1311

m88k-omron*)

1312

basic_machine=m88k-omron

1313

;;

1314

@@ -679,10 +788,17 @@

1315

basic_machine=ns32k-utek

1316

os=-sysv

1317

;;

1318

+ microblaze)

1319

+ basic_machine=microblaze-xilinx

1320

+ ;;

1321

mingw32)

1322

basic_machine=i386-pc

1323

os=-mingw32

1324

;;

1325

+ mingw32ce)

1326

+ basic_machine=arm-unknown

1327

+ os=-mingw32ce

1328

+ ;;

1329

miniframe)

1330

basic_machine=m68000-convergent

1331

;;

1332

@@ -711,10 +827,18 @@

1333

ms1-*)

1334

basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`

1335

;;

1336

+ msys)

1337

+ basic_machine=i386-pc

1338

+ os=-msys

1339

+ ;;

1340

mvs)

1341

basic_machine=i370-ibm

1342

os=-mvs

1343

;;

1344

+ nacl)

1345

+ basic_machine=le32-unknown

1346

+ os=-nacl

1347

+ ;;

1348

ncr3000)

1349

basic_machine=i486-ncr

1350

os=-sysv4

1351

@@ -779,6 +903,12 @@

1352

np1)

1353

basic_machine=np1-gould

1354

;;

1355

+ neo-tandem)

1356

+ basic_machine=neo-tandem

1357

+ ;;

1358

+ nse-tandem)

1359

+ basic_machine=nse-tandem

1360

+ ;;

1361

nsr-tandem)

1362

basic_machine=nsr-tandem

1363

;;

1364

@@ -809,6 +939,14 @@

1365

basic_machine=i860-intel

1366

os=-osf

1367

;;

1368

+ parisc)

1369

+ basic_machine=hppa-unknown

1370

+ os=-linux

1371

+ ;;

1372

+ parisc-*)

1373

+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`

1374

+ os=-linux

1375

+ ;;

1376

pbd)

1377

basic_machine=sparc-tti

1378

;;

1379

@@ -853,9 +991,10 @@

1380

;;

1381

power) basic_machine=power-ibm

1382

;;

1383

- ppc) basic_machine=powerpc-unknown

1384

+ ppc | ppcbe) basic_machine=powerpc-unknown

1385

;;

1386

- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`

1387

+ ppc-* | ppcbe-*)

1388

+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`

1389

;;

1390

ppcle | powerpclittle | ppc-le | powerpc-little)

1391

basic_machine=powerpcle-unknown

1392

@@ -949,6 +1088,9 @@

1393

basic_machine=i860-stratus

1394

os=-sysv4

1395

;;

1396

+ strongarm-* | thumb-*)

1397

+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`

1398

+ ;;

1399

sun2)

1400

basic_machine=m68000-sun

1401

;;

1402

@@ -1005,17 +1147,9 @@

1403

basic_machine=t90-cray

1404

os=-unicos

1405

;;

1406

- tic54x | c54x*)

1407

- basic_machine=tic54x-unknown

1408

- os=-coff

1409

- ;;

1410

- tic55x | c55x*)

1411

- basic_machine=tic55x-unknown

1412

- os=-coff

1413

- ;;

1414

- tic6x | c6x*)

1415

- basic_machine=tic6x-unknown

1416

- os=-coff

1417

+ tile*)

1418

+ basic_machine=$basic_machine-unknown

1419

+ os=-linux-gnu

1420

;;

1421

tx39)

1422

basic_machine=mipstx39-unknown

1423

@@ -1084,6 +1218,9 @@

1424

xps | xps100)

1425

basic_machine=xps100-honeywell

1426

;;

1427

+ xscale-* | xscalee[bl]-*)

1428

+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`

1429

+ ;;

1430

ymp)

1431

basic_machine=ymp-cray

1432

os=-unicos

1433

@@ -1092,6 +1229,10 @@

1434

basic_machine=z8k-unknown

1435

os=-sim

1436

;;

1437

+ z80-*-coff)

1438

+ basic_machine=z80-unknown

1439

+ os=-sim

1440

+ ;;

1441

none)

1442

basic_machine=none-none

1443

os=-none

1444

@@ -1130,7 +1271,7 @@

1445

we32k)

1446

basic_machine=we32k-att

1447

;;

1448

- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)

1449

1450

basic_machine=sh-unknown

1451

;;

1452

sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)

1453

@@ -1177,9 +1318,12 @@

1454

if [ x"$os" != x"" ]

1455

then

1456

case $os in

1457

- # First match some system type aliases

1458

- # that might get confused with valid system types.

1459

+ # First match some system type aliases

1460

+ # that might get confused with valid system types.

1461

# -solaris* is a basic system type, with this one exception.

1462

+ -auroraux)

1463

+ os=-auroraux

1464

+ ;;

1465

-solaris1 | -solaris1.*)

1466

os=`echo $os | sed -e 's|solaris1|sunos4|'`

1467

;;

1468

@@ -1200,10 +1344,11 @@

1469

# Each alternative MUST END IN A *, to match a version number.

1470

# -sysv* is not here because it comes later, after sysvr4.

1471

1472

- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\

1473

1474

+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\

1475

1476

+ | -sym* | -kopensolaris* \

1477

1478

- | -aos* \

1479

+ | -aos* | -aros* \

1480

1481

1482

1483

@@ -1212,9 +1357,10 @@

1484

1485

1486

| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \

1487

- | -chorusos* | -chorusrdb* \

1488

1489

- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \

1490

+ | -chorusos* | -chorusrdb* | -cegcc* \

1491

1492

+ | -mingw32* | -linux-gnu* | -linux-android* \

1493

+ | -linux-newlib* | -linux-uclibc* \

1494

| -uxpv* | -beos* | -mpeix* | -udk* \

1495

1496

1497

@@ -1222,7 +1368,7 @@

1498

1499

1500

| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \

1501

1502

1503

# Remember, each alternative MUST END IN *, to match a version number.

1504

;;

1505

-qnx*)

1506

@@ -1261,7 +1407,7 @@

1507

-opened*)

1508

os=-openedition

1509

;;

1510

- -os400*)

1511

+ -os400*)

1512

os=-os400

1513

;;

1514

-wince*)

1515

@@ -1310,7 +1456,7 @@

1516

-sinix*)

1517

os=-sysv4

1518

;;

1519

- -tpf*)

1520

+ -tpf*)

1521

os=-tpf

1522

;;

1523

-triton*)

1524

@@ -1352,6 +1498,11 @@

1525

-zvmoe)

1526

os=-zvmoe

1527

;;

1528

+ -dicos*)

1529

+ os=-dicos

1530

+ ;;

1531

+ -nacl*)

1532

+ ;;

1533

-none)

1534

;;

1535

*)

1536

@@ -1374,10 +1525,10 @@

1537

# system, and we'll never get to this point.

1538

1539

case $basic_machine in

1540

- score-*)

1541

+ score-*)

1542

os=-elf

1543

;;

1544

- spu-*)

1545

+ spu-*)

1546

os=-elf

1547

;;

1548

*-acorn)

1549

@@ -1389,8 +1540,20 @@

1550

arm*-semi)

1551

os=-aout

1552

;;

1553

- c4x-* | tic4x-*)

1554

- os=-coff

1555

+ c4x-* | tic4x-*)

1556

+ os=-coff

1557

+ ;;

1558

+ hexagon-*)

1559

+ os=-elf

1560

+ ;;

1561

+ tic54x-*)

1562

+ os=-coff

1563

+ ;;

1564

+ tic55x-*)

1565

+ os=-coff

1566

+ ;;

1567

+ tic6x-*)

1568

+ os=-coff

1569

;;

1570

# This must come before the *-dec entry.

1571

pdp10-*)

1572

@@ -1410,14 +1573,11 @@

1573

;;

1574

m68000-sun)

1575

os=-sunos3

1576

- # This also exists in the configure program, but was not the

1577

- # default.

1578

- # os=-sunos4

1579

;;

1580

m68*-cisco)

1581

os=-aout

1582

;;

1583

- mep-*)

1584

+ mep-*)

1585

os=-elf

1586

;;

1587

mips*-cisco)

1588

@@ -1444,7 +1604,7 @@

1589

*-ibm)

1590

os=-aix

1591

;;

1592

- *-knuth)

1593

+ *-knuth)

1594

os=-mmixware

1595

;;

1596

*-wec)

1597

@@ -1549,7 +1709,7 @@

1598

-sunos*)

1599

vendor=sun

1600

;;

1601

- -aix*)

1602

+ -cnk*|-aix*)

1603

vendor=ibm

1604

;;

1605

-beos*)