From 4e0a5dc2897a17f6c1170180ce029bfd54babebb Mon Sep 17 00:00:00 2001
From: Eric Christopher <echristo@gcc.gnu.org>
Date: Thu, 29 Nov 2001 07:42:15 +0000
Subject: [PATCH] mips.c (override_options): Fix thinko in mips_tune for
 mips32/mips64.

2001-11-28  Eric Christopher  <echristo@redhat.com>

	* config/mips/mips.c (override_options): Fix thinko in mips_tune
	for mips32/mips64. Remove MASK_SOFT_FLOAT configuration bits.

From-SVN: r47438
---
 gcc/ChangeLog          | 11 ++++++++---
 gcc/config/mips/mips.c | 16 ++++------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2406ae6bbfc7..f0e9605d5c08 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-28  Eric Christopher  <echristo@redhat.com>
+
+	* config/mips/mips.c (override_options): Fix thinko in mips_tune
+	for mips32/mips64. Remove MASK_SOFT_FLOAT configuration bits.
+
 Thu Nov 29 00:24:15 EST 2001  John Wehle  (john@feith.com)
 
 	* alpha.md (tablejump): Use pic_offset_table_rtx
@@ -18,7 +23,7 @@ Wed Nov 28 14:51:23 2001  Douglas B. Rupp  <rupp@gnat.com>
 	* config.gcc (i[34567]86-*-interix3*): New case.
 	* config/x-interix3, config/interix3.h, config/i386/i386-interix3.h:
 	New files.
-	
+
 2001-11-28  Richard Henderson  <rth@redhat.com>
 
 	* config/alpha/alpha.md (sibcall_osf_1, sibcall_value_osf_1): Use
@@ -362,12 +367,12 @@ Mon Nov 26 11:36:20 CET 2001  Jan Hubicka  <jh@suse.cz>
 2001-11-25  Daniel Berlin  <dan@cgsoftware.com>
 
 	* df.c: Add prototypes for hybrid_search_bitmap and
-	hybrid_search_sbitmap. 
+	hybrid_search_sbitmap.
 	(hybrid_search_bitmap): New function.
 	(hybrid_search_sbitmap): New function.
 	(iterative_dataflow_sbitmap): Change to use hybrid_search_sbitmap.
 	(iterative_dataflow_bitmap): Ditto.
-	
+
 2001-11-25  Stephane Carrez  <Stephane.Carrez@worldnet.fr>
 
 	* config/m68hc11/m68hc11.md (peephole2): New peephole2 to optimize
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index eb97c76e5797..ae41546cdc31 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -4980,12 +4980,12 @@ override_options ()
 	  mips_tune = PROCESSOR_R8000;
 	  break;
 	case 32:
-	  mips_arch_string = "4kc";
-	  mips_arch = PROCESSOR_R4KC;
+	  mips_tune_string = "4kc";
+	  mips_tune = PROCESSOR_R4KC;
 	  break;
 	case 64:
-	  mips_arch_string = "5kc";
-	  mips_arch = PROCESSOR_R5KC;
+	  mips_tune_string = "5kc";
+	  mips_tune = PROCESSOR_R5KC;
 	  break;
 	}
 
@@ -5000,14 +5000,6 @@ override_options ()
 	}
     }
 
-  /* Handle processor configuration based on architecture.  */
-  if (TARGET_MIPS4100
-      || TARGET_MIPS3900
-      || TARGET_MIPS4KC
-      || TARGET_MIPS5KC)
-    target_flags |= MASK_SOFT_FLOAT;
-
-
   if ((mips_arch == PROCESSOR_R3000 && (mips_isa != 1))
       || (mips_arch == PROCESSOR_R4KC && mips_isa != 32)
       || ((mips_arch == PROCESSOR_R5KC