PR gas/3797

* config/tc-d10v.c (do_assemble): Do not generate error messages, just return -1 whenever a problem is encoun$
 (md_assemble): If do_assemble returns -1 generate a non-fatal error message and return.
* gas/lns/lns.exp: Do not run the lns-common test for the d10v port.
* gas/d10v/address-002.l: Update expected assembler output.
* gas/d10v/address-003.l, gas/d10v/address-004.l,
  gas/d10v/address-005.l, gas/d10v/address-006.l,
  gas/d10v/address-007.l, gas/d10v/address-008.l,
  gas/d10v/address-009.l, gas/d10v/address-010.l,
  gas/d10v/address-011.l, gas/d10v/address-012.l,
  gas/d10v/address-013.l, gas/d10v/address-014.l,
  gas/d10v/address-015.l, gas/d10v/address-016.l,
  gas/d10v/address-017.l, gas/d10v/address-018.l,
  gas/d10v/address-019.l, gas/d10v/address-020.l,
  gas/d10v/address-021.l, gas/d10v/address-022.l,
  gas/d10v/address-023.l, gas/d10v/address-024.l,
  gas/d10v/address-025.l, gas/d10v/address-026.l,
  gas/d10v/address-027.l, gas/d10v/address-030.l,
  gas/d10v/address-031.l, gas/d10v/address-032.l,
  gas/d10v/address-033.l, gas/d10v/address-034.l,
  gas/d10v/address-035.l, gas/d10v/address-036.l,
  gas/d10v/address-037.l, gas/d10v/address-038.l,
  gas/d10v/address-039.l, gas/d10v/address-040.l,
  gas/d10v/address-041.l: Likewise.

40 files changed, 79 insertions, 46 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 2702533..8cd6a60 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,5 +1,32 @@
 2007-02-28  Nick Clifton  <nickc@redhat.com>
 
+	PR gas/3797
+	* gas/lns/lns.exp: Do not run the lns-common test for the d10v
+	port.
+	* gas/d10v/address-002.l: Update expected assembler output.
+	* gas/d10v/address-003.l, gas/d10v/address-004.l,
+	gas/d10v/address-005.l, gas/d10v/address-006.l,
+	gas/d10v/address-007.l, gas/d10v/address-008.l,
+	gas/d10v/address-009.l, gas/d10v/address-010.l,
+	gas/d10v/address-011.l, gas/d10v/address-012.l,
+	gas/d10v/address-013.l, gas/d10v/address-014.l,
+	gas/d10v/address-015.l, gas/d10v/address-016.l,
+	gas/d10v/address-017.l, gas/d10v/address-018.l,
+	gas/d10v/address-019.l, gas/d10v/address-020.l,
+	gas/d10v/address-021.l, gas/d10v/address-022.l,
+	gas/d10v/address-023.l, gas/d10v/address-024.l,
+	gas/d10v/address-025.l, gas/d10v/address-026.l,
+	gas/d10v/address-027.l, gas/d10v/address-030.l,
+	gas/d10v/address-031.l, gas/d10v/address-032.l,
+	gas/d10v/address-033.l, gas/d10v/address-034.l,
+	gas/d10v/address-035.l, gas/d10v/address-036.l,
+	gas/d10v/address-037.l, gas/d10v/address-038.l,
+	gas/d10v/address-039.l, gas/d10v/address-040.l, 
+	gas/d10v/address-041.l: Likewise.
+
+2007-02-28  Nick Clifton  <nickc@redhat.com>
+
+	PR gas/3975
 	* gas/arm/mapshort.d: Split into two new files...
 	* gas/arm/mapshort-eabi.d: The one and...
 	* gas/arm/mapshort-elf.d: This one.
diff --git a/gas/testsuite/gas/d10v/address-002.l b/gas/testsuite/gas/d10v/address-002.l
index 2f8c4f5..1ad93db 100644
--- a/gas/testsuite/gas/d10v/address-002.l
+++ b/gas/testsuite/gas/d10v/address-002.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
 .*:6: Error: bad opcode or operands
-.*:6: Fatal error: can't find opcode 
+.*:6: Error: could not assemble: ldb r0
diff --git a/gas/testsuite/gas/d10v/address-003.l b/gas/testsuite/gas/d10v/address-003.l
index 2f8c4f5..36068de 100644
--- a/gas/testsuite/gas/d10v/address-003.l
+++ b/gas/testsuite/gas/d10v/address-003.l
@@ -1,3 +1,4 @@
 .*: Assembler messages:
 .*:6: Error: bad opcode or operands
-.*:6: Fatal error: can't find opcode 
+.*:6: Error: could not assemble: ldub r0
+
diff --git a/gas/testsuite/gas/d10v/address-004.l b/gas/testsuite/gas/d10v/address-004.l
index 2f8c4f5..a411621 100644
--- a/gas/testsuite/gas/d10v/address-004.l
+++ b/gas/testsuite/gas/d10v/address-004.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
 .*:6: Error: bad opcode or operands
-.*:6: Fatal error: can't find opcode 
+.*:6: Error: could not assemble: stb r0
diff --git a/gas/testsuite/gas/d10v/address-005.l b/gas/testsuite/gas/d10v/address-005.l
index 2f8c4f5..1ad93db 100644
--- a/gas/testsuite/gas/d10v/address-005.l
+++ b/gas/testsuite/gas/d10v/address-005.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
 .*:6: Error: bad opcode or operands
-.*:6: Fatal error: can't find opcode 
+.*:6: Error: could not assemble: ldb r0
diff --git a/gas/testsuite/gas/d10v/address-006.l b/gas/testsuite/gas/d10v/address-006.l
index 2f8c4f5..72cff1d 100644
--- a/gas/testsuite/gas/d10v/address-006.l
+++ b/gas/testsuite/gas/d10v/address-006.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
 .*:6: Error: bad opcode or operands
-.*:6: Fatal error: can't find opcode 
+.*:6: Error: could not assemble: ldub r0
diff --git a/gas/testsuite/gas/d10v/address-007.l b/gas/testsuite/gas/d10v/address-007.l
index 2f8c4f5..a411621 100644
--- a/gas/testsuite/gas/d10v/address-007.l
+++ b/gas/testsuite/gas/d10v/address-007.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
 .*:6: Error: bad opcode or operands
-.*:6: Fatal error: can't find opcode 
+.*:6: Error: could not assemble: stb r0
diff --git a/gas/testsuite/gas/d10v/address-008.l b/gas/testsuite/gas/d10v/address-008.l
index 2f8c4f5..1ad93db 100644
--- a/gas/testsuite/gas/d10v/address-008.l
+++ b/gas/testsuite/gas/d10v/address-008.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
 .*:6: Error: bad opcode or operands
-.*:6: Fatal error: can't find opcode 
+.*:6: Error: could not assemble: ldb r0
diff --git a/gas/testsuite/gas/d10v/address-009.l b/gas/testsuite/gas/d10v/address-009.l
index 2f8c4f5..72cff1d 100644
--- a/gas/testsuite/gas/d10v/address-009.l
+++ b/gas/testsuite/gas/d10v/address-009.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
 .*:6: Error: bad opcode or operands
-.*:6: Fatal error: can't find opcode 
+.*:6: Error: could not assemble: ldub r0
diff --git a/gas/testsuite/gas/d10v/address-010.l b/gas/testsuite/gas/d10v/address-010.l
index 2f8c4f5..2847fa9 100644
--- a/gas/testsuite/gas/d10v/address-010.l
+++ b/gas/testsuite/gas/d10v/address-010.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
 .*:6: Error: bad opcode or operands
-.*:6: Fatal error: can't find opcode 
+.*:6: Error: could not assemble: ld r0
diff --git a/gas/testsuite/gas/d10v/address-011.l b/gas/testsuite/gas/d10v/address-011.l
index 2f8c4f5..688385e 100644
--- a/gas/testsuite/gas/d10v/address-011.l
+++ b/gas/testsuite/gas/d10v/address-011.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
 .*:6: Error: bad opcode or operands
-.*:6: Fatal error: can't find opcode 
+.*:6: Error: could not assemble: ld2w r0
diff --git a/gas/testsuite/gas/d10v/address-012.l b/gas/testsuite/gas/d10v/address-012.l
index 2f8c4f5..a411621 100644
--- a/gas/testsuite/gas/d10v/address-012.l
+++ b/gas/testsuite/gas/d10v/address-012.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
 .*:6: Error: bad opcode or operands
-.*:6: Fatal error: can't find opcode 
+.*:6: Error: could not assemble: stb r0
diff --git a/gas/testsuite/gas/d10v/address-013.l b/gas/testsuite/gas/d10v/address-013.l
index 2f8c4f5..edf420d 100644
--- a/gas/testsuite/gas/d10v/address-013.l
+++ b/gas/testsuite/gas/d10v/address-013.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
 .*:6: Error: bad opcode or operands
-.*:6: Fatal error: can't find opcode 
+.*:6: Error: could not assemble: st r0
diff --git a/gas/testsuite/gas/d10v/address-014.l b/gas/testsuite/gas/d10v/address-014.l
index 2f8c4f5..49f87bb 100644
--- a/gas/testsuite/gas/d10v/address-014.l
+++ b/gas/testsuite/gas/d10v/address-014.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
 .*:6: Error: bad opcode or operands
-.*:6: Fatal error: can't find opcode 
+.*:6: Error: could not assemble: st2w r0
diff --git a/gas/testsuite/gas/d10v/address-015.l b/gas/testsuite/gas/d10v/address-015.l
index 2f8c4f5..1ad93db 100644
--- a/gas/testsuite/gas/d10v/address-015.l
+++ b/gas/testsuite/gas/d10v/address-015.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
 .*:6: Error: bad opcode or operands
-.*:6: Fatal error: can't find opcode 
+.*:6: Error: could not assemble: ldb r0
diff --git a/gas/testsuite/gas/d10v/address-016.l b/gas/testsuite/gas/d10v/address-016.l
index 2f8c4f5..72cff1d 100644
--- a/gas/testsuite/gas/d10v/address-016.l
+++ b/gas/testsuite/gas/d10v/address-016.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
 .*:6: Error: bad opcode or operands
-.*:6: Fatal error: can't find opcode 
+.*:6: Error: could not assemble: ldub r0
diff --git a/gas/testsuite/gas/d10v/address-017.l b/gas/testsuite/gas/d10v/address-017.l
index 2f8c4f5..2847fa9 100644
--- a/gas/testsuite/gas/d10v/address-017.l
+++ b/gas/testsuite/gas/d10v/address-017.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
 .*:6: Error: bad opcode or operands
-.*:6: Fatal error: can't find opcode 
+.*:6: Error: could not assemble: ld r0
diff --git a/gas/testsuite/gas/d10v/address-018.l b/gas/testsuite/gas/d10v/address-018.l
index 2f8c4f5..688385e 100644
--- a/gas/testsuite/gas/d10v/address-018.l
+++ b/gas/testsuite/gas/d10v/address-018.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
 .*:6: Error: bad opcode or operands
-.*:6: Fatal error: can't find opcode 
+.*:6: Error: could not assemble: ld2w r0
diff --git a/gas/testsuite/gas/d10v/address-019.l b/gas/testsuite/gas/d10v/address-019.l
index 2f8c4f5..a411621 100644
--- a/gas/testsuite/gas/d10v/address-019.l
+++ b/gas/testsuite/gas/d10v/address-019.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
 .*:6: Error: bad opcode or operands
-.*:6: Fatal error: can't find opcode 
+.*:6: Error: could not assemble: stb r0
diff --git a/gas/testsuite/gas/d10v/address-020.l b/gas/testsuite/gas/d10v/address-020.l
index 2f8c4f5..edf420d 100644
--- a/gas/testsuite/gas/d10v/address-020.l
+++ b/gas/testsuite/gas/d10v/address-020.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
 .*:6: Error: bad opcode or operands
-.*:6: Fatal error: can't find opcode 
+.*:6: Error: could not assemble: st r0
diff --git a/gas/testsuite/gas/d10v/address-021.l b/gas/testsuite/gas/d10v/address-021.l
index 2f8c4f5..49f87bb 100644
--- a/gas/testsuite/gas/d10v/address-021.l
+++ b/gas/testsuite/gas/d10v/address-021.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
 .*:6: Error: bad opcode or operands
-.*:6: Fatal error: can't find opcode 
+.*:6: Error: could not assemble: st2w r0
diff --git a/gas/testsuite/gas/d10v/address-022.l b/gas/testsuite/gas/d10v/address-022.l
index 2f8c4f5..1ad93db 100644
--- a/gas/testsuite/gas/d10v/address-022.l
+++ b/gas/testsuite/gas/d10v/address-022.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
 .*:6: Error: bad opcode or operands
-.*:6: Fatal error: can't find opcode 
+.*:6: Error: could not assemble: ldb r0
diff --git a/gas/testsuite/gas/d10v/address-023.l b/gas/testsuite/gas/d10v/address-023.l
index 2f8c4f5..72cff1d 100644
--- a/gas/testsuite/gas/d10v/address-023.l
+++ b/gas/testsuite/gas/d10v/address-023.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
 .*:6: Error: bad opcode or operands
-.*:6: Fatal error: can't find opcode 
+.*:6: Error: could not assemble: ldub r0
diff --git a/gas/testsuite/gas/d10v/address-024.l b/gas/testsuite/gas/d10v/address-024.l
index 2f8c4f5..a411621 100644
--- a/gas/testsuite/gas/d10v/address-024.l
+++ b/gas/testsuite/gas/d10v/address-024.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
 .*:6: Error: bad opcode or operands
-.*:6: Fatal error: can't find opcode 
+.*:6: Error: could not assemble: stb r0
diff --git a/gas/testsuite/gas/d10v/address-025.l b/gas/testsuite/gas/d10v/address-025.l
index 2f8c4f5..1ad93db 100644
--- a/gas/testsuite/gas/d10v/address-025.l
+++ b/gas/testsuite/gas/d10v/address-025.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
 .*:6: Error: bad opcode or operands
-.*:6: Fatal error: can't find opcode 
+.*:6: Error: could not assemble: ldb r0
diff --git a/gas/testsuite/gas/d10v/address-026.l b/gas/testsuite/gas/d10v/address-026.l
index 2f8c4f5..72cff1d 100644
--- a/gas/testsuite/gas/d10v/address-026.l
+++ b/gas/testsuite/gas/d10v/address-026.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
 .*:6: Error: bad opcode or operands
-.*:6: Fatal error: can't find opcode 
+.*:6: Error: could not assemble: ldub r0
diff --git a/gas/testsuite/gas/d10v/address-027.l b/gas/testsuite/gas/d10v/address-027.l
index 2f8c4f5..a411621 100644
--- a/gas/testsuite/gas/d10v/address-027.l
+++ b/gas/testsuite/gas/d10v/address-027.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
 .*:6: Error: bad opcode or operands
-.*:6: Fatal error: can't find opcode 
+.*:6: Error: could not assemble: stb r0
diff --git a/gas/testsuite/gas/d10v/address-030.l b/gas/testsuite/gas/d10v/address-030.l
index 2f8c4f5..1ad93db 100644
--- a/gas/testsuite/gas/d10v/address-030.l
+++ b/gas/testsuite/gas/d10v/address-030.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
 .*:6: Error: bad opcode or operands
-.*:6: Fatal error: can't find opcode 
+.*:6: Error: could not assemble: ldb r0
diff --git a/gas/testsuite/gas/d10v/address-031.l b/gas/testsuite/gas/d10v/address-031.l
index 2f8c4f5..72cff1d 100644
--- a/gas/testsuite/gas/d10v/address-031.l
+++ b/gas/testsuite/gas/d10v/address-031.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
 .*:6: Error: bad opcode or operands
-.*:6: Fatal error: can't find opcode 
+.*:6: Error: could not assemble: ldub r0
diff --git a/gas/testsuite/gas/d10v/address-032.l b/gas/testsuite/gas/d10v/address-032.l
index 2f8c4f5..2847fa9 100644
--- a/gas/testsuite/gas/d10v/address-032.l
+++ b/gas/testsuite/gas/d10v/address-032.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
 .*:6: Error: bad opcode or operands
-.*:6: Fatal error: can't find opcode 
+.*:6: Error: could not assemble: ld r0
diff --git a/gas/testsuite/gas/d10v/address-033.l b/gas/testsuite/gas/d10v/address-033.l
index 2f8c4f5..688385e 100644
--- a/gas/testsuite/gas/d10v/address-033.l
+++ b/gas/testsuite/gas/d10v/address-033.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
 .*:6: Error: bad opcode or operands
-.*:6: Fatal error: can't find opcode 
+.*:6: Error: could not assemble: ld2w r0
diff --git a/gas/testsuite/gas/d10v/address-034.l b/gas/testsuite/gas/d10v/address-034.l
index 2f8c4f5..a411621 100644
--- a/gas/testsuite/gas/d10v/address-034.l
+++ b/gas/testsuite/gas/d10v/address-034.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
 .*:6: Error: bad opcode or operands
-.*:6: Fatal error: can't find opcode 
+.*:6: Error: could not assemble: stb r0
diff --git a/gas/testsuite/gas/d10v/address-035.l b/gas/testsuite/gas/d10v/address-035.l
index 2f8c4f5..edf420d 100644
--- a/gas/testsuite/gas/d10v/address-035.l
+++ b/gas/testsuite/gas/d10v/address-035.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
 .*:6: Error: bad opcode or operands
-.*:6: Fatal error: can't find opcode 
+.*:6: Error: could not assemble: st r0
diff --git a/gas/testsuite/gas/d10v/address-036.l b/gas/testsuite/gas/d10v/address-036.l
index 2f8c4f5..49f87bb 100644
--- a/gas/testsuite/gas/d10v/address-036.l
+++ b/gas/testsuite/gas/d10v/address-036.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
 .*:6: Error: bad opcode or operands
-.*:6: Fatal error: can't find opcode 
+.*:6: Error: could not assemble: st2w r0
diff --git a/gas/testsuite/gas/d10v/address-037.l b/gas/testsuite/gas/d10v/address-037.l
index 2f8c4f5..1ad93db 100644
--- a/gas/testsuite/gas/d10v/address-037.l
+++ b/gas/testsuite/gas/d10v/address-037.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
 .*:6: Error: bad opcode or operands
-.*:6: Fatal error: can't find opcode 
+.*:6: Error: could not assemble: ldb r0
diff --git a/gas/testsuite/gas/d10v/address-038.l b/gas/testsuite/gas/d10v/address-038.l
index 2f8c4f5..72cff1d 100644
--- a/gas/testsuite/gas/d10v/address-038.l
+++ b/gas/testsuite/gas/d10v/address-038.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
 .*:6: Error: bad opcode or operands
-.*:6: Fatal error: can't find opcode 
+.*:6: Error: could not assemble: ldub r0
diff --git a/gas/testsuite/gas/d10v/address-039.l b/gas/testsuite/gas/d10v/address-039.l
index 2f8c4f5..2847fa9 100644
--- a/gas/testsuite/gas/d10v/address-039.l
+++ b/gas/testsuite/gas/d10v/address-039.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
 .*:6: Error: bad opcode or operands
-.*:6: Fatal error: can't find opcode 
+.*:6: Error: could not assemble: ld r0
diff --git a/gas/testsuite/gas/d10v/address-040.l b/gas/testsuite/gas/d10v/address-040.l
index 2f8c4f5..688385e 100644
--- a/gas/testsuite/gas/d10v/address-040.l
+++ b/gas/testsuite/gas/d10v/address-040.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
 .*:6: Error: bad opcode or operands
-.*:6: Fatal error: can't find opcode 
+.*:6: Error: could not assemble: ld2w r0
diff --git a/gas/testsuite/gas/d10v/address-041.l b/gas/testsuite/gas/d10v/address-041.l
index 2f8c4f5..a411621 100644
--- a/gas/testsuite/gas/d10v/address-041.l
+++ b/gas/testsuite/gas/d10v/address-041.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
 .*:6: Error: bad opcode or operands
-.*:6: Fatal error: can't find opcode 
+.*:6: Error: could not assemble: stb r0
diff --git a/gas/testsuite/gas/lns/lns.exp b/gas/testsuite/gas/lns/lns.exp
index 7a62c5c..055c140 100644
--- a/gas/testsuite/gas/lns/lns.exp
+++ b/gas/testsuite/gas/lns/lns.exp
@@ -21,16 +21,21 @@ run_list_test "lns-diag-1" ""
 # ??? Won't work on targets that don't have a bare "nop" insn.
 # Perhaps we could arrange for an include file or something that
 # defined a macro...
-if { ![istarget ia64*-*-*]
+# Nor does it work on targets that do not generate line number
+# information (d10v).
+if {
+        ![istarget d10v-*-*]
+     && ![istarget ia64*-*-*]
      && ![istarget i370-*-*]
      && ![istarget i960-*-*]
      && ![istarget mcore-*-*]
      && ![istarget or32-*-*]
-     && ![istarget s390*-*-*] } {
-  # Use alternate file for targets using DW_LNS_fixed_advance_pc opcodes.
-  if { [istarget xtensa-*-*] } {
-    run_dump_test "lns-common-1-alt"
-  } else {
-    run_dump_test "lns-common-1"
-  }
+     && ![istarget s390*-*-*]
+} {
+    # Use alternate file for targets using DW_LNS_fixed_advance_pc opcodes.
+    if { [istarget xtensa-*-*] } {
+      run_dump_test "lns-common-1-alt"
+    } else {
+      run_dump_test "lns-common-1"
+    }
 }