From b32ae8e2c45f22792a5caae4749823c395e31c4b Mon Sep 17 00:00:00 2001
From: Jim Kingdon <jkingdon@engr.sgi.com>
Date: Fri, 18 Jun 1993 22:47:06 +0000
Subject: [PATCH] 	* config/riscos.m{h,t}: New files. 	*
 configure.{host,in}: Use them.

---
 bfd/ChangeLog    |  5 ++++
 bfd/configure.in | 59 +++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 611b61162c..e42efcee92 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jun 18 16:54:29 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* config/riscos.m{h,t}: New files.
+	* configure.{host,in}: Use them.
+
 Fri Jun 18 12:55:10 1993  K. Richard Pixley  (rich@cygnus.com)
 
 	* elf32-mips.c: comment change.  This is a mips file, not 88k.
diff --git a/bfd/configure.in b/bfd/configure.in
index e28e4ed36b..048f8e1d0e 100644
--- a/bfd/configure.in
+++ b/bfd/configure.in
@@ -7,6 +7,9 @@ configdirs="doc"
 srctrigger=libbfd.c
 srcname="BFD"
 target_dependent=true
+host64=false
+target64=false
+want64=false
 
 # per-host:
 
@@ -43,12 +46,12 @@ case "${target}" in
   h8300-*-*)		bfd_target=h8300-coff ;;
   h8500-*-*)		bfd_target=h8500-coff ;;
   sh-*-*)		bfd_target=sh-coff ;;
-  hppa*-*-bsd)		bfd_target=hppabsd ;;
-  hppa*-*-hpux)		bfd_target=hppahpux ;;
+  hppa*-*-bsd*)		bfd_target=hppabsd ;;
+  hppa*-*-hpux*)	bfd_target=hppahpux ;;
   hppa*-*-osf)		bfd_target=hppa-elf ;;
   i[34]86-*-sysv4*)	bfd_target=i386-elf ;;
   i[34]86-*-sysv*)	bfd_target=i386-coff ;;
-  i[34]86-*-isc*)	bfd_target=i386-coff ;;
+  i[34]86-*-isc*)	bfd_target=i386-sco ;; # gets core dump reading right
   i[34]86-*-sco*)	bfd_target=i386-sco ;;
   i[34]86-*-bsd*)	bfd_target=i386-bsd ;;
   i[34]86-*-aix*)	bfd_target=i386-coff ;;
@@ -58,12 +61,13 @@ case "${target}" in
   i960-*-vxworks)	bfd_target=i960-bout ;;
   i960-*-aout)		bfd_target=i960-bout ;;
   i960-*-bout)		bfd_target=i960-bout ;;
-  m68*-hp-bsd)		bfd_target=hp300bsd ;;
+  m68*-hp-bsd*)		bfd_target=hp300bsd ;;
   m68*-*-aout)		bfd_target=m68k-aout ;;
   m68*-*-coff)		bfd_target=m68k-coff ;;
-  m68*-*-hpux)		bfd_target=hp300 ;;
+  m68*-*-hpux*)		bfd_target=hp300hpux ;;
   m68*-*-os68k)		bfd_target=m68k-aout ;;
   m68*-*-sunos*)	bfd_target=m68k-aout ;;
+  m68*-*-sysv*)		bfd_target=m68k-coff ;;
   m68*-*-vxworks*)	bfd_target=m68k-aout ;;
   m68*-ericsson-*)	bfd_target=m68k-aout ;;
   m68*-netx-*)		bfd_target=m68k-aout ;;
@@ -71,11 +75,15 @@ case "${target}" in
   mips-big-*)		bfd_target=bigmips ;;
   mips-dec-bsd*)        bfd_target=mipsdecbsd ;;
   mips-dec-*)		bfd_target=decstation ;;
-  mips-*-ecoff)		bfd_target=bigmips ;;
+  mips-*-ecoffl*)	bfd_target=decstation ;;
+  mips-*-ecoff*)	bfd_target=bigmips ;;
   mips-sgi-*)		bfd_target=bigmips ;;
+  mips-*-sysv*)		bfd_target=riscos ;;
   rs6000-*-*)		bfd_target=rs6000 ;;
   sparc-*-solaris2*)	bfd_target=sparc-elf ;;
   sparc-*-sysv4*)	bfd_target=sparc-elf ;;
+  sparc64-*-aout*)	bfd_target=sparc-aout ; target64=true ;; # v9
+  sparc64-*-elf*)	bfd_target=sparc-aout ; target64=true ;; # v9
   sparc*-*-*)		bfd_target=sparc-aout ;;
   tahoe-*-*)		bfd_target=tahoe ;;
   vax-*-vms)		bfd_target=vax-vms ;;
@@ -84,12 +92,15 @@ case "${target}" in
   z8k*-*-*)		bfd_target=z8k-coff ;;
 
   *-*-aout)		bfd_target=${target_cpu}-aout ;;
-  *-*-bsd)		bfd_target=${target_cpu}-aout ;;
+  *-*-bsd*)		bfd_target=${target_cpu}-aout ;;
   *-*-sysv4*)		bfd_target=${target_cpu}-elf ;;
   *-*-solaris2*)	bfd_target=${target_cpu}-elf ;;
   *-*-go32)		bfd_target=${target_cpu}-aout ;;
   *-*-sysv*)		bfd_target=${target_cpu}-coff ;;
 
+  *-*-aout64)		bfd_target=${target_cpu}-aout64 ; target64=true ;;
+  *-*-elf64)		bfd_target=${target_cpu}-elf64 ; target64=true ;;
+
   *-adobe-*)		bfd_target=adobe ;;
   *-sony-*)		bfd_target=news ;;
   *-intel-*)		bfd_target=${target_cpu}-coff ;;
@@ -114,13 +125,45 @@ target_makefile_frag=config/${bfd_target}.mt
 
 # post-target:
 
+rm -f Makefile.tmp Makefile.2
+mv Makefile Makefile.tmp
+
 case ${with_minimal_bfd} in
   yes)
-    echo MINIMIZE=1 >> Makefile
+    echo MINIMIZE=1 > Makefile.2
     ;;
   no | "")
+    echo MINIMIZE=0 > Makefile.2
     ;;
   *)
     echo "*** bad value \"${with_minimal_bfd}\" for minimal-bfd flag; ignored" 1>&2
+    echo MINIMIZE=0 > Makefile.2
     ;;
 esac
+
+case ${with_64_bit_bfd} in
+  yes)
+    want64=true
+    ;;
+  no | "")
+    want64=false
+    ;;
+  *)
+    echo "*** bad value \"${with_64_bit_bfd}\" for 64-bit-bfd flag; ignored" 1>&2
+    ;;
+esac
+
+case ${host64}-${target64}-${want64} in
+  *true*)
+    echo WORDSIZE=64 >> Makefile.2
+    echo 'BFD_BACKENDS = $(BFD32_BACKENDS) $(BFD64_BACKENDS)' >> Makefile.2
+    ;;
+  false-false-false)
+    echo WORDSIZE=32 >> Makefile.2
+    echo 'BFD_BACKENDS = $(BFD32_BACKENDS)' >> Makefile.2
+    ;;
+esac
+
+cat Makefile.tmp >> Makefile.2
+rm -f Makefile.tmp
+mv Makefile.2 Makefile