Skip to content

Commit 39d1b2a

Browse files
rsandiforsandifo
committed
* config.sub, config.guess: Import from upstream.
1 parent 3efe9ec commit 39d1b2a

File tree

3 files changed

+41
-174
lines changed

3 files changed

+41
-174
lines changed

‎ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2014-05-01 Richard Sandiford <[email protected]>
2+
3+
* config.sub, config.guess: Import from upstream.
4+
15
2014-04-04 Eric Botcazou <[email protected]>
26

37
PR bootstrap/60620

‎config.guess

Lines changed: 27 additions & 165 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#! /bin/sh
22
# Attempt to guess a canonical system name.
3-
# Copyright 1992-2013 Free Software Foundation, Inc.
3+
# Copyright 1992-2014 Free Software Foundation, Inc.
44

5-
timestamp='2013-06-10'
5+
timestamp='2014-03-23'
66

77
# This file is free software; you can redistribute it and/or modify it
88
# under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@ version="\
5050
GNU config.guess ($timestamp)
5151
5252
Originally written by Per Bothner.
53-
Copyright 1992-2013 Free Software Foundation, Inc.
53+
Copyright 1992-2014 Free Software Foundation, Inc.
5454
5555
This is free software; see the source for copying conditions. There is NO
5656
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -149,7 +149,7 @@ Linux|GNU|GNU/*)
149149
LIBC=gnu
150150
#endif
151151
EOF
152-
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
152+
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
153153
;;
154154
esac
155155

@@ -826,7 +826,7 @@ EOF
826826
*:MINGW*:*)
827827
echo ${UNAME_MACHINE}-pc-mingw32
828828
exit ;;
829-
i*:MSYS*:*)
829+
*:MSYS*:*)
830830
echo ${UNAME_MACHINE}-pc-msys
831831
exit ;;
832832
i*:windows32*:*)
@@ -969,10 +969,10 @@ EOF
969969
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
970970
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
971971
;;
972-
or1k:Linux:*:*)
973-
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
972+
openrisc*:Linux:*:*)
973+
echo or1k-unknown-linux-${LIBC}
974974
exit ;;
975-
or32:Linux:*:*)
975+
or32:Linux:*:* | or1k*:Linux:*:*)
976976
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
977977
exit ;;
978978
padre:Linux:*:*)
@@ -1260,16 +1260,26 @@ EOF
12601260
if test "$UNAME_PROCESSOR" = unknown ; then
12611261
UNAME_PROCESSOR=powerpc
12621262
fi
1263-
if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
1264-
if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1265-
(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
1266-
grep IS_64BIT_ARCH >/dev/null
1267-
then
1268-
case $UNAME_PROCESSOR in
1269-
i386) UNAME_PROCESSOR=x86_64 ;;
1270-
powerpc) UNAME_PROCESSOR=powerpc64 ;;
1271-
esac
1263+
if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
1264+
if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
1265+
if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1266+
(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
1267+
grep IS_64BIT_ARCH >/dev/null
1268+
then
1269+
case $UNAME_PROCESSOR in
1270+
i386) UNAME_PROCESSOR=x86_64 ;;
1271+
powerpc) UNAME_PROCESSOR=powerpc64 ;;
1272+
esac
1273+
fi
12721274
fi
1275+
elif test "$UNAME_PROCESSOR" = i386 ; then
1276+
# Avoid executing cc on OS X 10.9, as it ships with a stub
1277+
# that puts up a graphical alert prompting to install
1278+
# developer tools. Any system running Mac OS X 10.7 or
1279+
# later (Darwin 11 and later) is required to have a 64-bit
1280+
# processor. This is not true of the ARM version of Darwin
1281+
# that Apple uses in portable devices.
1282+
UNAME_PROCESSOR=x86_64
12731283
fi
12741284
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
12751285
exit ;;
@@ -1361,154 +1371,6 @@ EOF
13611371
exit ;;
13621372
esac
13631373

1364-
eval $set_cc_for_build
1365-
cat >$dummy.c <<EOF
1366-
#ifdef _SEQUENT_
1367-
# include <sys/types.h>
1368-
# include <sys/utsname.h>
1369-
#endif
1370-
main ()
1371-
{
1372-
#if defined (sony)
1373-
#if defined (MIPSEB)
1374-
/* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
1375-
I don't know.... */
1376-
printf ("mips-sony-bsd\n"); exit (0);
1377-
#else
1378-
#include <sys/param.h>
1379-
printf ("m68k-sony-newsos%s\n",
1380-
#ifdef NEWSOS4
1381-
"4"
1382-
#else
1383-
""
1384-
#endif
1385-
); exit (0);
1386-
#endif
1387-
#endif
1388-
1389-
#if defined (__arm) && defined (__acorn) && defined (__unix)
1390-
printf ("arm-acorn-riscix\n"); exit (0);
1391-
#endif
1392-
1393-
#if defined (hp300) && !defined (hpux)
1394-
printf ("m68k-hp-bsd\n"); exit (0);
1395-
#endif
1396-
1397-
#if defined (NeXT)
1398-
#if !defined (__ARCHITECTURE__)
1399-
#define __ARCHITECTURE__ "m68k"
1400-
#endif
1401-
int version;
1402-
version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
1403-
if (version < 4)
1404-
printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
1405-
else
1406-
printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
1407-
exit (0);
1408-
#endif
1409-
1410-
#if defined (MULTIMAX) || defined (n16)
1411-
#if defined (UMAXV)
1412-
printf ("ns32k-encore-sysv\n"); exit (0);
1413-
#else
1414-
#if defined (CMU)
1415-
printf ("ns32k-encore-mach\n"); exit (0);
1416-
#else
1417-
printf ("ns32k-encore-bsd\n"); exit (0);
1418-
#endif
1419-
#endif
1420-
#endif
1421-
1422-
#if defined (__386BSD__)
1423-
printf ("i386-pc-bsd\n"); exit (0);
1424-
#endif
1425-
1426-
#if defined (sequent)
1427-
#if defined (i386)
1428-
printf ("i386-sequent-dynix\n"); exit (0);
1429-
#endif
1430-
#if defined (ns32000)
1431-
printf ("ns32k-sequent-dynix\n"); exit (0);
1432-
#endif
1433-
#endif
1434-
1435-
#if defined (_SEQUENT_)
1436-
struct utsname un;
1437-
1438-
uname(&un);
1439-
1440-
if (strncmp(un.version, "V2", 2) == 0) {
1441-
printf ("i386-sequent-ptx2\n"); exit (0);
1442-
}
1443-
if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
1444-
printf ("i386-sequent-ptx1\n"); exit (0);
1445-
}
1446-
printf ("i386-sequent-ptx\n"); exit (0);
1447-
1448-
#endif
1449-
1450-
#if defined (vax)
1451-
# if !defined (ultrix)
1452-
# include <sys/param.h>
1453-
# if defined (BSD)
1454-
# if BSD == 43
1455-
printf ("vax-dec-bsd4.3\n"); exit (0);
1456-
# else
1457-
# if BSD == 199006
1458-
printf ("vax-dec-bsd4.3reno\n"); exit (0);
1459-
# else
1460-
printf ("vax-dec-bsd\n"); exit (0);
1461-
# endif
1462-
# endif
1463-
# else
1464-
printf ("vax-dec-bsd\n"); exit (0);
1465-
# endif
1466-
# else
1467-
printf ("vax-dec-ultrix\n"); exit (0);
1468-
# endif
1469-
#endif
1470-
1471-
#if defined (alliant) && defined (i860)
1472-
printf ("i860-alliant-bsd\n"); exit (0);
1473-
#endif
1474-
1475-
exit (1);
1476-
}
1477-
EOF
1478-
1479-
$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
1480-
{ echo "$SYSTEM_NAME"; exit; }
1481-
1482-
# Apollos put the system type in the environment.
1483-
1484-
test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
1485-
1486-
# Convex versions that predate uname can use getsysinfo(1)
1487-
1488-
if [ -x /usr/convex/getsysinfo ]
1489-
then
1490-
case `getsysinfo -f cpu_type` in
1491-
c1*)
1492-
echo c1-convex-bsd
1493-
exit ;;
1494-
c2*)
1495-
if getsysinfo -f scalar_acc
1496-
then echo c32-convex-bsd
1497-
else echo c2-convex-bsd
1498-
fi
1499-
exit ;;
1500-
c34*)
1501-
echo c34-convex-bsd
1502-
exit ;;
1503-
c38*)
1504-
echo c38-convex-bsd
1505-
exit ;;
1506-
c4*)
1507-
echo c4-convex-bsd
1508-
exit ;;
1509-
esac
1510-
fi
1511-
15121374
cat >&2 <<EOF
15131375
$0: unable to guess system type
15141376

‎config.sub

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#! /bin/sh
22
# Configuration validation subroutine script.
3-
# Copyright 1992-2013 Free Software Foundation, Inc.
3+
# Copyright 1992-2014 Free Software Foundation, Inc.
44

5-
timestamp='2013-10-01'
5+
timestamp='2014-05-01'
66

77
# This file is free software; you can redistribute it and/or modify it
88
# under the terms of the GNU General Public License as published by
@@ -68,7 +68,7 @@ Report bugs and patches to <[email protected]>."
6868
version="\
6969
GNU config.sub ($timestamp)
7070
71-
Copyright 1992-2013 Free Software Foundation, Inc.
71+
Copyright 1992-2014 Free Software Foundation, Inc.
7272
7373
This is free software; see the source for copying conditions. There is NO
7474
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -283,8 +283,10 @@ case $basic_machine in
283283
| mips64vr5900 | mips64vr5900el \
284284
| mipsisa32 | mipsisa32el \
285285
| mipsisa32r2 | mipsisa32r2el \
286+
| mipsisa32r6 | mipsisa32r6el \
286287
| mipsisa64 | mipsisa64el \
287288
| mipsisa64r2 | mipsisa64r2el \
289+
| mipsisa64r6 | mipsisa64r6el \
288290
| mipsisa64sb1 | mipsisa64sb1el \
289291
| mipsisa64sr71k | mipsisa64sr71kel \
290292
| mipsr5900 | mipsr5900el \
@@ -296,8 +298,7 @@ case $basic_machine in
296298
| nds32 | nds32le | nds32be \
297299
| nios | nios2 | nios2eb | nios2el \
298300
| ns16k | ns32k \
299-
| open8 \
300-
| or1k | or32 \
301+
| open8 | or1k | or1knd | or32 \
301302
| pdp10 | pdp11 | pj | pjl \
302303
| powerpc | powerpc64 | powerpc64le | powerpcle \
303304
| pyramid \
@@ -402,8 +403,10 @@ case $basic_machine in
402403
| mips64vr5900-* | mips64vr5900el-* \
403404
| mipsisa32-* | mipsisa32el-* \
404405
| mipsisa32r2-* | mipsisa32r2el-* \
406+
| mipsisa32r6-* | mipsisa32r6el-* \
405407
| mipsisa64-* | mipsisa64el-* \
406408
| mipsisa64r2-* | mipsisa64r2el-* \
409+
| mipsisa64r6-* | mipsisa64r6el-* \
407410
| mipsisa64sb1-* | mipsisa64sb1el-* \
408411
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
409412
| mipsr5900-* | mipsr5900el-* \
@@ -415,6 +418,7 @@ case $basic_machine in
415418
| nios-* | nios2-* | nios2eb-* | nios2el-* \
416419
| none-* | np1-* | ns16k-* | ns32k-* \
417420
| open8-* \
421+
| or1k*-* \
418422
| orion-* \
419423
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
420424
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
@@ -1376,7 +1380,7 @@ case $os in
13761380
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
13771381
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
13781382
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1379-
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
1383+
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
13801384
# Remember, each alternative MUST END IN *, to match a version number.
13811385
;;
13821386
-qnx*)
@@ -1594,9 +1598,6 @@ case $basic_machine in
15941598
mips*-*)
15951599
os=-elf
15961600
;;
1597-
or1k-*)
1598-
os=-elf
1599-
;;
16001601
or32-*)
16011602
os=-coff
16021603
;;

0 commit comments

Comments
 (0)