summaryrefslogtreecommitdiff
path: root/build-aux/config.sub
diff options
context:
space:
mode:
authorEric Blake <eblake@redhat.com>2012-02-29 06:39:00 -0700
committerEric Blake <eblake@redhat.com>2012-03-01 21:28:52 -0700
commit14e8178c50ddd9831dd4947192248653906f3942 (patch)
tree8f57a42960fa21aed4748f15aa7968b6cf9ede3d /build-aux/config.sub
parentff3011217dc8bf66fc8f355f18436d1b3ab6a575 (diff)
downloadautoconf-14e8178c50ddd9831dd4947192248653906f3942.tar.gz
maint: resync files from upstream
* GNUmakefile: Resync via 'make fetch'. * build-aux/config.guess: Likewise. * build-aux/config.sub: Likewise. * build-aux/texinfo.tex: Likewise. * build-aux/update-copyright: Likewise. * doc/standards.texi: Likewise. * lib/Autom4te/Channels.pm: Likewise. * lib/Autom4te/Configure_ac.pm: Likewise. * lib/Autom4te/FileUtils.pm: Likewise. * lib/Autom4te/Getopt.pm: Likewise. * lib/Autom4te/Struct.pm: Likewise. * lib/Autom4te/XFile.pm: Likewise. * maint.mk: Likewise. Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'build-aux/config.sub')
-rwxr-xr-xbuild-aux/config.sub19
1 files changed, 13 insertions, 6 deletions
diff --git a/build-aux/config.sub b/build-aux/config.sub
index d6b6b3c7..c894da45 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011, 2012 Free Software Foundation, Inc.
-timestamp='2012-01-01'
+timestamp='2012-02-10'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -21,9 +21,7 @@ timestamp='2012-01-01'
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -132,6 +130,10 @@ case $maybe_os in
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
+ android-linux)
+ os=-linux-android
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+ ;;
*)
basic_machine=`echo $1 | sed 's/-[^-]*$//'`
if [ $basic_machine != $1 ]
@@ -247,6 +249,7 @@ case $basic_machine in
# Some are omitted here because they have special meanings below.
1750a | 580 \
| a29k \
+ | aarch64 | aarch64_be \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
@@ -319,7 +322,7 @@ case $basic_machine in
c6x)
basic_machine=tic6x-unknown
;;
- m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
basic_machine=$basic_machine-unknown
os=-none
;;
@@ -332,7 +335,10 @@ case $basic_machine in
strongarm | thumb | xscale)
basic_machine=arm-unknown
;;
-
+ xgate)
+ basic_machine=$basic_machine-unknown
+ os=-none
+ ;;
xscaleeb)
basic_machine=armeb-unknown
;;
@@ -355,6 +361,7 @@ case $basic_machine in
# Recognize the basic CPU types with company name.
580-* \
| a29k-* \
+ | aarch64-* | aarch64_be-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \