From 4181c9853b48e3a4deb6c518e4b0a6a901eef7ac Mon Sep 17 00:00:00 2001
From: Ken Raeburn <raeburn@cygnus>
Date: Thu, 8 Dec 1994 22:54:22 +0000
Subject: [PATCH] configure.in: fix ns32k-pc532-mach* and mips-sony-bsd*
 configs

---
 gas/ChangeLog    | 12 +++++++++---
 gas/configure    | 41 +++++++++++++++++++++++------------------
 gas/configure.in |  7 ++++++-
 3 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 69411c6b808..34c492d63c5 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,9 +1,15 @@
+Thu Dec  8 17:48:25 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* configure.in (ns32k-pc532-mach*): Select correct emulation.
+	(mips-sony-bsd*): Use ecoff.
+	* configure: Regenerated.
+
 start-sanitize-arc
 Tue Nov 29 18:12:22 1994  Doug Evans  <dje@canuck.cygnus.com>
 
 	* configure.in (arc-*-elf*): Recognize.
 	* configure: "regenerated".
-	* config/tc-arc.c, config/tc-arc.h: New files.
+	* config/tc-arc.c, config/tc-arc.h, config/arc.mt: New files.
 end-sanitize-arc
 
 Tue Nov 29 13:58:10 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
@@ -43,13 +49,13 @@ Tue Nov 29 13:58:10 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
 	(SIGTY): Macro deleted.
 	(main): Deleted disabled code for establishing signal handler.
 
-	start-sanitize-rce
+start-sanitize-rce
 	Tiemann should've noted something like this:
 	* config/tc-rce.c, config/tc-rce.h: New files.
 	* as.c (main) [TC_RCE]: Call dump_literals.
 	* configure.in: Handle rce-*-aout.
 	* configure: Regenerated.
-	end-sanitize-rce
+end-sanitize-rce
 
 Mon Nov 28 11:37:35 1994  Doug Evans  <dje@canuck.cygnus.com>
 
diff --git a/gas/configure b/gas/configure
index 5526193e7b0..47df84c9d36 100755
--- a/gas/configure
+++ b/gas/configure
@@ -582,6 +582,10 @@ case ${generic_target} in
   alpha-*-netware*)	obj_format=ecoff ;;
   alpha-*-osf*)		obj_format=ecoff ;;
 
+# start-sanitize-arc
+  arc-*-elf*)		obj_format=elf bfd_gas=yes ;;
+# end-sanitize-arc
+
   arm-*-riscix*)	obj_format=aout ;;
 
   hppa-*-*elf*)		obj_format=elf emulation=hppa ;;
@@ -634,6 +638,7 @@ case ${generic_target} in
 
   m88k-*-coff*)		obj_format=coff gas_target=m88kcoff ;;
 
+  mips-sony-bsd*)	obj_format=ecoff gas_target=mips-big ;;
   # don't change emulation like *-*-bsd does
   mips-*-bsd*)		obj_format=aout gas_target=mips-lit ;;
   mips-*-ultrix*)	obj_format=ecoff gas_target=mips-lit ;;
@@ -665,7 +670,7 @@ case ${generic_target} in
   rce-*-aout)		obj_format=aout ;;
 # end-sanitize-rce
 
-  ns32k-pc532-mach*)	obj_format=aout emulation=pc532 ;;
+  ns32k-pc532-mach*)	obj_format=aout emulation=pc532mach ;;
   ns32k-pc532-netbsd*)	obj_format=aout emulation=nbsd532 ;;
 
   sparc-*-sunos4*)	obj_format=aout emulation=sun3 ;;
@@ -907,7 +912,7 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 911 "configure"
+#line 916 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
@@ -921,7 +926,7 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 925 "configure"
+#line 930 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
@@ -952,7 +957,7 @@ if eval "test \"`echo '${'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
-#line 956 "configure"
+#line 961 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
@@ -1004,7 +1009,7 @@ else
   ac_cv_cross=yes
 else
 cat > conftest.$ac_ext <<EOF
-#line 1008 "configure"
+#line 1013 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
@@ -1027,7 +1032,7 @@ if eval "test \"`echo '${'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
-#line 1031 "configure"
+#line 1036 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() { return 0; }
@@ -1058,7 +1063,7 @@ if eval "test \"`echo '${'ac_cv_func_alloca'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
-#line 1062 "configure"
+#line 1067 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -1116,7 +1121,7 @@ if eval "test \"`echo '${'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
-#line 1120 "configure"
+#line 1125 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -1143,7 +1148,7 @@ if eval "test \"`echo '${'ac_cv_func__getb67'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
-#line 1147 "configure"
+#line 1152 "configure"
 #include "confdefs.h"
 #include <ctype.h> /* Arbitrary system header to define __stub macros. */
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1186,7 +1191,7 @@ if eval "test \"`echo '${'ac_cv_func_GETB67'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
-#line 1190 "configure"
+#line 1195 "configure"
 #include "confdefs.h"
 #include <ctype.h> /* Arbitrary system header to define __stub macros. */
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1229,7 +1234,7 @@ if eval "test \"`echo '${'ac_cv_func_getb67'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
-#line 1233 "configure"
+#line 1238 "configure"
 #include "confdefs.h"
 #include <ctype.h> /* Arbitrary system header to define __stub macros. */
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1283,7 +1288,7 @@ else
   ac_cv_c_stack_direction=0
 else
 cat > conftest.$ac_ext <<EOF
-#line 1287 "configure"
+#line 1292 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -1324,7 +1329,7 @@ if eval "test \"`echo '${'ac_cv_c_inline'+set}'`\" = set"; then
 else
   if test "$GCC" = yes; then
 cat > conftest.$ac_ext <<EOF
-#line 1328 "configure"
+#line 1333 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1362,7 +1367,7 @@ if eval "test \"`echo '${'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
-#line 1366 "configure"
+#line 1371 "configure"
 #include "confdefs.h"
 #include <ctype.h> /* Arbitrary system header to define __stub macros. */
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1413,7 +1418,7 @@ if eval "test \"`echo '${'gas_cv_assert_ok'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
-#line 1417 "configure"
+#line 1422 "configure"
 #include "confdefs.h"
 #include <assert.h>
 #include <stdio.h>
@@ -1470,7 +1475,7 @@ if eval "test \"`echo '${'gas_cv_decl_needed_malloc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
-#line 1474 "configure"
+#line 1479 "configure"
 #include "confdefs.h"
 $gas_test_headers
 int main() { return 0; }
@@ -1506,7 +1511,7 @@ if eval "test \"`echo '${'gas_cv_decl_needed_free'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
-#line 1510 "configure"
+#line 1515 "configure"
 #include "confdefs.h"
 $gas_test_headers
 int main() { return 0; }
@@ -1545,7 +1550,7 @@ if eval "test \"`echo '${'gas_cv_decl_needed_errno'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
-#line 1549 "configure"
+#line 1554 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_ERRNO_H
diff --git a/gas/configure.in b/gas/configure.in
index dbbe8e7aee6..4e12549fd88 100644
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -71,6 +71,10 @@ case ${generic_target} in
   alpha-*-netware*)	obj_format=ecoff ;;
   alpha-*-osf*)		obj_format=ecoff ;;
 
+# start-sanitize-arc
+  arc-*-elf*)		obj_format=elf bfd_gas=yes ;;
+# end-sanitize-arc
+
   arm-*-riscix*)	obj_format=aout ;;
 
   hppa-*-*elf*)		obj_format=elf emulation=hppa ;;
@@ -123,6 +127,7 @@ case ${generic_target} in
 
   m88k-*-coff*)		obj_format=coff gas_target=m88kcoff ;;
 
+  mips-sony-bsd*)	obj_format=ecoff gas_target=mips-big ;;
   # don't change emulation like *-*-bsd does
   mips-*-bsd*)		obj_format=aout gas_target=mips-lit ;;
   mips-*-ultrix*)	obj_format=ecoff gas_target=mips-lit ;;
@@ -154,7 +159,7 @@ case ${generic_target} in
   rce-*-aout)		obj_format=aout ;;
 # end-sanitize-rce
 
-  ns32k-pc532-mach*)	obj_format=aout emulation=pc532 ;;
+  ns32k-pc532-mach*)	obj_format=aout emulation=pc532mach ;;
   ns32k-pc532-netbsd*)	obj_format=aout emulation=nbsd532 ;;
 
   sparc-*-sunos4*)	obj_format=aout emulation=sun3 ;;
-- 
2.30.2