From 9117f6093aab664c83b3f8e69ac9f44b4a554120 Mon Sep 17 00:00:00 2001 From: Jim Kingdon Date: Tue, 5 Oct 1993 17:41:05 +0000 Subject: [PATCH] * configure.in: Recognize hppa*-*-hiux* (currently synonym for hpux). * config.guess: Recognize Hitachi's HIUX. * config.sub: Recognize h3050r* and hppahitachi. Remove redundant cases for hp9k[23]*. --- ChangeLog | 25 +++++++++++++++++++++++++ config.guess | 42 ++++++++++++++++++++++++++++++++++++++++-- config.sub | 40 ++++++++++++++++++++++------------------ configure.in | 1 + 4 files changed, 88 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index c9023f6c09..7dc11537a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,28 @@ +Tue Oct 5 11:55:04 1993 Jim Kingdon (kingdon@lioth.cygnus.com) + + * configure.in: Recognize hppa*-*-hiux* (currently synonym for hpux). + * config.guess: Recognize Hitachi's HIUX. + * config.sub: Recognize h3050r* and hppahitachi. + Remove redundant cases for hp9k[23]*. + +Mon Oct 4 16:15:09 1993 david d `zoo' zuhn (zoo@rtl.cygnus.com) + + * configure.in: default to '--with-gnu-as' and '--with-gnu-ld' + if gas and ld are in the source tree and are in ${configdirs}. + If ${use_gnu_as} or ${use_gnu_ld} are 'no', then don't set the + the --with options (but still pass them down on the command line, + if they were explicitly specified). + +Fri Sep 24 19:11:13 1993 david d `zoo' zuhn (zoo@rtl.cygnus.com) + + * configure: substitute SHELL value in Makefile.in with + ${CONFIG_SHELL} + +Thu Sep 23 18:05:13 1993 Ian Lance Taylor (ian@tweedledumb.cygnus.com) + + * configure.in: Build gas, ld, and binutils for *-*-sysv4* and + *-*-solaris2* targets. + Sun Sep 19 17:01:41 1993 david d `zoo' zuhn (zoo@rtl.cygnus.com) * Makefile.in: define M4, and pass it down to sub-makes; diff --git a/config.guess b/config.guess index 7ec2a411d8..f2507b19d9 100755 --- a/config.guess +++ b/config.guess @@ -38,8 +38,13 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in alpha:OSF1:1.*:*) + # 1.2 uses "1.2" for uname -r. echo alpha-dec-osf${UNAME_RELEASE} exit 0 ;; + alpha:OSF1:V1.*:*) + # 1.3 uses "V1.3" for uname -r. + echo alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^V//'` + exit 0 ;; sun4*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; @@ -98,7 +103,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo m68k-hp-bsd exit 0 ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd44 + echo m68k-hp-bsd4.4 exit 0 ;; 9000/7??:HP-UX:*:* | 9000/8?7:HP-UX:*:* ) echo hppa1.1-hp-hpux @@ -106,6 +111,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in 9000/8??:HP-UX:*:*) echo hppa1.0-hp-hpux exit 0 ;; + 3050*:HI-UX:*:*) + sed 's/^ //' << EOF >dummy.c + #include + int + main () + { + long cpu = sysconf (_SC_CPU_VERSION); + if (CPU_IS_HP_MC68K (cpu)) + puts ("m68k-hitachi-hiuxwe2"); + else if (CPU_IS_PA_RISC (cpu)) + { + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; + case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; + default: puts ("hppa-hitachi-hiuxwe2"); break; + } + } + else puts ("unknown-hitachi-hiuxwe2"); + exit (0); + } +EOF + ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0 + rm -f dummy.c dummy + echo unknown-hitachi-hiuxwe2 + exit 0 ;; 9000/7??:4.3bsd:*:* | 9000/8?7:4.3bsd:*:* ) echo hppa1.1-hp-bsd exit 0 ;; @@ -127,6 +159,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in CRAY-2:UNICOS:*:*) echo cray2-cray-unicos exit 0 ;; + hp3[0-9][05]:NetBSD:*:*) + echo m68k-hp-netbsd${UNAME_RELEASE} + exit 0 ;; + i[34]86:NetBSD:*:*) + echo ${UNAME_MACHINE}-unknown-netbsd${UNAME_RELEASE} + exit 0 ;; i[34]86:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux exit 0 ;; @@ -152,7 +190,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in exit 0 ;; M680[234]0:*:R3V[567]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 33??:*:4.0:*) + 3[34]??:*:4.0:*) uname -p 2>/dev/null | grep 86 >/dev/null \ && echo i486-ncr-sysv4 && exit 0 ;; esac diff --git a/config.sub b/config.sub index a4922bc624..150edefc59 100755 --- a/config.sub +++ b/config.sub @@ -70,7 +70,8 @@ else os=; fi case $os in -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ - -unicom* | -ibm* | -next* | -hp | -isi* | -apollo | -altos* | \ + -unicom* | -ibm* | -next* | -hp | -hitachi | -isi* | -apollo | \ + -altos* | \ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | \ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp) @@ -113,7 +114,8 @@ case $basic_machine in tahoe | i[34]86 | i860 | m68k | m68000 | m88k | ns32k | arm | pyramid \ | tron | a29k | 580 | i960 | h8300 | hppa1.0 | hppa1.1 \ | alpha | we32k | ns16k | clipper | sparclite \ - | sparc | m680[01234]0 | m683?2 | z8k | v70 | h8500)# CYGNUS LOCAL + | sparc | m680[01234]0 | m683?2 | z8k | v70 | h8500 \ + | m88110) # CYGNUS LOCAL basic_machine=$basic_machine-unknown ;; # Recognize the basic CPU types with with company name. @@ -123,7 +125,8 @@ case $basic_machine in | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \ | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \ | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \ - | m680[01234]0-* | m683?2-* | z8k-* | h8500-* | sh-*) # CYGNUS LOCAL + | m680[01234]0-* | m683?2-* | z8k-* | h8500-* | sh-* \ + | m88110-*) # CYGNUS LOCAL ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. @@ -181,6 +184,10 @@ case $basic_machine in basic_machine=i386-unknown os=-bsd ;; + netbsd386) + basic_machine=i386-unknown # CYGNUS LOCAL + os=-netbsd + ;; spur) basic_machine=spur-unknown ;; @@ -353,6 +360,9 @@ case $basic_machine in hp9k8[0-9][0-9] | hp8[0-9][0-9]) basic_machine=hppa1.0-hp ;; + h3050r* | hppahitachi) + basic_machine=hppa1.1-hitachi + ;; isi68 | isi) basic_machine=m68k-isi os=-sysv @@ -381,7 +391,7 @@ case $basic_machine in st2000) # CYGNUS LOCAL basic_machine=m68k-tandem ;; - *bug) # CYGNUS LOCAL + m6*bug) # CYGNUS LOCAL basic_machine=m68k-bug os=-coff ;; @@ -447,10 +457,6 @@ case $basic_machine in basic_machine=h8300-hitachi os=-hms ;; - h8300hhms) # CYGNUS LOCAL - basic_machine=h8300h-hitachi - os=-hms - ;; sh) # CYGNUS LOCAL basic_machine=sh-hitachi os=-hms @@ -492,14 +498,6 @@ case $basic_machine in basic_machine=m68k-hp os=-hpux ;; - hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp - os=-hpux - ;; - hp9k3[2-9][0-9]) - basic_machine=m68k-hp - os=-hpux - ;; hppaosf) basic_machine=hppa1.1-hp os=-osf @@ -646,14 +644,14 @@ case $os in # The portable systems comes first. # Each alternative must end in a *, to match a version number. -bsd* | -sysv* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]* | -hpux* \ + | -netbsd | -vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]* | -hpux* \ | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ | -amigados* | -msdos* | -newsos* | -unicos* | -aos* \ | -nindy* | -vxworks* | -ebmon* | -hds* \ | -riscos* | -linux* | -uniplus* | -iris* | -rtu* | -xenix* \ | -go32 | -sim | -es1800* | -udi | -hms* | -xray \ | -os68k* | -none* | -v88r* | -aout | -coff | -elf | -bosx* \ - | -ecoff* | -lynxos* ) + | -ecoff* | -lynxos* | -netware* ) # The last three lines above are CYGNUS LOCAL ;; # start-sanitize-v9 @@ -753,6 +751,9 @@ case $basic_machine in *-hp) os=-hpux ;; + *-hitachi) + os=-hiux + ;; i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) os=-sysv ;; @@ -828,6 +829,9 @@ case $basic_machine in -hpux*) vendor=hp ;; + -hiux*) + vendor=hitachi + ;; -unos*) vendor=crds ;; diff --git a/configure.in b/configure.in index 8cad8e8e4f..dce37ac858 100644 --- a/configure.in +++ b/configure.in @@ -106,6 +106,7 @@ case "${host}" in m68k-sun-*) host_makefile_frag=config/mh-sun3 ;; *-sun-*) host_makefile_frag=config/mh-sun ;; *-hp-hpux) host_makefile_frag=config/mh-hpux ;; + *-*-hiux*) host_makefile_frag=config/mh-hpux ;; *-*-lynxos*) host_makefile_frag=config/mh-lynxos ;; *-*-sysv4*) host_makefile_frag=config/mh-sysv4 ;; *-*-sysv*) host_makefile_frag=config/mh-sysv ;;