summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpthomas <pthomas@138bc75d-0d04-0410-961f-82ee72b054a4>2000-10-05 21:18:00 +0000
committerpthomas <pthomas@138bc75d-0d04-0410-961f-82ee72b054a4>2000-10-05 21:18:00 +0000
commitf39aafc51e1526b76a2db6c39d04a4ae57673fac (patch)
tree40d4d986a38de1a84e2c686e7e9b3d406d0e0c40
parent0eab593411046cfc25132aeb4498a5487e4633b9 (diff)
downloadgcc-f39aafc51e1526b76a2db6c39d04a4ae57673fac.tar.gz
2000-10-04 Philipp Thomas <pthomas@suse.de>
* config.guess: Import CVS version 1.157. * config.sub: Import CVS version 1.181. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36732 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--ChangeLog5
-rwxr-xr-xconfig.guess9
-rwxr-xr-xconfig.sub6
3 files changed, 12 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index ba82e5ad30b..b399bb1cdc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-04 Philipp Thomas <pthomas@suse.de>
+
+ * config.guess: Import CVS version 1.157.
+ * config.sub: Import CVS version 1.181.
+
2000-10-04 Andris Pavenis <pavenis@latnet.lv>
* Makefile.in (bootstrap): avoid recursion if subdir missing
diff --git a/config.guess b/config.guess
index 08e8a750ac6..93e03c68885 100755
--- a/config.guess
+++ b/config.guess
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
# Free Software Foundation, Inc.
-version='2000-09-05'
+version='2000-10-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
@@ -698,8 +698,7 @@ EOF
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
# problems with other programs or directories called `ld' in the path.
- ld_help_string=`cd /; ld --help 2>&1`
- ld_supported_emulations=`echo $ld_help_string \
+ ld_supported_emulations=`cd /; ld --help 2>&1 \
| sed -ne '/supported emulations:/!d
s/[ ][ ]*/ /g
s/.*supported emulations: *//
@@ -866,8 +865,8 @@ EOF
# GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
# If ld does not provide *any* "supported emulations:"
# that means it is gnuoldld.
- echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
- test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
+ test -z "$ld_supported_emulations" \
+ && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
case "${UNAME_MACHINE}" in
i?86)
diff --git a/config.sub b/config.sub
index 76b880fb1fc..42fc991d08a 100755
--- a/config.sub
+++ b/config.sub
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
# Free Software Foundation, Inc.
-version='2000-09-05'
+version='2000-09-11'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -204,7 +204,7 @@ case $basic_machine in
# Recognize the basic CPU types without company name.
# Some are omitted here because they have special meanings below.
tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
- | arme[lb] | armv* | pyramid | mn10200 | mn10300 | tron | a29k \
+ | arme[lb] | armv[2345] | armv[345][lb] | pyramid | mn10200 | mn10300 | tron | a29k \
| 580 | i960 | h8300 \
| x86 | ppcbe | mipsbe | mipsle | shbe | shle | armbe | armle \
| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
@@ -1052,7 +1052,7 @@ case $os in
-ns2 )
os=-nextstep2
;;
- -nsk)
+ -nsk*)
os=-nsk
;;
# Preserve the version number of sinix5.