From 6f023e8aef3d418c3b7d0f06a6f67d98453faf79 Mon Sep 17 00:00:00 2001 From: Per Bothner Date: Fri, 26 Aug 1994 21:38:29 +0000 Subject: [PATCH] * config.guess: More merges from the FSF. --- ChangeLog | 22 +++++++++++++++++++++- config.guess | 53 ++++++++++++++++++++++++++++------------------------ 2 files changed, 50 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index e1b237be893..18419fb52e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +Fri Aug 26 14:30:05 1994 Per Bothner (bothner@kalessin.cygnus.com) + + * config.guess: More merges from the FSF: + + Add a space before function call or macro invocation. + + Tue May 10 16:53:55 1994 Roland McGrath (roland@churchy.gnu.ai.mit.edu) + + * config.guess: Add trap cmd to remove dummy.c and dummy when + interrupted. + + Wed Apr 20 18:07:13 1994 Roland McGrath (roland@churchy.gnu.ai.mit.edu) + + * config.guess (dummy.c): Redirect stderr for `hostinfo' command. + (dummy): Redirect stderr from compilation of dummy.c. + + Sat Apr 9 14:59:28 1994 Christian Kranz (kranz@sent5.uni-duisburg.de) + + * config.guess: Distinguish between NeXTStep 2.1 and 3.x. + Fri Aug 26 13:42:20 1994 Ken Raeburn (raeburn@kr-laptop.cygnus.com) * configure: Accept and ignore --cache*, for compatibility with @@ -5,7 +25,7 @@ Fri Aug 26 13:42:20 1994 Ken Raeburn (raeburn@kr-laptop.cygnus.com) Fri Aug 26 13:05:27 1994 Per Bothner (bothner@kalessin.cygnus.com) - * (config.guess): Merge from FSF: + * config.guess: Merge from FSF: Thu Aug 25 20:28:51 1994 Richard Stallman diff --git a/config.guess b/config.guess index 08825b4f1a4..ef8474beed8 100755 --- a/config.guess +++ b/config.guess @@ -39,6 +39,8 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +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 @@ -308,7 +310,7 @@ esac #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 cat >dummy.c </dev/null`; + printf ("%s-next-neststep%s\n", __ARCHITECTURE__, version==2 ? "2" : "3"); + exit (0); #endif #if defined (MULTIMAX) || defined (n16) #if defined (UMAXV) - printf("ns32k-encore-sysv\n"); exit(0); + printf ("ns32k-encore-sysv\n"); exit (0); #else #if defined (CMU) - printf("ns32k-encore-mach\n"); exit(0); + printf ("ns32k-encore-mach\n"); exit (0); #else - printf("ns32k-encore-bsd\n"); exit(0); + printf ("ns32k-encore-bsd\n"); exit (0); #endif #endif #endif -#if defined(__386BSD__) - printf("i386-unknown-bsd\n"); exit(0); +#if defined (__386BSD__) + printf ("i386-unknown-bsd\n"); exit (0); #endif -#if defined(sequent) -#if defined(i386) - printf("i386-sequent-dynix\n"); exit(0); +#if defined (sequent) +#if defined (i386) + printf ("i386-sequent-dynix\n"); exit (0); #endif #if defined (ns32000) - printf("ns32k-sequent-dynix\n"); exit(0); + printf ("ns32k-sequent-dynix\n"); exit (0); #endif #endif -#if defined(_SEQUENT_) - printf("i386-sequent-ptx\n"); exit(0); +#if defined (_SEQUENT_) + printf ("i386-sequent-ptx\n"); exit (0); #endif -#if defined(vax) -#if !defined(ultrix) - printf("vax-dec-bsd\n"); exit(0); +#if defined (vax) +#if !defined (ultrix) + printf ("vax-dec-bsd\n"); exit (0); #else - printf("vax-dec-ultrix\n"); exit(0); + printf ("vax-dec-ultrix\n"); exit (0); #endif #endif @@ -380,7 +385,7 @@ main() } EOF -${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0 +${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0 rm -f dummy.c dummy # Apollos put the system type in the environment. -- 2.30.2