* config.guess: More merges from the FSF.

This commit is contained in:
Per Bothner 1994-08-26 21:38:29 +00:00
parent 0ffe881431
commit 6f023e8aef
2 changed files with 50 additions and 25 deletions

View File

@ -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 <rms@mole.gnu.ai.mit.edu>

53
config.guess vendored
View File

@ -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 <<EOF
main()
main ()
{
#if defined (sony)
#if defined (MIPSEB)
@ -316,59 +318,62 @@ main()
I don't know.... */
printf ("mips-sony-bsd\n"); exit (0);
#else
printf("m68k-sony-newsos\n"); exit(0);
printf ("m68k-sony-newsos\n"); exit (0);
#endif
#endif
#if defined (__arm) && defined (__acorn) && defined (__unix)
printf("arm-acorn-riscix"); exit (0);
printf ("arm-acorn-riscix"); exit (0);
#endif
#if defined(hp300) && !defined(hpux)
printf("m68k-hp-bsd\n"); exit(0);
#if defined (hp300) && !defined (hpux)
printf ("m68k-hp-bsd\n"); exit (0);
#endif
#if defined(NeXT)
#if !defined(__ARCHITECTURE__)
#if defined (NeXT)
#if !defined (__ARCHITECTURE__)
#define __ARCHITECTURE__ "m68k"
#endif
printf("%s-next-nextstep\n", __ARCHITECTURE__); exit(0);
int version;
version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/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.