From a8285504926c7e591be1faab5255553f0435421c Mon Sep 17 00:00:00 2001
From: "David D. Zuhn" <zoo@cygnus>
Date: Tue, 29 Jun 1993 17:22:03 +0000
Subject: [PATCH] fix HPUX hosting problems

---
 gas/ChangeLog    |  8 ++++++++
 gas/configure.in | 25 ++++++++++++++++---------
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index a5489385aa3..68ddab0a920 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+Thu Jun 24 16:33:53 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* configure.in: set host config to hpux for hppa*-hp-hpux
+
+Mon Jun 21 17:37:59 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* Makefile.in: make installation & builds work again for crosses
+
 Thu Jun 17 16:53:56 1993  david d `zoo' zuhn (zoo@cygnus.com)
 	
 	* Makefile.in: canonicalize install.sh; for use within
diff --git a/gas/configure.in b/gas/configure.in
index 2c90667c144..6b6075b7fb5 100644
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -42,7 +42,7 @@ case "${host}" in
 
   alpha-*-osf*)			gas_host=ansi		;;
 
-  hppa*-hp-hpux*)		gas_host=hppahpux	;;
+  hppa*-hp-hpux*)		gas_host=hpux		;;
   hppa*-hp-bsd*)		gas_host=hppabsd	;;
   hppa*-hp-osf*)		gas_host=hppaosf	;;
 
@@ -97,7 +97,7 @@ emulation=generic
 # check for architecture variants
 case ${target_cpu} in
   sparclite*)   cpu_type=sparc ;;
-  sparc64)	cpu_type=sparc obj_format=aout ;;
+  sparc64)	cpu_type=sparc obj_format=aout ;; # v9
   m680[01234]0) cpu_type=m68k ;;
   m683??)       cpu_type=m68k ;;
   i486)		cpu_type=i386 ;;
@@ -145,6 +145,8 @@ case ${generic_target} in
   mips-*-ecoff*)	obj_format=ecoff gas_target=mips-big ;;
   mips-*-irix*)		obj_format=ecoff gas_target=mips-big emulation=irix ;;
 
+  sparc*-*-sunos4*)	bfd_gas=preferred obj_format=aout emulation=sun3 ;;
+
   sparclite*-fujitsu-none)
 			obj_format=aout ;;
 
@@ -206,18 +208,23 @@ case ${bfd_gas}-${obj_format} in
   *)		;;
 esac
 
-case ${with_bfd_assembler} in
-  "")
-    # User specified nothing.
-    ;;
-  "${bfd_gas}")
+case ${with_bfd_assembler}-${bfd_gas} in
+  yes-yes | no-no)
     # We didn't override user's choice.
     ;;
-  no)
-    # ... but we overrode it.
+  no-yes)
     echo '*** Use of BFD is required for ${target}; overriding config options'\
 		1>&2
     ;;
+  no-preferred)
+    bfd_gas=no
+    ;;
+  *-preferred)
+    bfd_gas=yes
+    ;;
+  -*)
+    # User specified nothing.
+    ;;
 esac
 
 files="config/ho-${gas_host}.h config/tc-${cpu_type}.c \
-- 
2.30.2