Skip to content

Commit

Permalink
Sync from upstream:
Browse files Browse the repository at this point in the history
	2011-06-03  Nick Clifton  <nickc@redhat.com>
		    Ben Elliston  <bje@gnu.org>

	* config.sub (v850e1, v850es, v850e2, v850e2v3): New.

	2011-05-30  Chris Metcalf  <cmetcalf@tilera.com>
		    Ben Elliston  <bje@gnu.org>

	* config.guess (tile*:Linux:*:*): Use vendor "unknown", not
	"tilera", for consistency with other architectures.
	* config.sub (tile*-*, tilegx-*): Use a more general pattern for
	"tile" to allow matching tilepro, tilegx32 and other variants.
  • Loading branch information
nickclifton committed Jun 6, 2011
1 parent 057a947 commit e1133e8
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 13 deletions.
4 changes: 4 additions & 0 deletions ChangeLog
@@ -1,3 +1,7 @@
2011-06-06 Nick Clifton <nickc@redhat.com>

* config.sub: Sync from upstream.

2011-05-08 Doug Kwan <dougkwan@google.com>

Merge from gcc:
Expand Down
12 changes: 9 additions & 3 deletions config.guess
Expand Up @@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011 Free Software Foundation, Inc.

timestamp='2011-02-02'
timestamp='2011-06-03'

# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -882,7 +882,13 @@ EOF
then
echo ${UNAME_MACHINE}-unknown-linux-gnu
else
echo ${UNAME_MACHINE}-unknown-linux-gnueabi
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_PCS_VFP
then
echo ${UNAME_MACHINE}-unknown-linux-gnueabi
else
echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
fi
fi
exit ;;
avr32*:Linux:*:*)
Expand Down Expand Up @@ -972,7 +978,7 @@ EOF
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
tile*:Linux:*:*)
echo ${UNAME_MACHINE}-tilera-linux-gnu
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
vax:Linux:*:*)
echo ${UNAME_MACHINE}-dec-linux-gnu
Expand Down
16 changes: 6 additions & 10 deletions config.sub
Expand Up @@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011 Free Software Foundation, Inc.

timestamp='2011-03-23'
timestamp='2011-06-03'

# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
Expand Down Expand Up @@ -300,7 +300,7 @@ case $basic_machine in
| spu \
| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
| ubicom32 \
| v850 | v850e \
| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
| we32k \
| x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
Expand Down Expand Up @@ -408,10 +408,11 @@ case $basic_machine in
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
| tahoe-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tile-* | tilegx-* \
| tile*-* \
| tron-* \
| ubicom32-* \
| v850-* | v850e-* | vax-* \
| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
| vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \
Expand Down Expand Up @@ -1120,13 +1121,8 @@ case $basic_machine in
basic_machine=t90-cray
os=-unicos
;;
# This must be matched before tile*.
tilegx*)
basic_machine=tilegx-unknown
os=-linux-gnu
;;
tile*)
basic_machine=tile-unknown
basic_machine=$basic_machine-unknown
os=-linux-gnu
;;
tx39)
Expand Down

0 comments on commit e1133e8

Please sign in to comment.