Skip to content

Commit d65de8a

Browse files
author
Ralf Corsépius
committed
Update from automake-1.13.2.
1 parent 10fd953 commit d65de8a

File tree

7 files changed

+433
-538
lines changed

7 files changed

+433
-538
lines changed

compile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
scriptversion=2012-10-14.11; # UTC
55

6-
# Copyright (C) 1999-2012 Free Software Foundation, Inc.
6+
# Copyright (C) 1999-2013 Free Software Foundation, Inc.
77
# Written by Tom Tromey <tromey@cygnus.com>.
88
#
99
# This program is free software; you can redistribute it and/or modify

config.guess

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
#! /bin/sh
22
# Attempt to guess a canonical system name.
3-
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4-
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
5-
# 2011, 2012 Free Software Foundation, Inc.
3+
# Copyright 1992-2013 Free Software Foundation, Inc.
64

7-
timestamp='2012-09-25'
5+
timestamp='2013-04-24'
86

97
# This file is free software; you can redistribute it and/or modify it
108
# under the terms of the GNU General Public License as published by
11-
# the Free Software Foundation; either version 2 of the License, or
9+
# the Free Software Foundation; either version 3 of the License, or
1210
# (at your option) any later version.
1311
#
1412
# This program is distributed in the hope that it will be useful, but
@@ -22,19 +20,17 @@ timestamp='2012-09-25'
2220
# As a special exception to the GNU General Public License, if you
2321
# distribute this file as part of a program that contains a
2422
# configuration script generated by Autoconf, you may include it under
25-
# the same distribution terms that you use for the rest of that program.
26-
27-
28-
# Originally written by Per Bothner. Please send patches (context
29-
# diff format) to <config-patches@gnu.org> and include a ChangeLog
30-
# entry.
23+
# the same distribution terms that you use for the rest of that
24+
# program. This Exception is an additional permission under section 7
25+
# of the GNU General Public License, version 3 ("GPLv3").
3126
#
32-
# This script attempts to guess a canonical system name similar to
33-
# config.sub. If it succeeds, it prints the system name on stdout, and
34-
# exits with 0. Otherwise, it exits with 1.
27+
# Originally written by Per Bothner.
3528
#
3629
# You can get the latest version of this script from:
3730
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
31+
#
32+
# Please send patches with a ChangeLog entry to config-patches@gnu.org.
33+
3834

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

@@ -54,9 +50,7 @@ version="\
5450
GNU config.guess ($timestamp)
5551
5652
Originally written by Per Bothner.
57-
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
58-
2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
59-
Free Software Foundation, Inc.
53+
Copyright 1992-2013 Free Software Foundation, Inc.
6054
6155
This is free software; see the source for copying conditions. There is NO
6256
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -889,6 +883,9 @@ EOF
889883
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
890884
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
891885
exit ;;
886+
arc:Linux:*:* | arceb:Linux:*:*)
887+
echo ${UNAME_MACHINE}-unknown-linux-gnu
888+
exit ;;
892889
arm*:Linux:*:*)
893890
eval $set_cc_for_build
894891
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -927,6 +924,11 @@ EOF
927924
#ifdef __dietlibc__
928925
LIBC=dietlibc
929926
#endif
927+
#else
928+
#include <features.h>
929+
#ifdef __UCLIBC__
930+
LIBC=uclibc
931+
#endif
930932
EOF
931933
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
932934
echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
@@ -959,6 +961,9 @@ EOF
959961
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
960962
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
961963
;;
964+
or1k:Linux:*:*)
965+
echo ${UNAME_MACHINE}-unknown-linux-gnu
966+
exit ;;
962967
or32:Linux:*:*)
963968
echo ${UNAME_MACHINE}-unknown-linux-gnu
964969
exit ;;
@@ -1001,7 +1006,9 @@ EOF
10011006
echo ${UNAME_MACHINE}-dec-linux-gnu
10021007
exit ;;
10031008
x86_64:Linux:*:*)
1004-
echo ${UNAME_MACHINE}-unknown-linux-gnu
1009+
LIBC=gnu
1010+
test -r /lib/libc.so && od -An -S13 /lib/libc.so | grep -q __uClibc_main && LIBC=uclibc
1011+
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
10051012
exit ;;
10061013
xtensa*:Linux:*:*)
10071014
echo ${UNAME_MACHINE}-unknown-linux-gnu

config.sub

Lines changed: 25 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,31 @@
11
#! /bin/sh
22
# Configuration validation subroutine script.
3-
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4-
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
5-
# 2011, 2012 Free Software Foundation, Inc.
3+
# Copyright 1992-2013 Free Software Foundation, Inc.
64

7-
timestamp='2012-12-06'
5+
timestamp='2013-04-24'
86

9-
# This file is (in principle) common to ALL GNU software.
10-
# The presence of a machine in this file suggests that SOME GNU software
11-
# can handle that machine. It does not imply ALL GNU software can.
12-
#
13-
# This file is free software; you can redistribute it and/or modify
14-
# it under the terms of the GNU General Public License as published by
15-
# the Free Software Foundation; either version 2 of the License, or
7+
# This file is free software; you can redistribute it and/or modify it
8+
# under the terms of the GNU General Public License as published by
9+
# the Free Software Foundation; either version 3 of the License, or
1610
# (at your option) any later version.
1711
#
18-
# This program is distributed in the hope that it will be useful,
19-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
20-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21-
# GNU General Public License for more details.
12+
# This program is distributed in the hope that it will be useful, but
13+
# WITHOUT ANY WARRANTY; without even the implied warranty of
14+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15+
# General Public License for more details.
2216
#
2317
# You should have received a copy of the GNU General Public License
2418
# along with this program; if not, see <http://www.gnu.org/licenses/>.
2519
#
2620
# As a special exception to the GNU General Public License, if you
2721
# distribute this file as part of a program that contains a
2822
# configuration script generated by Autoconf, you may include it under
29-
# the same distribution terms that you use for the rest of that program.
23+
# the same distribution terms that you use for the rest of that
24+
# program. This Exception is an additional permission under section 7
25+
# of the GNU General Public License, version 3 ("GPLv3").
3026

3127

32-
# Please send patches to <config-patches@gnu.org>. Submit a context
33-
# diff and a properly formatted GNU ChangeLog entry.
28+
# Please send patches with a ChangeLog entry to config-patches@gnu.org.
3429
#
3530
# Configuration subroutine to validate and canonicalize a configuration type.
3631
# Supply the specified configuration type as an argument.
@@ -73,9 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
7368
version="\
7469
GNU config.sub ($timestamp)
7570
76-
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
77-
2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
78-
Free Software Foundation, Inc.
71+
Copyright 1992-2013 Free Software Foundation, Inc.
7972
8073
This is free software; see the source for copying conditions. There is NO
8174
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -259,7 +252,7 @@ case $basic_machine in
259252
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
260253
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
261254
| am33_2.0 \
262-
| arc \
255+
| arc | arceb \
263256
| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
264257
| avr | avr32 \
265258
| be32 | be64 \
@@ -293,16 +286,17 @@ case $basic_machine in
293286
| mipsisa64r2 | mipsisa64r2el \
294287
| mipsisa64sb1 | mipsisa64sb1el \
295288
| mipsisa64sr71k | mipsisa64sr71kel \
289+
| mipsr5900 | mipsr5900el \
296290
| mipstx39 | mipstx39el \
297291
| mn10200 | mn10300 \
298292
| moxie \
299293
| mt \
300294
| msp430 \
301295
| nds32 | nds32le | nds32be \
302-
| nios | nios2 \
296+
| nios | nios2 | nios2eb | nios2el \
303297
| ns16k | ns32k \
304298
| open8 \
305-
| or32 \
299+
| or1k | or32 \
306300
| pdp10 | pdp11 | pj | pjl \
307301
| powerpc | powerpc64 | powerpc64le | powerpcle \
308302
| pyramid \
@@ -372,7 +366,7 @@ case $basic_machine in
372366
| aarch64-* | aarch64_be-* \
373367
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
374368
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
375-
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
369+
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
376370
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
377371
| avr-* | avr32-* \
378372
| be32-* | be64-* \
@@ -410,12 +404,13 @@ case $basic_machine in
410404
| mipsisa64r2-* | mipsisa64r2el-* \
411405
| mipsisa64sb1-* | mipsisa64sb1el-* \
412406
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
407+
| mipsr5900-* | mipsr5900el-* \
413408
| mipstx39-* | mipstx39el-* \
414409
| mmix-* \
415410
| mt-* \
416411
| msp430-* \
417412
| nds32-* | nds32le-* | nds32be-* \
418-
| nios-* | nios2-* \
413+
| nios-* | nios2-* | nios2eb-* | nios2el-* \
419414
| none-* | np1-* | ns16k-* | ns32k-* \
420415
| open8-* \
421416
| orion-* \
@@ -1357,7 +1352,7 @@ case $os in
13571352
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
13581353
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
13591354
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
1360-
| -sym* | -kopensolaris* \
1355+
| -sym* | -kopensolaris* | -plan9* \
13611356
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
13621357
| -aos* | -aros* \
13631358
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1503,9 +1498,6 @@ case $os in
15031498
-aros*)
15041499
os=-aros
15051500
;;
1506-
-kaos*)
1507-
os=-kaos
1508-
;;
15091501
-zvmoe)
15101502
os=-zvmoe
15111503
;;
@@ -1597,6 +1589,9 @@ case $basic_machine in
15971589
mips*-*)
15981590
os=-elf
15991591
;;
1592+
or1k-*)
1593+
os=-elf
1594+
;;
16001595
or32-*)
16011596
os=-coff
16021597
;;

0 commit comments

Comments
 (0)