From 96326ecc1deb9109c421ae66edc3450405ec2821 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sun, 7 Jan 2001 12:04:21 +0000 Subject: [PATCH] * config.sub, config.guess: Update from subversions. --- ChangeLog | 128 ++++++++++++++++++++------------------- config.guess | 191 +++++++++++++++++++++++++++++++++++++++++++---------------- config.sub | 71 ++++++++++++---------- 3 files changed, 246 insertions(+), 144 deletions(-) diff --git a/ChangeLog b/ChangeLog index 23bd05a99..f93f5d813 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2001-01-07 Andreas Jaeger + + * config.sub, config.guess: Update from subversions. + 2000-12-12 Alexandre Oliva * configure.in: Disable language-specific target libraries for @@ -205,7 +209,7 @@ Thu Jul 6 15:36:55 2000 Andrew Cagney 2000-07-01 Koundinya K * ltconfig: Add support for mips-dde-sysv4.2MP - + 2000-06-28 Corinna Vinschen * ltconfig: Check for host_os beeing one of `cygwin', `mingw' or @@ -262,7 +266,7 @@ Tue May 16 09:57:35 2000 Andrew Cagney Wed Apr 26 17:03:53 2000 Andrew Cagney : * Makefile.in (do-djunpack): New target. Update djunpack.bat with - current version information. Add to proto-toplev directory. + current version information. Add to proto-toplev directory. (gdb-taz): Build do-djunpack. 2000-05-15 David Edelsohn @@ -298,9 +302,9 @@ Wed May 10 21:26:51 2000 Jim Wilson Wed Apr 19 12:46:26 2000 Andrew Cagney * Makefile.in (taz, gdb-taz, gas.tar.bz2, binutils.tar.bz2, - gas+binutils.tar.bz2, libg++.tar.bz2, gnats.tar.bz2, gdb.tar.bz2, - dejagnu.tar.bz2, gdb+dejagnu.tar.bz2, insight.tar.bz2, - insight+dejagnu.tar.bz2, newlib.tar.bz2): Pass MD5PROG to sub-make. + gas+binutils.tar.bz2, libg++.tar.bz2, gnats.tar.bz2, gdb.tar.bz2, + dejagnu.tar.bz2, gdb+dejagnu.tar.bz2, insight.tar.bz2, + insight+dejagnu.tar.bz2, newlib.tar.bz2): Pass MD5PROG to sub-make. 2000-04-16 Dave Pitts @@ -315,11 +319,11 @@ Wed Apr 12 16:42:48 2000 Andrew Cagney (PACKAGE): Default to TOOL. (VER): Default to a shell script. (taz): Rewrite target. Move real work to do-proto-toplev. Include - md5 checksum generation. + md5 checksum generation. (do-proto-toplev): New target. Create $(PACKAGE)-$(VER) link. (do-tar-bz2): Delete creation of $(PACKAGE)-$(VER) link. (gdb.tar.bz2, dejagnu.tar.bz2, gdb+dejagnu.tar.bz2, - insight.tar.bz2): Use gdb-taz to create archive. + insight.tar.bz2): Use gdb-taz to create archive. Fri Apr 7 18:10:29 2000 Andrew Cagney @@ -333,7 +337,7 @@ Fri Apr 7 18:10:29 2000 Andrew Cagney libstdc++-v3. * config.if: And this file too. * Makefile.in: Add libstdc++-v3 targets. - + 2000-04-05 Michael Meissner * config.sub (d30v): Add d30v as a basic machine type. @@ -348,7 +352,7 @@ Fri Mar 3 18:44:08 2000 Andrew Cagney (do-tar-bz2): Replace TOOL with PACKAGE. (gdb.tar.bz2): Remove GDBTK from GDB package. (gdb+dejagnu.tar.bz2, insight.tar.bz2, insight+dejagnu.tar.bz2, - dejagnu.tar.bz2): New packages. + dejagnu.tar.bz2): New packages. 2000-02-27 Andreas Jaeger @@ -366,7 +370,7 @@ Fri Mar 3 18:44:08 2000 Andrew Cagney Thu Feb 24 16:15:56 2000 Andrew Cagney * config.guess, config.sub: Updated to match config's 2000-02-15 - version. + version. 2000-02-23 Linas Vepstas @@ -619,7 +623,7 @@ Tue Apr 13 22:50:54 1999 Donn Terry (donn@interix.com) gdb, newlib, or libgloss. Sun Apr 11 23:55:34 1999 Alexandre Oliva - + * config-ml.in: On mips*-*-*, if multidirs contains mabi=64, try to link a trivial program with -mabi=64. If it fails, remove mabi=64 from multidirs. @@ -698,7 +702,7 @@ Wed Mar 10 18:35:07 1999 Jeff Johnston Wed Mar 10 17:39:09 1999 Drew Moseley * configure.in: Added bsp support to arm-*-coff and arm-*-elf - targets. + targets. 1999-03-02 Nick Clifton @@ -741,7 +745,7 @@ Wed Feb 17 01:38:59 1999 H.J. Lu (hjl@gnu.org) 1999-02-17 Nick Clifton Patch from: Scott Bambrough - + * config.guess: Modified to recognize uname's armv* syntax. * config.sub: Modified to recognize uname's armv* syntax. @@ -760,7 +764,7 @@ Mon Feb 8 14:17:24 1999 Richard Henderson * config.sub: Add support for strongarm target. Sun Feb 7 18:01:54 1999 Mumit Khan - + * configure.in (*-*-cygwin32*): Use config/mh-cygwin instead of the old name config/mh-cygwin32. Enable texinfo. @@ -775,7 +779,7 @@ Tue Feb 2 19:46:40 1999 Jim Wilson $AR_FOR_TARGET. Likewise for RANLIB. Tue Feb 2 20:05:05 1999 Catherine Moore - + * config.sub (oabi): Recognize. * configure.in (arm-*-oabi): Handle. @@ -826,7 +830,7 @@ Thu Dec 17 01:22:30 1998 Jeffrey A Law (law@cygnus.com) Tue Dec 15 17:02:58 1998 Bob Manson * configure.in: Add cygmon for x86-coff and x86-elf. Configure - cygmon for all sparclite targets, regardless of object format. + cygmon for all sparclite targets, regardless of object format. 1998-12-15 Mark Salter @@ -932,7 +936,7 @@ Mon Oct 12 12:09:44 1998 Jeffrey A Law (law@cygnus.com) CC_FOR_TARGET and friends. Mon Oct 12 12:09:30 1998 Alexandre Oliva - + * Makefile.in (build_tooldir): New variable, same as tooldir. (CC_FOR_TARGET, GCC_FOR_TARGET, CXX_FOR_TARGET): Add -B$(build_tooldir)/bin/. @@ -957,7 +961,7 @@ Wed Sep 30 03:00:05 1998 Jeffrey A Law (law@cygnus.com) (INSTALL_TARGET_MODULES, CLEAN_TARGET_MODULES): Similarly. (all-target-libchill): Add dependencies. * configure.in (target_libs): Add libchill. - + 1998-09-30 Manfred Hollstein * configure.in (target_subdir): Remove duplicate line. @@ -1204,7 +1208,7 @@ Sat Jun 27 22:46:32 1998 Jeffrey A Law (law@cygnus.com) Wed Jun 24 16:01:59 1998 John Metzler * configure.in (noconfigdirs): Add configure pattern for mips tx39 - cygmon + cygmon Tue Jun 23 22:42:32 1998 Mark Alexander @@ -1297,7 +1301,7 @@ Tue May 5 18:02:24 1998 Ian Lance Taylor 1998-04-30 Paul Eggert * Makefile.in (EXTRA_GCC_FLAGS): Remove backslash at end; - Solaris `make' causes it to continue to next definition. + Solaris `make' causes it to continue to next definition. Tue Apr 28 16:24:24 1998 Jason Molenda (crash@bugshack.cygnus.com) @@ -1569,7 +1573,7 @@ Sun Feb 1 02:40:41 1998 Richard Henderson (CHECK_TARGET_MODULES, INSTALL_TARGET_MODULES): Similarly (CLEAN_TARGET_MODULES): Similarly (all-target-libf2c): Add dependences. - * configure.in (target_libs): Add libf2c. + * configure.in (target_libs): Add libf2c. Fri Jan 30 17:18:32 1998 Geoffrey Noer @@ -1764,7 +1768,7 @@ Thu Nov 27 01:31:30 1997 Jeffrey A Law (law@cygnus.com) Wed Nov 26 11:53:33 1997 Keith Seitz * Makefile.in, configure, configure.in, ChangeLog: merge with foundry's - 11/18/97 build + 11/18/97 build Wed Nov 26 16:08:50 1997 Jeffrey A Law (law@cygnus.com) @@ -1856,7 +1860,7 @@ Mon Sep 29 00:38:08 1997 Aaron Jackson Wed Sep 24 18:06:27 1997 Stu Grossman * configure.in (d30v): Remove tcl, tk, expect, gdb, itcl, tix, db, - sn, and gnuserv from noconfigdirs. + sn, and gnuserv from noconfigdirs. Wed Sep 24 15:18:32 1997 Ian Lance Taylor @@ -1876,7 +1880,7 @@ Thu Sep 18 21:43:23 1997 Alexandre Oliva Thu Sep 18 15:37:42 1997 Andrew Cagney * configure (tooldir): enable_gdbtk=YES for cygwin32, NO for - windows. Consistent with gdb/configure. + windows. Consistent with gdb/configure. 1997-09-15 02:37 Ulrich Drepper @@ -1967,14 +1971,14 @@ Tue Aug 19 01:41:32 1997 Jason Merrill Mon Aug 18 11:30:50 1997 Nick Clifton - * configure.in (noconfigdirs): Add support for v850e target. - + * configure.in (noconfigdirs): Add support for v850e target. + * config.sub (maybe_os): Add support for v850e target. Mon Aug 18 11:30:50 1997 Nick Clifton - * configure.in (noconfigdirs): Add support for v850ea target. - + * configure.in (noconfigdirs): Add support for v850ea target. + * config.sub (maybe_os): Add support for v850ea target. Mon Aug 18 09:24:06 1997 Gavin Koch @@ -2057,13 +2061,13 @@ Tue Aug 5 12:12:44 1997 Andrew Cagney Mon Aug 4 22:59:02 1997 Andrew Cagney * Makefile.in (CC_FOR_TARGET): When winsup/Makefile present, - correctly specify the target build directory $(TARGET_SUBDIR)/winsup - for libraries. + correctly specify the target build directory $(TARGET_SUBDIR)/winsup + for libraries. Mon Aug 4 12:40:24 1997 Jason Merrill * Makefile.in (EXTRA_GCC_FLAGS): Fix handling of macros with values - separated by spaces. + separated by spaces. Thu Jul 31 19:49:49 1997 Ian Lance Taylor @@ -2108,7 +2112,7 @@ Tue Jul 15 14:33:03 1997 Brendan Kehoe Mon Jul 14 11:01:15 1997 Martin M. Hunt - * configure (GDB_TK): Needs itcl and tix. + * configure (GDB_TK): Needs itcl and tix. Mon Jul 14 00:32:10 1997 Jason Merrill @@ -2164,7 +2168,7 @@ Wed Jun 25 12:18:54 1997 Brendan Kehoe (CLEAN_TARGET_MODULES): Add clean-target-gperf. Mon Jun 23 10:51:53 1997 Jeffrey A Law (law@cygnus.com) - + * config.sub (mn10200): Recognize new basic machine. Thu Jun 19 14:16:42 1997 Brendan Kehoe @@ -2194,7 +2198,7 @@ Mon Jun 16 11:11:10 1997 Ian Lance Taylor $(DEFAULT_YACC). * configure.in: Build itl, db, sn, etc., when building for native - cygwin32. + cygwin32. * Makefile.in (LD): New variable. (EXTRA_HOST_FLAGS): Pass down LD. @@ -2207,7 +2211,7 @@ Mon Jun 16 11:10:35 1997 Philip Blundell Fri Jun 13 10:22:56 1997 Bob Manson * configure.in (targargs): Strip out any supplied --build argument - before adding our own. Always add --build. + before adding our own. Always add --build. Thu Jun 12 21:12:28 1997 Bob Manson @@ -2402,7 +2406,7 @@ Tue Feb 25 18:46:14 1997 Stan Shebs Tue Feb 25 13:19:14 1997 Andrew Cagney * configure.in (noconfigdirs): Disable target-newlib, - target-examples and target-libiberty for d30v. + target-examples and target-libiberty for d30v. Fri Feb 21 17:56:25 1997 Martin M. Hunt @@ -2415,12 +2419,12 @@ Fri Feb 21 20:58:51 1997 Michael Meissner Sun Feb 16 15:41:09 1997 Andrew Cagney * configure.in (d30v-*): Remove sim directory from list of - unsupported d30v directories + unsupported d30v directories Tue Feb 18 17:32:42 1997 Martin M. Hunt - * config.sub, configure.in: Add d30v target cpu. - + * config.sub, configure.in: Add d30v target cpu. + Thu Feb 13 22:04:44 1997 Klaus Kaempf * makefile.vms: New file. @@ -2598,7 +2602,7 @@ Fri Nov 8 11:34:58 1996 David J. MacKenzie LynxOs is not a hardware supplier. * config.guess: Contributions from bug-gnu-utils to add support for: - OpenBSD like NetBSD. + OpenBSD like NetBSD. Stratus systems. More Pyramid systems. i[n>4]86 Intel chips. @@ -2716,7 +2720,7 @@ Mon Oct 7 10:59:35 1996 Ian Lance Taylor Fri Oct 4 12:22:58 1996 Angela Marie Thomas (angela@cygnus.com) - * configure.in: Use config/mh-dgux386 for i[345]86-dg-dgux + * configure.in: Use config/mh-dgux386 for i[345]86-dg-dgux host configuration file. Thu Oct 3 09:28:25 1996 Jeffrey A Law (law@cygnus.com) @@ -2739,7 +2743,7 @@ Wed Oct 2 15:52:36 1996 Klaus Kaempf Tue Oct 1 01:28:41 1996 James G. Smith * configure.in (noconfigdirs): Don't build libgloss for arm-coff - targets. + targets. Mon Sep 30 14:24:01 1996 Stan Shebs @@ -2866,7 +2870,7 @@ Sat Jul 27 15:10:43 1996 Stan Shebs Tue Jul 23 10:47:04 1996 Martin M. Hunt - * configure.in (d10v-*-*): Remove ld from $noconfigdirs. + * configure.in (d10v-*-*): Remove ld from $noconfigdirs. Mon Jul 22 13:28:51 1996 Brendan Kehoe @@ -2966,7 +2970,7 @@ Sun Jun 23 22:41:54 1996 Geoffrey Noer Sat Jun 22 11:39:01 1996 Jason Merrill * Makefile.in (TARGET_SUBDIR): Move comment to previous line so we - don't get ". ". + don't get ". ". Fri Jun 21 17:24:48 1996 Jim Wilson @@ -3413,7 +3417,7 @@ Fri Dec 29 07:56:11 1995 Michael Meissner * Makefile.in (EXTRA_GCC_FLAGS): If any of the make variables LANGUAGES, BOOT_CFLAGS, STMP_FIXPROTO, LIMITS_H_TEST, LIBGCC1_TEST, LIBGCC2_CFLAGS, LIBGCC2_INCLUDES, and ENQUIRE are - non-empty, pass them on to the GCC make. + non-empty, pass them on to the GCC make. (all-bootstrap): New rule that is like all-gcc, except it executes the GCC bootstrap rule instead of the GCC all rule. @@ -3493,7 +3497,7 @@ Mon Dec 4 12:38:15 1995 Ian Lance Taylor Thu Nov 30 14:45:25 1995 J.T. Conklin * config/mt-v810 (CC_FOR_TARGET): Add -ansi flag. NEC compiler - defaults to K&R mode, but doesn't have varargs.h, so we have to + defaults to K&R mode, but doesn't have varargs.h, so we have to compile in ANSI mode. Thu Nov 30 16:57:33 1995 Per Bothner @@ -3605,15 +3609,15 @@ Mon Nov 13 12:34:20 1995 Stan Shebs * mpw-config.in: Configure grez if targeting Mac. * config.sub: Accept pmac and pmac-mpw as names for PowerMacs, - accept mpw and mac-mpw as names for m68k Macs, change macos7 to - just macos. + accept mpw and mac-mpw as names for m68k Macs, change macos7 to + just macos. * configure.in: Configure grez resource compiler if targeting Mac. * Makefile.in (all-grez, install-grez): New targets. Wed Nov 8 17:33:51 1995 Jason Merrill * configure: CXX defaults to gcc, not g++. If we find - gcc in the path, set CC to gcc -O2. + gcc in the path, set CC to gcc -O2. Tue Nov 7 15:45:17 1995 Ian Lance Taylor @@ -3663,8 +3667,8 @@ Wed Nov 1 12:23:20 1995 Ian Lance Taylor Tue Oct 31 17:52:39 1995 J.T. Conklin * configure.in (host_makefile_frag): Use m68k-sun-sunos* instead - of m68k-sun-* when selecting mh-sun3 to avoid matching NetBSD/sun3 - systems. + of m68k-sun-* when selecting mh-sun3 to avoid matching NetBSD/sun3 + systems. Tue Oct 31 16:57:32 1995 Jim Wilson @@ -3776,7 +3780,7 @@ Wed Oct 18 15:53:56 1995 steve chamberlain * Makefile.in: Build winsup. * configure.in: Winsup is configured when target is win32. Can only build win32 target GDB when native. - + Mon Oct 16 09:42:31 1995 Jeffrey A Law (law@cygnus.com) * config.guess: Recognize HP model 819 machines as having @@ -3826,7 +3830,7 @@ Wed Oct 4 22:05:36 1995 Jason Molenda (crash@phydeaux.cygnus.com) Wed Oct 4 21:55:00 1995 Jason Molenda (crash@phydeaux.cygnus.com) - * configure.in (CC): Try to get CC from + * configure.in (CC): Try to get CC from ${srcdir}/${host_makefile_frag}, not ${host_makefile_frag}. Wed Oct 4 21:44:12 1995 Jason Molenda (crash@phydeaux.cygnus.com) @@ -3876,7 +3880,7 @@ Thu Sep 28 21:18:49 1995 Stan Shebs Thu Sep 28 17:39:56 1995 steve chamberlain - * configure.in (host i[345]86-*-win32): Reduce the + * configure.in (host i[345]86-*-win32): Reduce the noconfigdirs again. Wed Sep 27 12:24:00 1995 Ian Lance Taylor @@ -3917,7 +3921,7 @@ Mon Sep 18 23:08:26 1995 J.T. Conklin gdb, ld and opcodes on v810-*-*. Sat Sep 16 18:31:08 PDT 1995 Angela Marie Thomas - + * config/mh-ncrsvr43: Removed AR_FLAGS Tue Sep 12 18:03:31 1995 Ian Lance Taylor @@ -3942,7 +3946,7 @@ Thu Sep 7 20:03:41 1995 Ken Raeburn Fri Sep 1 08:06:58 1995 James G. Smith * config.sub: recognise mips64vr4300 and mips64vr4300el as valid - targets. + targets. Wed Aug 30 21:06:50 1995 Jason Molenda (crash@phydeaux.cygnus.com) @@ -4791,7 +4795,7 @@ Thu Jun 2 10:57:06 1994 Karen Christiansen (karen@cirdan.cygnus.com) * brought build-all.mk update-to-date with progressive build-all.mk, added new targets and hppa info. - + Thu Jun 2 00:12:44 1994 Ian Lance Taylor (ian@tweedledumb.cygnus.com) * configure: If config.guess result is a prefix of the user @@ -4936,8 +4940,8 @@ Tue Apr 26 18:11:33 1994 Ian Lance Taylor (ian@tweedledumb.cygnus.com) Mon Apr 25 15:06:34 1994 Stan Shebs (shebs@andros.cygnus.com) - * configure.in (*-*-lynxos*): Don't configure newlib for either - native or cross Lynx. + * configure.in (*-*-lynxos*): Don't configure newlib for either + native or cross Lynx. Sat Apr 16 11:58:16 1994 Doug Evans (dje@canuck.cygnus.com) @@ -4966,7 +4970,7 @@ Sat Apr 9 15:10:45 1994 David J. Mackenzie (djm@rtl.cygnus.com) Fri Apr 8 12:01:41 1994 David J. Mackenzie (djm@cygnus.com) * configure: Ignore --x-includes and --x-libraries, for Autoconf - compatibility. + compatibility. Thu Apr 7 17:31:43 1994 Doug Evans (dje@canuck.cygnus.com) @@ -5279,7 +5283,7 @@ Wed Nov 3 22:09:46 1993 Ken Raeburn (raeburn@rtl.cygnus.com) * Makefile.in (DISTDOCDIRS): New variable. (taz): Edit local Makefile.in sooner, instead of proto-toplev - Makefile.in later. Build "info" and "dvi" in DISTDOCDIRS. + Makefile.in later. Build "info" and "dvi" in DISTDOCDIRS. Wed Nov 3 21:31:52 1993 david d `zoo' zuhn (zoo@rtl.cygnus.com) @@ -6682,7 +6686,7 @@ Thu Aug 27 13:04:42 1992 Brendan Kehoe (brendan@rtl.cygnus.com) Mon Aug 24 14:05:14 1992 Ian Lance Taylor (ian@cygnus.com) - * config.sub, configure.in: accept OSE68000 and OSE68k. + * config.sub, configure.in: accept OSE68000 and OSE68k. * Makefile.in: don't create all directories for ``make install''; let the subdirectories create the ones they need. diff --git a/config.guess b/config.guess index 08e8a750a..4758b11fb 100755 --- a/config.guess +++ b/config.guess @@ -1,9 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. -version='2000-09-05' +timestamp='2001-01-01' # 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 @@ -32,7 +32,7 @@ version='2000-09-05' # exits with 0. Otherwise, it exits with 1. # # The plan is that this can be called by configure scripts if you -# don't specify an explicit system type (host/target name). +# don't specify an explicit build system type. # # Only a few systems have been added to this list; please add others # (but try to keep the structure clean). @@ -43,19 +43,34 @@ me=`echo "$0" | sed -e 's,.*/,,'` usage="\ Usage: $0 [OPTION] -Output the configuration name of this system. +Output the configuration name of the system \`$me' is run on. Operation modes: - -h, --help print this help, then exit - -V, --version print version number, then exit" + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.guess ($timestamp) + +Originally written by Per Bothner. +Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000 +Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." help=" Try \`$me --help' for more information." # Parse command line while test $# -gt 0 ; do - case "$1" in - --version | --vers* | -V ) + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit 0 ;; + --version | -v ) echo "$version" ; exit 0 ;; --help | --h* | -h ) echo "$usage"; exit 0 ;; @@ -64,9 +79,7 @@ while test $# -gt 0 ; do - ) # Use stdin as input. break ;; -* ) - exec >&2 - echo "$me: invalid option $1" - echo "$help" + echo "$me: invalid option $1$help" >&2 exit 1 ;; * ) break ;; @@ -78,19 +91,30 @@ if test $# != 0; then exit 1 fi -# Use $HOST_CC if defined. $CC may point to a cross-compiler -if test x"$CC_FOR_BUILD" = x; then - if test x"$HOST_CC" != x; then - CC_FOR_BUILD="$HOST_CC" - else - if test x"$CC" != x; then - CC_FOR_BUILD="$CC" - else - CC_FOR_BUILD=cc - fi - fi -fi +dummy=dummy-$$ +trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15 + +# CC_FOR_BUILD -- compiler used by this script. +# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still +# use `HOST_CC' if defined, but it is deprecated. + +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int dummy(){}" > $dummy.c + for c in cc gcc c89 ; do + ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 + if test $? = 0 ; then + CC_FOR_BUILD="$c"; break + fi + done + rm -f $dummy.c $dummy.o + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +esac # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 8/24/94.) @@ -100,12 +124,9 @@ fi UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -dummy=dummy-$$ -trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15 - # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -129,16 +150,24 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ibmrt|romp-ibm) machine=romp-ibm ;; *) machine=${UNAME_MACHINE}-unknown ;; esac - # The Operating System including object format. - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? - os=netbsd - else - os=netbsdelf - fi + # The Operating System including object format, if it has switched + # to ELF recently, or will in the future. + case "${UNAME_MACHINE}" in + i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k) + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep __ELF__ >/dev/null + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? + os=netbsd + else + os=netbsdelf + fi + ;; + *) + os=netbsd + ;; + esac # The OS release release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: @@ -473,6 +502,19 @@ EOF fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} exit 0 ;; + *:AIX:*:5) + case "`lsattr -El proc0 -a type -F value`" in + PowerPC*) IBM_ARCH=powerpc + IBM_MANUF=ibm ;; + Itanium) IBM_ARCH=ia64 + IBM_MANUF=unknown ;; + POWER*) IBM_ARCH=power + IBM_MANUF=ibm ;; + *) IBM_ARCH=powerpc + IBM_MANUF=ibm ;; + esac + echo ${IBM_ARCH}-${IBM_MANUF}-aix${UNAME_VERSION}.${UNAME_RELEASE} + exit 0 ;; *:AIX:*:*) echo rs6000-ibm-aix exit 0 ;; @@ -495,10 +537,28 @@ EOF echo m68k-hp-bsd4.4 exit 0 ;; 9000/[34678]??:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in 9000/31? ) HP_ARCH=m68000 ;; 9000/[34]?? ) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) + case "${HPUX_REV}" in + 11.[0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; + esac ;; + esac + fi ;; + esac + if [ "${HP_ARCH}" = "" ]; then sed 's/^ //' << EOF >$dummy.c #define _HPUX_SOURCE @@ -533,11 +593,16 @@ EOF } EOF (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` + if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi rm -f $dummy.c $dummy + fi ;; esac - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux${HPUX_REV} + exit 0 ;; 3050*:HI-UX:*:*) sed 's/^ //' << EOF >$dummy.c #include @@ -628,23 +693,24 @@ EOF CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; - CRAY*T3E:*:*:*) + CRAY*T3D:*:*:*) echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; + CRAY*T3E:*:*:*) + echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY-2:*:*:*) echo cray2-cray-unicos exit 0 ;; - F300:UNIX_System_V:*:*) + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; - F301:UNIX_System_V:*:*) - echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'` - exit 0 ;; hp300:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; @@ -698,8 +764,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: *// @@ -725,6 +790,10 @@ EOF echo "${UNAME_MACHINE}-unknown-linux-gnuaout" exit 0 ;; + elf32_sparc) + echo "${UNAME_MACHINE}-unknown-linux-gnu" + exit 0 + ;; armlinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" exit 0 @@ -860,14 +929,28 @@ EOF echo s390-ibm-linux && exit 0 elif test "${UNAME_MACHINE}" = "x86_64"; then echo x86_64-unknown-linux-gnu && exit 0 + elif test "${UNAME_MACHINE}" = "parisc" -o "${UNAME_MACHINE}" = "hppa"; then + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in + PA7*) + echo hppa1.1-unknown-linux-gnu + ;; + PA8*) + echo hppa2.0-unknown-linux-gnu + ;; + *) + echo hppa-unknown-linux-gnu + ;; + esac + exit 0 else # Either a pre-BFD a.out linker (linux-gnuoldld) # or one that does not give us useful --help. # 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) @@ -982,7 +1065,7 @@ EOF exit 0 ;; M68*:*:R3V[567]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) + 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` @@ -1087,6 +1170,9 @@ EOF NSR-[KW]:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux + exit 0 ;; BS2000:POSIX*:*:*) echo bs2000-siemens-sysv exit 0 ;; @@ -1104,6 +1190,11 @@ EOF fi echo ${UNAME_MACHINE}-unknown-plan9 exit 0 ;; + i?86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1283,7 +1374,7 @@ exit 1 # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "version='" +# time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" # End: diff --git a/config.sub b/config.sub index f8d46e4ef..a97fdc342 100755 --- a/config.sub +++ b/config.sub @@ -1,9 +1,9 @@ #! /bin/sh -# Configuration validation subroutine script, version 1.1. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 +# Configuration validation subroutine script. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. -version='2000-11-02' +timestamp='2001-01-07' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -60,16 +60,30 @@ Usage: $0 [OPTION] CPU-MFR-OPSYS Canonicalize a configuration name. Operation modes: - -h, --help print this help, then exit - -V, --version print version number, then exit" + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.sub ($timestamp) + +Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000 +Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." help=" Try \`$me --help' for more information." # Parse command line while test $# -gt 0 ; do - case "$1" in - --version | --vers* | -V ) + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit 0 ;; + --version | -v ) echo "$version" ; exit 0 ;; --help | --h* | -h ) echo "$usage"; exit 0 ;; @@ -78,9 +92,7 @@ while test $# -gt 0 ; do - ) # Use stdin as input. break ;; -* ) - exec >&2 - echo "$me: invalid option $1" - echo "$help" + echo "$me: invalid option $1$help" exit 1 ;; *local*) @@ -145,14 +157,6 @@ case $os in os=-vxworks basic_machine=$1 ;; - -chorusos*) - os=-chorusos - basic_machine=$1 - ;; - -chorusrdb) - os=-chorusrdb - basic_machine=$1 - ;; -hiux*) os=-hiuxwe2 ;; @@ -227,7 +231,7 @@ case $basic_machine in | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \ | mips64vr5000 | miprs64vr5000el | mcore \ | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \ - | thumb | d10v | d30v | fr30 | avr) + | thumb | d10v | d30v | fr30 | avr | openrisc) basic_machine=$basic_machine-unknown ;; m6811 | m68hc11 | m6812 | m68hc12) @@ -269,7 +273,7 @@ case $basic_machine in | mips64el-* | mips64orion-* | mips64orionel-* \ | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ | mipstx39-* | mipstx39el-* | mcore-* \ - | f301-* | s390-* | sv1-* | t3e-* \ + | f30[01]-* | f700-* | s390-* | sv1-* | t3e-* \ | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \ | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \ | bs2000-* | tic54x-* | c54x-* | x86_64-*) @@ -650,6 +654,10 @@ case $basic_machine in basic_machine=i960-intel os=-mon960 ;; + nonstopux) + basic_machine=mips-compaq + os=-nonstopux + ;; np1) basic_machine=np1-gould ;; @@ -685,28 +693,28 @@ case $basic_machine in pc532 | pc532-*) basic_machine=ns32k-pc532 ;; - pentium | p5 | k5 | k6 | nexen) + pentium | p5 | k5 | k6 | nexgen) basic_machine=i586-pc ;; pentiumpro | p6 | 6x86 | athlon) basic_machine=i686-pc ;; pentiumii | pentium2) - basic_machine=i786-pc + basic_machine=i686-pc ;; - pentium-* | p5-* | k5-* | k6-* | nexen-*) + pentium-* | p5-* | k5-* | k6-* | nexgen-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumii-* | pentium2-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pn) basic_machine=pn-gould ;; - power) basic_machine=rs6000-ibm + power) basic_machine=power-ibm ;; ppc) basic_machine=powerpc-unknown ;; @@ -918,7 +926,7 @@ case $basic_machine in basic_machine=we32k-att ;; sh3 | sh4) - base_machine=sh-unknown + basic_machine=sh-unknown ;; sparc | sparcv9) basic_machine=sparc-sun @@ -998,11 +1006,10 @@ case $os in | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -storm-chaos*) + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* | -storm-chaos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1100,7 +1107,7 @@ case $os in -xenix) os=-xenix ;; - -*mint | -*MiNT) + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) os=-mint ;; -none) @@ -1242,7 +1249,7 @@ case $basic_machine in *-masscomp) os=-rtu ;; - f301-fujitsu) + f30[01]-fujitsu | f700-fujitsu) os=-uxpv ;; *-rom68k) @@ -1320,7 +1327,7 @@ case $basic_machine in -mpw* | -macos*) vendor=apple ;; - -*mint | -*MiNT) + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) vendor=atari ;; esac @@ -1333,7 +1340,7 @@ exit 0 # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "version='" +# time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" # End: -- 2.11.4.GIT