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

	    H.J. Lu  <hjl@gnu.org>

        * config/tc-mips.c (mips_arch): New. Use mips_arch instead
        of mips_cpu for the ISA selection.
        (md_longopts): Add OPTION_MARCH and OPTION_MTUNE.
        (md_parse_option): Handle OPTION_MARCH and OPTION_MTUNE.
	(mips_tune): New.  Use mips_tune for scheduling and optimization
	issues.
	(append_insn): Use mips_tune and mips_arch.
	(macro_build): Ditto.
	(mips_ip): Ditto.
	(md_begin): Handle mips_arch, mips_tune and mips_cpu.  For
	backwards compatability mips_cpu generates arch and tune.
	(md_show_usage): Document new behavior.

	* doc/c-mips.texi (MIPS Opts): Document -march and -mtune.
	Deprecate -mcpu.

	* NEWS: Update.

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

	* gas/mips/usd.d: Change for march/mtune.
	* gas/mips/ulh-xgot.d: Ditto.
	* gas/mips/uld.d: Ditto.
	* gas/mips/trunc.d: Ditto.
	* gas/mips/rol.d: Ditto.
	* gas/mips/nodelay.d: Ditto.
	* gas/mips/mul.d: Ditto.
	* gas/mips/mul-ilocks.d: Ditto.
	* gas/mips/trap20.d: Ditto.
	* gas/mips/mips4.d: Ditto.
	* gas/mips/mips16.d: Ditto.
	* gas/mips/lif-xgot.d: Ditto.
	* gas/mips/lif-svr4pic.d: Ditto.
	* gas/mips/ld-xgot.d: Ditto.
	* gas/mips/ld-svr4pic.d: Ditto.
	* gas/mips/ld-ilocks-addr32.d: Ditto.
	* gas/mips/lb-xgot.d: Ditto.
	* gas/mips/jal-xgot.d: Ditto.
	* gas/mips/jal-svr4pic.d: Ditto.
	* gas/mips/delay.d: Ditto.
	* gas/mips/lb-xgot-ilocks.d: Ditto.
	* gas/mips/div.d: Ditto.
	* gas/mips/break20.d: Ditto.
	* gas/mips/delay.d: Ditto.
	* gas/mips/elf_e_flags3.d: Ditto.
	* gas/mips/elf_e_flags4.d: Ditto.
	* gas/mips/lineno.d: Ditto.
	* gas/mips/mips16.d: Ditto.
	* gas/mips/mips4.d: Ditto.
	* gas/mips/mips4010.d: Ditto.
	* gas/mips/mips4650.d: Ditto.

30 files changed, 33 insertions, 34 deletions

diff --git a/gas/testsuite/gas/mips/break20.d b/gas/testsuite/gas/mips/break20.d
index 4498a4cd87..31318984ec 100644
--- a/gas/testsuite/gas/mips/break20.d
+++ b/gas/testsuite/gas/mips/break20.d
@@ -1,4 +1,4 @@
-#as: -mcpu=r3900
+#as: -march=r3900
 #objdump: -dr --prefix-addresses -mmips:3900
 #name: MIPS 20-bit break
 
@@ -15,4 +15,4 @@ Disassembly of section .text:
 0+001c <[^>]*> sdbbp	0x14
 0+0020 <[^>]*> sdbbp	0x14,0x28
 0+0024 <[^>]*> sdbbp	0x3ff,0x3ff
-	...
\ No newline at end of file
+	...
diff --git a/gas/testsuite/gas/mips/delay.d b/gas/testsuite/gas/mips/delay.d
index 03b2e15f73..dde5c0a9d3 100644
--- a/gas/testsuite/gas/mips/delay.d
+++ b/gas/testsuite/gas/mips/delay.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:4000
 #name: MIPS delay
-#as: -mips3 -mcpu=r4000
+#as: -mips3 -mtune=r4000
 
 # 
 # Gas should produce nop's after mtc1 and related 
diff --git a/gas/testsuite/gas/mips/div.d b/gas/testsuite/gas/mips/div.d
index ffd5675233..6d60da50fc 100644
--- a/gas/testsuite/gas/mips/div.d
+++ b/gas/testsuite/gas/mips/div.d
@@ -1,5 +1,5 @@
+#as: -march=r4000 -mtune=r4000
 #objdump: -dr --prefix-addresses -mmips:4000
-#as: -mcpu=r4000
 #name: MIPS div
 
 # Test the div macro.
diff --git a/gas/testsuite/gas/mips/elf_e_flags3.d b/gas/testsuite/gas/mips/elf_e_flags3.d
index acfde0b1a4..9ba5042d06 100644
--- a/gas/testsuite/gas/mips/elf_e_flags3.d
+++ b/gas/testsuite/gas/mips/elf_e_flags3.d
@@ -1,6 +1,6 @@
-# name: ELF e_flags: -mcpu=4650
+# name: ELF e_flags: -march=4650 -mtune=4650
 # source: elf_e_flags.s
-# as: -mcpu=4650
+# as: -march=4650 -mtune=4650
 # objdump: -fd
 
 .*:.*file format.*mips.*
diff --git a/gas/testsuite/gas/mips/elf_e_flags4.d b/gas/testsuite/gas/mips/elf_e_flags4.d
index 36489cda84..9ba5042d06 100644
--- a/gas/testsuite/gas/mips/elf_e_flags4.d
+++ b/gas/testsuite/gas/mips/elf_e_flags4.d
@@ -1,6 +1,6 @@
-# name: ELF e_flags: -m4650 -mcpu=4650
+# name: ELF e_flags: -march=4650 -mtune=4650
 # source: elf_e_flags.s
-# as: -m4650 -mcpu=4650
+# as: -march=4650 -mtune=4650
 # objdump: -fd
 
 .*:.*file format.*mips.*
diff --git a/gas/testsuite/gas/mips/jal-svr4pic.d b/gas/testsuite/gas/mips/jal-svr4pic.d
index 44af20a1a8..5dc94c284a 100644
--- a/gas/testsuite/gas/mips/jal-svr4pic.d
+++ b/gas/testsuite/gas/mips/jal-svr4pic.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS R3000 jal-svr4pic
-#as: -mips1 -KPIC -mcpu=r3000
+#as: -mips1 -KPIC -mtune=r3000
 
 # Test the jal macro with -KPIC.
 
diff --git a/gas/testsuite/gas/mips/jal-xgot.d b/gas/testsuite/gas/mips/jal-xgot.d
index 318b50bd6b..8792c9b8c6 100644
--- a/gas/testsuite/gas/mips/jal-xgot.d
+++ b/gas/testsuite/gas/mips/jal-xgot.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS R3000 jal-xgot
-#as: -mips1 -KPIC -xgot -mcpu=r3000
+#as: -mips1 -KPIC -xgot -mtune=r3000
 #source: jal-svr4pic.s
 
 # Test the jal macro with -KPIC -xgot.
diff --git a/gas/testsuite/gas/mips/lb-xgot-ilocks.d b/gas/testsuite/gas/mips/lb-xgot-ilocks.d
index d949bfdf41..06aca8a0c8 100644
--- a/gas/testsuite/gas/mips/lb-xgot-ilocks.d
+++ b/gas/testsuite/gas/mips/lb-xgot-ilocks.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS lb-xgot-ilocks
-#as: -mips1 -KPIC -xgot -mcpu=r3900
+#as: -mips1 -KPIC -xgot -mtune=r3900
 #source: lb-pic.s
 
 # Test the lb macro with -KPIC -xgot.
diff --git a/gas/testsuite/gas/mips/lb-xgot.d b/gas/testsuite/gas/mips/lb-xgot.d
index da84c8fd8e..27dfad5f8d 100644
--- a/gas/testsuite/gas/mips/lb-xgot.d
+++ b/gas/testsuite/gas/mips/lb-xgot.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS lb-xgot
-#as: -mips1 -KPIC -xgot -mcpu=r3000
+#as: -mips1 -KPIC -xgot -mtune=r3000
 #source: lb-pic.s
 
 # Test the lb macro with -KPIC -xgot.
diff --git a/gas/testsuite/gas/mips/ld-ilocks-addr32.d b/gas/testsuite/gas/mips/ld-ilocks-addr32.d
index 30cf382738..52c6d2f605 100644
--- a/gas/testsuite/gas/mips/ld-ilocks-addr32.d
+++ b/gas/testsuite/gas/mips/ld-ilocks-addr32.d
@@ -1,5 +1,5 @@
 #objdump: -dr --prefix-addresses -mmips:4000
-#as: -mips3 -mcpu=r4000
+#as: -mips3 -mtune=r4000 -march=r4000
 #name: MIPS ld-ilocks
 #source: ld.s
 
@@ -629,4 +629,3 @@ Disassembly of section .text:
 0+05c4 <[^>]*> sd	a0,-23131\(at\)
 [ 	]*5c4: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
 0+05c8 <[^>]*> nop
-
diff --git a/gas/testsuite/gas/mips/ld-svr4pic.d b/gas/testsuite/gas/mips/ld-svr4pic.d
index 31860f41a6..b41b257b39 100644
--- a/gas/testsuite/gas/mips/ld-svr4pic.d
+++ b/gas/testsuite/gas/mips/ld-svr4pic.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS ld-svr4pic
-#as: -mips1 -mcpu=r3000 -KPIC
+#as: -mips1 -mtune=r3000 -KPIC
 #source: ld-pic.s
 
 # Test the ld macro with -KPIC.
diff --git a/gas/testsuite/gas/mips/ld-xgot.d b/gas/testsuite/gas/mips/ld-xgot.d
index c864b56b23..d5456baa2c 100644
--- a/gas/testsuite/gas/mips/ld-xgot.d
+++ b/gas/testsuite/gas/mips/ld-xgot.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS ld-xgot
-#as: -mips1 -mcpu=r3000 -KPIC -xgot
+#as: -mips1 -mtune=r3000 -KPIC -xgot
 #source: ld-pic.s
 
 # Test the ld macro with -KPIC -xgot.
diff --git a/gas/testsuite/gas/mips/ld.d b/gas/testsuite/gas/mips/ld.d
index 2a6acc2e8f..b7ef4ffc08 100644
--- a/gas/testsuite/gas/mips/ld.d
+++ b/gas/testsuite/gas/mips/ld.d
@@ -1,5 +1,5 @@
 #objdump: -dr --prefix-addresses -mmips:4000
-#as: -mcpu=r4000
+#as: -march=r4000
 #name: MIPS ld
 
 # Test the ld macro.
diff --git a/gas/testsuite/gas/mips/lif-svr4pic.d b/gas/testsuite/gas/mips/lif-svr4pic.d
index 048bbd6944..9432ecc5c6 100644
--- a/gas/testsuite/gas/mips/lif-svr4pic.d
+++ b/gas/testsuite/gas/mips/lif-svr4pic.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS lifloat-svr4pic
-#as: -mips1 -mcpu=r3000 -KPIC -EB --defsym SVR4=1
+#as: -mips1 -mtune=r3000 -KPIC -EB --defsym SVR4=1
 #source: lifloat.s
 
 # Test the li.d and li.s macros with -KPIC.
diff --git a/gas/testsuite/gas/mips/lif-xgot.d b/gas/testsuite/gas/mips/lif-xgot.d
index f4d747743b..9056c62cfc 100644
--- a/gas/testsuite/gas/mips/lif-xgot.d
+++ b/gas/testsuite/gas/mips/lif-xgot.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS lifloat-xgot
-#as: -mips1 -mcpu=r3000 -KPIC -xgot -EB --defsym XGOT=1
+#as: -mips1 -mtune=r3000 -KPIC -xgot -EB --defsym XGOT=1
 #source: lifloat.s
 
 # Test the li.d and li.s macros with -KPIC -xgot.
diff --git a/gas/testsuite/gas/mips/lineno.d b/gas/testsuite/gas/mips/lineno.d
index 40a201c162..77907e596a 100644
--- a/gas/testsuite/gas/mips/lineno.d
+++ b/gas/testsuite/gas/mips/lineno.d
@@ -1,6 +1,6 @@
 #objdump: -d -l -mmips:4000
 #name: assembly line numbers
-#as: -g -mcpu=r4000
+#as: -g -march=r4000
 
 
 .*: +file format .*mips.*
diff --git a/gas/testsuite/gas/mips/mips16.d b/gas/testsuite/gas/mips/mips16.d
index 216e264914..1550529ac5 100644
--- a/gas/testsuite/gas/mips/mips16.d
+++ b/gas/testsuite/gas/mips/mips16.d
@@ -1,5 +1,5 @@
 #objdump: -dr -mmips:4000
-#as: -mips3 -mcpu=r4000
+#as: -mips3 -mtune=r4000
 #name: mips16
 
 # Test the mips16 instruction set.
diff --git a/gas/testsuite/gas/mips/mips4.d b/gas/testsuite/gas/mips/mips4.d
index 874e420c3e..0c20f8ac80 100644
--- a/gas/testsuite/gas/mips/mips4.d
+++ b/gas/testsuite/gas/mips/mips4.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:5000
 #name: MIPS mips4
-#as: -mips4 -mcpu=r5000
+#as: -mips4 -mtune=r5000
 
 # Test the mips4 macros.
 
diff --git a/gas/testsuite/gas/mips/mips4010.d b/gas/testsuite/gas/mips/mips4010.d
index 49fa381cf8..12e8ac1988 100644
--- a/gas/testsuite/gas/mips/mips4010.d
+++ b/gas/testsuite/gas/mips/mips4010.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:4010
 #name: MIPS 4010
-#as: -mcpu=4010
+#as: -march=4010
 
 
 .*: +file format .*mips.*
diff --git a/gas/testsuite/gas/mips/mips4100.d b/gas/testsuite/gas/mips/mips4100.d
index f471990167..4ef2e19342 100644
--- a/gas/testsuite/gas/mips/mips4100.d
+++ b/gas/testsuite/gas/mips/mips4100.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:4100
 #name: MIPS 4100
-#as: -mcpu=4100
+#as: -march=4100
 
 
 .*: +file format .*mips.*
diff --git a/gas/testsuite/gas/mips/mips4650.d b/gas/testsuite/gas/mips/mips4650.d
index 4b65809882..2e68a37cf7 100644
--- a/gas/testsuite/gas/mips/mips4650.d
+++ b/gas/testsuite/gas/mips/mips4650.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:4650
 #name: MIPS 4650
-#as: -mcpu=4650
+#as: -march=4650 -mtune=4650
 
 
 .*: +file format .*mips.*
diff --git a/gas/testsuite/gas/mips/mul-ilocks.d b/gas/testsuite/gas/mips/mul-ilocks.d
index ba9c10e15f..9450a04f76 100644
--- a/gas/testsuite/gas/mips/mul-ilocks.d
+++ b/gas/testsuite/gas/mips/mul-ilocks.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses
 #name: MIPS mul-ilocks
-#as:
+#as: -march=r4000 -mtune=r4000
 #source: mul.s
 
 # Test the mul macro.
diff --git a/gas/testsuite/gas/mips/mul.d b/gas/testsuite/gas/mips/mul.d
index ab25f12c99..1c4f78419f 100644
--- a/gas/testsuite/gas/mips/mul.d
+++ b/gas/testsuite/gas/mips/mul.d
@@ -1,5 +1,5 @@
 #objdump: -dr --prefix-addresses -mmips:4000
-#as: -mcpu=r4000
+#as: -march=r4000 -mtune=r4000
 #name: MIPS mul
 
 # Test the mul macro.
diff --git a/gas/testsuite/gas/mips/nodelay.d b/gas/testsuite/gas/mips/nodelay.d
index f21e73bb01..7e4da4097b 100644
--- a/gas/testsuite/gas/mips/nodelay.d
+++ b/gas/testsuite/gas/mips/nodelay.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:5000
 #name: MIPS nodelay
-#as: -mips4 -mcpu=r8000
+#as: -mips4 -mtune=r8000
 #source: delay.s
 
 # For -mips4 
diff --git a/gas/testsuite/gas/mips/rol.d b/gas/testsuite/gas/mips/rol.d
index 05addb4f5d..78f39f12a1 100644
--- a/gas/testsuite/gas/mips/rol.d
+++ b/gas/testsuite/gas/mips/rol.d
@@ -1,5 +1,5 @@
 #objdump: -dr --prefix-addresses -mmips:3000
-#as: -mcpu=r3000
+#as: -march=r3000 -mtune=r3000
 #name: MIPS R3000 rol
 
 # Test the rol and ror macros.
diff --git a/gas/testsuite/gas/mips/trap20.d b/gas/testsuite/gas/mips/trap20.d
index 3a77230116..7bde8448b9 100644
--- a/gas/testsuite/gas/mips/trap20.d
+++ b/gas/testsuite/gas/mips/trap20.d
@@ -1,4 +1,4 @@
-#as: -mcpu=r4000
+#as: -march=r4000
 #objdump: -dr --prefix-addresses -mmips:4000
 #name: MIPS 20-bit trap
 
diff --git a/gas/testsuite/gas/mips/trunc.d b/gas/testsuite/gas/mips/trunc.d
index 8276e3fbc3..0087c02f13 100644
--- a/gas/testsuite/gas/mips/trunc.d
+++ b/gas/testsuite/gas/mips/trunc.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS trunc
-#as: -mips1 -mcpu=r3000
+#as: -mips1 -mtune=r3000
 
 # Test the trunc macros.
 
diff --git a/gas/testsuite/gas/mips/uld.d b/gas/testsuite/gas/mips/uld.d
index 06c83dd574..b5632926bc 100644
--- a/gas/testsuite/gas/mips/uld.d
+++ b/gas/testsuite/gas/mips/uld.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:4000
 #name: MIPS uld
-#as: -mips3 -mcpu=r4000
+#as: -mips3 -mtune=r4000
 
 # Test the uld macro.
 
diff --git a/gas/testsuite/gas/mips/ulh-xgot.d b/gas/testsuite/gas/mips/ulh-xgot.d
index 96d47ddc79..4ee5b6b8b2 100644
--- a/gas/testsuite/gas/mips/ulh-xgot.d
+++ b/gas/testsuite/gas/mips/ulh-xgot.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:3000
 #name: MIPS ulh-xgot
-#as: -mips1 -mcpu=r3000 -KPIC -xgot -EB --defsym XGOT=1
+#as: -mips1 -mtune=r3000 -KPIC -xgot -EB --defsym XGOT=1
 #source: ulh-pic.s
 
 # Test the unaligned load and store macros with -KPIC -xgot.
diff --git a/gas/testsuite/gas/mips/usd.d b/gas/testsuite/gas/mips/usd.d
index 7aa701deed..0e9da49c23 100644
--- a/gas/testsuite/gas/mips/usd.d
+++ b/gas/testsuite/gas/mips/usd.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses -mmips:4000
 #name: MIPS usd
-#as: -mips3 -mcpu=r4000
+#as: -mips3 -mtune=r4000
 
 # Test the usd macro.